From c3632023e11deb9e7a862f67ad631576e73a3add Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 13 Aug 2013 22:57:10 +0200 Subject: qtbase: be more specific in opengl switch with gl in PACKAGECONFIG * full GL is called desktop in qtbase configure * without this it will try to autodetect and doesn't fail when e.g. mesa wasn't built before qtbase Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 47038d0a..e8b24067 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -72,7 +72,8 @@ PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" PACKAGECONFIG[pcre] = "-system-pcre,-qt-pcre,pcre" -PACKAGECONFIG[gl] = "-opengl -no-eglfs,,virtual/libgl" +# gl or gles2 is needed in order to build qtdeclarative (qtdeclarative.do_configure fails to find quick module without) +PACKAGECONFIG[gl] = "-opengl desktop -no-eglfs,,virtual/libgl" PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl" PACKAGECONFIG[tslib] = "-tslib,-no-tslib,tslib" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" @@ -100,6 +101,7 @@ PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb,libxkbcommon" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" +# depends on glib PACKAGECONFIG[gstreamer] = "-gstreamer,-no-gstreamer,gstreamer" PACKAGECONFIG[fontconfig] = "-fontconfig,-no-fontconfig,fontconfig" PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+" @@ -107,6 +109,7 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb,linuxfb" PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" PACKAGECONFIG[kms] = "-kms,-no-kms,kms" +# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without) PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl" -- cgit v1.2.3