stuff

Change-Id: I409f4770ff87987ff59ec68536893adbc6b1c105

diff --git a/configure b/configure
index 0e705d309745d263085608cc349efc9f66378d92..a390b451dedc8f3f3797c07b9704e593a3624f3e 100755 (executable)
--- a/configure
+++ b/configure
@@ -3580,10 +3580,12 @@ libs_softmmu="$libs_softmmu $fdt_libs"
 # opengl probe (for sdl2, gtk, milkymist-tmu2)
 
 if test "$opengl" != "no" ; then
-  opengl_pkgs="epoxy gbm"
-  if $pkg_config $opengl_pkgs x11; then
-    opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"
-    opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"
+  opengl_pkgs="epoxy"
+  if $pkg_config $opengl_pkgs; then
+    opengl_cflags="$($pkg_config --cflags $opengl_pkgs)"
+    opengl_libs="$($pkg_config --libs $opengl_pkgs)"
+    echo "cflags: $opengl_cflags"
+    echo "libs: $opengl_libs"
     opengl=yes
     if test "$gtk" = "yes" && $pkg_config --exists "$gtkpackage >= 3.16"; then
         gtk_gl="yes"
@@ -3598,18 +3600,18 @@ if test "$opengl" != "no" ; then
   fi
 fi
 
-if test "$opengl" = "yes"; then
-  cat > $TMPC << EOF
-#include <epoxy/egl.h>
-#ifndef EGL_MESA_image_dma_buf_export
-# error mesa/epoxy lacks support for dmabufs (mesa 10.6+)
-#endif
-int main(void) { return 0; }
-EOF
-  if compile_prog "" "" ; then
-    opengl_dmabuf=yes
-  fi
-fi
+# if test "$opengl" = "yes"; then
+#   cat > $TMPC << EOF
+# #include <epoxy/egl.h>
+# #ifndef EGL_MESA_image_dma_buf_export
+# # error mesa/epoxy lacks support for dmabufs (mesa 10.6+)
+# #endif
+# int main(void) { return 0; }
+# EOF
+#   if compile_prog "" "" ; then
+#     opengl_dmabuf=yes
+#   fi
+# fi
 
 ##########################################
 # archipelago probe

diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
index 5836800cd98e0c3faf1e2883289a645b8c036ac1..3ad6abb42fdf519f4a014a6fbd8f799aecf6717d 100644 (file)
--- a/include/ui/egl-helpers.h
+++ b/include/ui/egl-helpers.h
@@ -3,7 +3,6 @@
 
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
-#include <gbm.h>
 #define Window EGLNativeWindowType
 
 extern EGLDisplay *qemu_egl_display;
@@ -11,6 +10,8 @@ extern EGLConfig qemu_egl_config;
 
 #ifdef CONFIG_OPENGL_DMABUF
 
+#include <gbm.h>
+
 extern int qemu_egl_rn_fd;
 extern struct gbm_device *qemu_egl_rn_gbm_dev;
 extern EGLContext qemu_egl_rn_ctx;

diff --git a/package/build.linux b/package/build.linux
index 229608cd2a1ec1182d1474279b09de94f907f565..7652c6acfee083f414ed3df4384d808ca35d2fa7 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -22,6 +22,10 @@ prepare()
                        export CROSS_PREFIX=x86_64-w64-mingw32
                fi
 
+               cp $SRCDIR/deps/lib/* $ROOTDIR/lib/
+               cp $SRCDIR/deps/pc/* $ROOTDIR/lib/pkgconfig
+               cp -r $SRCDIR/deps/include/* $ROOTDIR/include
+
                # correct pc's prefix since windows install script is not run
                # on linux
                cd ${ROOTDIR}/lib/pkgconfig

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index 2f543b43559aa5bf3a592712f28d0a17a3b72849..0ca3b64783fecaf80a193aec68cb39ea759ed031 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -128,13 +128,9 @@ fi
 CONFIGURE_APPEND="
  --target-list=$EMUL_TARGET_LIST
  --disable-werror
- --enable-maru
- --enable-yagl
- --enable-vigs
  --enable-qt
  --enable-libav
  --enable-libpng
- --enable-virtfs
  --disable-bzip2
  --disable-curl
  --disable-lzo

diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 79cee0503a4c00f5e51eb5077ae9137c4f7482e0..defb08b363c7491412659cf811747046c40b9877 100644 (file)
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include <glob.h>
 #include <dirent.h>
 
 #include "qemu/error-report.h"