diff options
| author | Fatih Aşıcı <fatih.asici@gmail.com> | 2013-09-20 08:43:10 +0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-26 14:00:54 +0200 |
| commit | 5d85af61b7a66751ec6240bb14f7517a6633f5e7 (patch) | |
| tree | a2f10cfdc2ccac5adaa0895790d10008fe9d38a2 /package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch | |
| parent | 129abd31b7ef3e3c3c4f43324e23367f942940c9 (diff) | |
| download | buildroot-5d85af61b7a66751ec6240bb14f7517a6633f5e7.tar.gz buildroot-5d85af61b7a66751ec6240bb14f7517a6633f5e7.zip | |
qt5: bump to 5.1.1
Following patches are removed since they are upstreamed:
- qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
- qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
Remove "-nomake demos" from configure options since "demos" directory is
merged into examples.
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch')
| -rw-r--r-- | package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch new file mode 100644 index 0000000000..87acd9bef9 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch @@ -0,0 +1,32 @@ +From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com> +Date: Sun, 15 Sep 2013 11:15:33 +0300 +Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch is sent to upstream and applied: +https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8 + +Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> +--- + src/plugins/platforms/xcb/xcb-plugin.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro +index 8299528..bc21afe 100644 +--- a/src/plugins/platforms/xcb/xcb-plugin.pro ++++ b/src/plugins/platforms/xcb/xcb-plugin.pro +@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) { + contains(QT_CONFIG, opengl) { + contains(QT_CONFIG, opengles2) { + DEFINES += XCB_USE_EGL +- LIBS += -lEGL ++ CONFIG += egl + HEADERS += qxcbeglsurface.h + + # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType +-- +1.7.10.4 + |
