diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2016-10-15 19:28:17 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-10-15 22:50:52 +0200 |
| commit | ac0d9534604213893fb43dba19f20bb957bff1bf (patch) | |
| tree | 008323412c08762b1445cd0422572915ea43c70b /package/qt5/qt5base | |
| parent | 51ec1dc27e7d0bd47226f124d4791e9f6cd3cbcf (diff) | |
| download | buildroot-ac0d9534604213893fb43dba19f20bb957bff1bf.tar.gz buildroot-ac0d9534604213893fb43dba19f20bb957bff1bf.zip | |
qt5: bump version to 5.6.2
- qt5base: remove obsolete '-no-nis' configure parameter ([1])
- qt5base: remove upstream committed patch 0007-Remove-libudev-dependency-from-kms.pro.patch ([2])
- qt5imageformats: remove upstream committed patch 0001-tvOS-support.patch ([3])
[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=644d0e75240811212ed9fd0c21e3bd05db3ba5db
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
[3] https://git.buildroot.net/buildroot/commit/package/qt5?id=9a55b996651fdfbc40e202cb4dd725dce624ca91
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base')
| -rw-r--r-- | package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch | 33 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.hash | 4 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 1 |
3 files changed, 2 insertions, 36 deletions
diff --git a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch deleted file mode 100644 index 7ecbcd0568..0000000000 --- a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0f1b4bb65abe0e36e9e4b9813e45192223509de8 Mon Sep 17 00:00:00 2001 -From: Ralf Nolden <nolden@kde.org> -Date: Tue, 17 May 2016 12:57:17 +0200 -Subject: [PATCH] Remove libudev dependency from kms.pro - -To compile the kms qpa plugin, only libdrm is needed. -Remove the libudev dependency for the compile check to enable -building of the qpa plugin on platforms where libudev is not present -such as BSD systems (but where KMS works) - -Change-Id: Icd0be70a8949578a6158d523428706890a9674eb -Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> - -Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - config.tests/qpa/kms/kms.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro -index 1fb7367..5147bc8 100644 ---- a/config.tests/qpa/kms/kms.pro -+++ b/config.tests/qpa/kms/kms.pro -@@ -1,4 +1,4 @@ - SOURCES = kms.cpp - CONFIG += link_pkgconfig --PKGCONFIG += libdrm libudev -+PKGCONFIG += libdrm - CONFIG -= qt --- -2.8.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 2df165bbb2..9808e9b281 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtbase-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 329678347ec5ebb404225345300a8deb1e7c991322a4c50584be550c69be7c39 qtbase-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bf541b0f8e..23dba2a181 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -21,7 +21,6 @@ QT5BASE_INSTALL_STAGING = YES QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ -no-cups \ - -no-nis \ -no-iconv \ -system-zlib \ -system-pcre \ |
