diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2018-09-29 22:17:02 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-30 20:00:00 +0200 |
| commit | 63aadf100932408bce070bec3124ad5bffd0f3e7 (patch) | |
| tree | 0b686cc37da4412d33be6ecb6a4a40b76f9d1900 /package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch | |
| parent | 76f9c0bcaa00e2d7e42f8cf9ff2633832917d9bc (diff) | |
| download | buildroot-63aadf100932408bce070bec3124ad5bffd0f3e7.tar.gz buildroot-63aadf100932408bce070bec3124ad5bffd0f3e7.zip | |
qt5: bump latest version to 5.11.2
- qt5canvas3d: update license info
- qt5serialbus: update license hash (LICENSE.FDL editorial change, see [1])
- qt5serialport: update license hash (LICENSE.FDL editorial change, see [2])
[1] https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=226bd2f84c807b5401a82832dafa48d34966052a
[2] https://code.qt.io/cgit/qt/qtserialport.git/commit/?id=e0bd3949c30ce9c1988a6d6a3c0850d16a1fb33a
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch')
| -rw-r--r-- | package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch deleted file mode 100644 index 6876498022..0000000000 --- a/package/qt5/qt5base/5.11.1/0001-qtbase-Fix-build-error-when-using-EGL.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c11299086b7718332e2b4fbc37ce6f6ff427c5ba Mon Sep 17 00:00:00 2001 -From: Yuqing Zhu <carol.zhu@nxp.com> -Date: Mon, 27 Mar 2017 15:33:35 +0800 -Subject: [PATCH] qtbase: Fix build error when using EGL -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -A build error was occurring due to missing EGL configuration. - -Fixed by adding the necessary ties to the EGL pkg-config. - -Task-number: QTBUG-61712 -Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc -Upstream-Status: Pending -Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> ---- - mkspecs/features/egl.prf | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf -index 9fa0c9e219..85d5852ba6 100644 ---- a/mkspecs/features/egl.prf -+++ b/mkspecs/features/egl.prf -@@ -1,3 +1,9 @@ -+# egl headers need a definition -+PKG_CONFIG = $$pkgConfigExecutable() -+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) -+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) -+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS -+ - INCLUDEPATH += $$QMAKE_INCDIR_EGL - LIBS_PRIVATE += $$QMAKE_LIBS_EGL - QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL --- -2.16.1 - |
