diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2017-10-20 20:41:10 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-10-21 09:55:51 +0200 |
| commit | 06a4975d4bd030ab3cf291d18fa36a39cb58cc89 (patch) | |
| tree | b58ca9555b4a62350b2eacd7fa4af656a4305d4a /package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch | |
| parent | e749c770a7c58cd63c62df7f53de2fc1d7c0a30a (diff) | |
| download | buildroot-06a4975d4bd030ab3cf291d18fa36a39cb58cc89.tar.gz buildroot-06a4975d4bd030ab3cf291d18fa36a39cb58cc89.zip | |
qt5: bump LTS version to 5.6.3
qt5base:
- move hash file to 5.6.3
- move 0001-eglfs-rasp-pi-header-inclusion.patch to 5.6.3
- remove 0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [1])
qt5declarative:
- move patches to 5.6.3
qt5quickcontrols2:
- move hash file to 5.6.3
qt5webkit:
- move patches to 5.6.3
[1] http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.6&id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch')
| -rw-r--r-- | package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch new file mode 100644 index 0000000000..f1f6d9b0b7 --- /dev/null +++ b/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch @@ -0,0 +1,45 @@ +From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001 +From: Julien Corjon <corjon.j@ecagroup.com> +Date: Tue, 21 Jul 2015 09:58:14 +0200 +Subject: [PATCH] eglfs - fix rasp-pi header inclusion + +eglplateform.h include headers for low level instruction and fail on brcm +headers inclusion + For the brcm presence test we use egl pkg-config file + For the eglfs-plugin compilation we use the egl configuration + +Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339 +Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> +--- + config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++ + src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +index ce16a3a..192a8ad 100644 +--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro ++++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +@@ -1,6 +1,8 @@ + SOURCES = eglfs-brcm.cpp + + CONFIG -= qt ++CONFIG += link_pkgconfig ++PKGCONFIG += egl + + INCLUDEPATH += $$QMAKE_INCDIR_EGL + +diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro +index 0f493fd..8479496 100644 +--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro ++++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro +@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin + load(qt_plugin) + + QT += platformsupport-private eglfs_device_lib-private ++CONFIG += egl + + SOURCES += $$PWD/qeglfsmain.cpp + +-- +2.1.0 + |
