From 4d21fb7260721f5bb176d718ee08af74b46b6cf9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 19 Sep 2016 11:25:52 +0300 Subject: qt5: update to Qt 5.8 Change-Id: If37c30437c3e8d3f5ffafb3a47851d88ec050895 Reviewed-by: Teemu Holappa --- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 2 +- recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb | 4 +- ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 1 - .../packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 - recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 31 --------------- recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch | 25 ------------ recipes-qt/qt5/qt3d_git.bbappend | 14 +------ recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 6 +-- recipes-qt/qt5/qtcanvas3d_git.bbappend | 8 +--- recipes-qt/qt5/qtcharts_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdatavis3d_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bbappend | 30 -------------- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtdeviceutilities.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 15 +------ recipes-qt/qt5/qtimageformats_git.bbappend | 15 +------ recipes-qt/qt5/qtlocation_git.bbappend | 11 +----- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bbappend | 8 +--- recipes-qt/qt5/qtquickcontrols_git.bbappend | 13 +----- recipes-qt/qt5/qtsensors_git.bbappend | 11 +----- recipes-qt/qt5/qtserialbus_git.bbappend | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 11 +----- recipes-qt/qt5/qtsvg_git.bbappend | 10 +---- recipes-qt/qt5/qtsystems_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | 46 +--------------------- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebchannel_git.bbappend | 2 +- .../0001-Disable-angle-for-embedded-linux.patch | 26 ++++++++++++ ...x-slow-video-with-webengine-on-nitrogen6x.patch | 8 ++-- recipes-qt/qt5/qtwebengine_git.bbappend | 7 +++- recipes-qt/qt5/qtwebsockets_git.bbappend | 9 +---- recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 +- 41 files changed, 72 insertions(+), 276 deletions(-) delete mode 100644 recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch delete mode 100644 recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch delete mode 100644 recipes-qt/qt5/qtdeclarative-render2d_git.bbappend create mode 100644 recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 028df78..7aed616 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1" inherit qmake5 require recipes-qt/qt5/qt5-git.inc -SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76" +SRCREV = "39230c74667a70b66b19c541ae0ba4d0d9620ed0" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index eafae4e..f1482a4 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -35,7 +35,7 @@ inherit qmake5 require recipes-qt/qt5/qt5-git.inc SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \ + git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;${QT_MODULE_BRANCH_PARAM};protocol=http \ file://appcontroller.conf \ " diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb index 9cd1f28..2fb3f8c 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb @@ -29,7 +29,7 @@ DESCRIPTION = "Virtual input plugin for QtSimulator" LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://qvinput.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://qvinput.h;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17" inherit qt5-module @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ " -SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe" +SRCREV = "011e1c40716c8323f247e927de6640653d6811c4" BRANCH = "master" PV = "1.0+git${SRCPV}" diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index ed7c8dc..5a2e31d 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -49,7 +49,6 @@ RDEPENDS_${PN} += " \ qtconnectivity-dev \ qtdatavis3d-dev \ qtdeclarative-dev \ - qtdeclarative-render2d-dev \ qtdeclarative-staticdev \ qtdeviceutilities-dev \ qtgraphicaleffects-dev \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 7d7160d..dfeddb1 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -42,7 +42,6 @@ RDEPENDS_${PN} += " \ qtconnectivity \ qtdatavis3d \ qtdeclarative \ - qtdeclarative-render2d \ qtdeclarative-tools \ qtdeviceutilities \ qtgraphicaleffects \ diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 10fcb28..d6ef85a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" +SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch deleted file mode 100644 index c9d2223..0000000 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 10 Feb 2016 09:02:09 +0200 -Subject: [PATCH] Allow a tools-only build - ---- - qt3d.pro | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/qt3d.pro b/qt3d.pro -index a26e76d..263e3c4 100644 ---- a/qt3d.pro -+++ b/qt3d.pro -@@ -1,4 +1,4 @@ --requires(contains(QT_CONFIG, opengl)) -+!tools-only:requires(contains(QT_CONFIG, opengl)) - - load(configure) - qtCompileTest(assimp) -@@ -17,3 +17,8 @@ load(qt_parts) - - OTHER_FILES += \ - sync.profile -+ -+tools-only { -+ sub_tools.depends -= sub_src -+ SUBDIRS = sub_tools -+} --- -1.9.1 - diff --git a/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch b/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch deleted file mode 100644 index 48a4085..0000000 --- a/recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 18 Nov 2015 10:14:18 +0200 -Subject: [PATCH] Remove qgltf - -assimp does not compile for ARM because of GCC bug -(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964) - -Task-number: QTBUG-49153 ---- - tools/tools.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/tools.pro b/tools/tools.pro -index 055f412..c1eba7f 100644 ---- a/tools/tools.pro -+++ b/tools/tools.pro -@@ -1,3 +1,3 @@ - TEMPLATE = subdirs --SUBDIRS = qgltf -+#SUBDIRS = qgltf - qgltf.CONFIG += host_build --- -1.9.1 - diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 5a522af..980eb48 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -27,16 +27,4 @@ ## ############################################################################ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \ -" - -SRC_URI_append_class-target = " \ - file://0001-Remove-qgltf.patch \ - " - -SRCREV = "db3baec236841f9390e9450772838cb7ba878069" +SRCREV = "52121396c55e6100316f006c87b4fdaa8b5a0719" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 62170bc..49ab463 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" +SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 8861ba5..8485dde 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -33,6 +33,7 @@ PACKAGECONFIG += " \ alsa \ cups \ fontconfig \ + freetype \ glib \ iconv \ icu \ @@ -53,7 +54,4 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" - -# Temporarily here, until merged upstream -PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" +SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 559955f..fff8881 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -27,10 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - -SRCREV = "269b1d5699f6c95d46553e7ee547f1c4b7545e63" +SRCREV = "6c5121eab75e61f807c2df0f14988317f220b945" diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend index 3a23c41..f0b87fa 100644 --- a/recipes-qt/qt5/qtcharts_git.bbappend +++ b/recipes-qt/qt5/qtcharts_git.bbappend @@ -29,4 +29,4 @@ inherit qtquickcompiler -SRCREV = "c121fb4ad00bc9617a011e040ef5ed695610a504" +SRCREV = "6e224c11080feef2c6d7857d061a92e320e50899" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 84d173a..46e4b9a 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -SRCREV = "dc1e5850237660df4c64c5ed29e5f7824be6ce81" +SRCREV = "9d22c12fe4bc6b19c83aa6cf421b90dbeae5f045" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend index bb15587..e7d7f79 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bbappend +++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "2523056490c3f7a35d176deb583ba46899fe260b" +SRCREV = "b6c5569f2158e2f211b90bf36ea964fda7bf6ccc" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend deleted file mode 100644 index b6b620b..0000000 --- a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 727e2b0..3f52959 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "6839f03051d2950e4721cbb5ee88fa7b07109588" +SRCREV = "16914894f035963ace51c92de13aad11a53c3cf8" diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index a4c0418..0dc1a5d 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -40,7 +40,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" SRC_URI = " \ - git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ + git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ " SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index ff9899b..e2bfe77 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -27,17 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2" +SRCREV = "8b5cb6185a014eb65150bef11aebdecb6a723aef" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 9b1fe9e..8f04b85 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -27,17 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -SRCREV = "167f91bebe2ee53fcd13d843dc9e0aad80b92d82" +SRCREV = "7795bb6c194692abbca31a9734c83a78362c8063" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index bb03307..cbf52c5 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -27,18 +27,9 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "19642842cea91a4588828362eba023c5da5ab57b" +SRCREV = "66a6bd9fb20e76ab288e4eef59d06c06a411a471" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index f694f7a..07af8cc 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "29a46aa4ac38bf9faedbaca6d1c191d38d2db079" +SRCREV = "01c9322bfe918b886468eb520d77b21b6d8c0c11" diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 564fc3d..26d4941 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "973a3d4c78c4435c34f1967a737e8b358c88f16f" +SRCREV = "803b02f35ed57ae5d82c8f4efa43c5bf1e19557f" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index 9b2122d..c8c701a 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -27,10 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ -" - -SRCREV = "b63d182dc2ab737a814bdee06f20907bec9c26eb" +SRCREV = "c5a44092c8b73c540862c4a160c31487a8518992" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 3e22418..8222542 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -27,15 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -SRCREV = "22fab1502f562bccb3c16dde0288aa867e3b094a" +SRCREV = "3b093789b07c670e29d3275e26c4e7122db042ae" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 33fd900..d838fa0 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -27,16 +27,7 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "beac0b2e3ea4b292f0473c00bcf68d75360f89ef" +SRCREV = "df3374bd4bb8af1494f6a35b1102f15cfe9633e0" diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend index 795422a..12312d4 100644 --- a/recipes-qt/qt5/qtserialbus_git.bbappend +++ b/recipes-qt/qt5/qtserialbus_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "398eda8be9eb3415ca44cc35dad3422311d8e221" +SRCREV = "7845b1c59bde8e2ec8dc541b9f1c1897182e8d0f" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index a2619f6..0745231 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -27,13 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ - file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ -" - -SRCREV = "10967b1443720116744ecfc42fe442681d149c5a" +SRCREV = "0e79f14e56eb43abcb903d5ece41221f6032ef26" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 84be9fd..f0974e5 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -27,12 +27,4 @@ ## ############################################################################ -SRCREV = "55825068ab0e3102bf5f8843c0cccab1ff120ae1" - -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" +SRCREV = "5a00abdefd1c050aae8760dfc01ae5e3631077aa" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 5e1f3d2..8e8b4df 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -30,4 +30,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" +SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index c46a1a7..31123e8 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "cb72077e562a5a53e52f7ac94b0c3c26320c6242" +SRCREV = "ea6e06c59e901a5b1fc98bc82d15ba9b85e9faf7" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 4860ea8..c46ef30 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "38d6c3fe848487970640068ec12fc0c87a2938ee" +SRCREV = "64f3b105fb67d813512b287be6fdaec409d6d943" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index a450ce8..1e562dd 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -29,48 +29,6 @@ inherit qtquickcompiler -SRCREV = "ad1da1a8c3be6ec804f3965b47d0762654f81731" +PACKAGECONFIG = "lipi-toolkit lang-all hunspell" -# To enabled Nuance T9 Write support, you need to provide the licensed components -# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. -# for example: -#T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip" -#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write" -#PACKAGECONFIG = "t9write lang-all" - -PACKAGECONFIG ?= "lipi-toolkit lang-all hunspell" -PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell" -PACKAGECONFIG[t9write] = "CONFIG+=t9write" -PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" -PACKAGECONFIG[lang-all] = "CONFIG+=lang-all" -PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR" -PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK" -PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE" -PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB" -PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES" -PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA" -PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI" -PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR" -PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN" -PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT" -PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP" -PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR" -PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO" -PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL" -PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT" -PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU" -PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE" -PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN" -PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW" - -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}" - -PACKAGES += "${PN}-dictionaries" -RRECOMMENDS_${PN} += "${PN}-dictionaries" -FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" - -FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug" -INSANE_SKIP_${PN} += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" +SRCREV = "78fa7c11ea79067d819bbcbaa903086eae929015" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 5e9bb70..ad4d9bb 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" +SRCREV = "3f5111b6c1d92ae4fed008abb53cf4226bfef575" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 5e9bb70..ad4d9bb 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" +SRCREV = "3f5111b6c1d92ae4fed008abb53cf4226bfef575" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index f6a143b..7d47bb3 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "d342edcc22d3c9c0299e86805d93e7031507345b" +SRCREV = "bf66a8531e0ada3ade7e873bc3fae824237acd3e" diff --git a/recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch b/recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch new file mode 100644 index 0000000..5ea44c0 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch @@ -0,0 +1,26 @@ +From 9081e0d5e9432fcb0f1526ecb3788c64d6c731cb Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 27 Sep 2016 14:13:07 +0300 +Subject: [PATCH] Disable angle for embedded linux + +Angle has now hard dependency to mesa (libdrm/gbm). + +Change-Id: Ie1e2ef56692f5e311bb2011a15dba9de1bb8de2f +--- + src/core/config/embedded_linux.pri | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri +index 844877e..7a909f1 100644 +--- a/src/core/config/embedded_linux.pri ++++ b/src/core/config/embedded_linux.pri +@@ -39,5 +39,6 @@ GYP_CONFIG += \ + use_x11=0 \ + v8_use_snapshot=false \ + want_separate_host_toolset=1 \ ++ angle_enable_gl=0 \ + + WEBENGINE_CONFIG *= reduce_binary_size +-- +1.9.1 + diff --git a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch b/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch index c6380f9..2af19e8 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch @@ -12,10 +12,10 @@ work properly. 1 file changed, 18 deletions(-) diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc -index 0ce9980..8963d11 100644 +index 58aa147..4ab682a 100644 --- a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc +++ b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc -@@ -1014,24 +1014,6 @@ void FeatureInfo::InitializeFeatures() { +@@ -1258,26 +1258,6 @@ void FeatureInfo::InitializeFeatures() { } } @@ -36,10 +36,12 @@ index 0ce9980..8963d11 100644 - validators_.read_pixel_format.AddValue(GL_RG_EXT); - validators_.render_buffer_format.AddValue(GL_R8_EXT); - validators_.render_buffer_format.AddValue(GL_RG8_EXT); +- validators_.texture_unsized_internal_format.AddValue(GL_RED_EXT); +- validators_.texture_unsized_internal_format.AddValue(GL_RG_EXT); - } UMA_HISTOGRAM_BOOLEAN("GPU.TextureRG", feature_flags_.ext_texture_rg); - #if !defined(OS_MACOSX) + bool has_opengl_dual_source_blending = -- 1.9.1 diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 0fa4d14..4aa0c7a 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -29,9 +29,12 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Disable-angle-for-embedded-linux.patch \ + " SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "801356387748f237b7dc24f9772774573fd83ef0" -SRCREV_chromium = "7f6555e9921bfff1886f1e63bb802c252281e882" +SRCREV_qtwebengine = "6106d6b0b3833e63aeb568f37a47fc6adca8fdb9" +SRCREV_chromium = "8158f645b0cfea734b5ff99777227380f615873f" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 85916fb..449ca7a 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -27,11 +27,4 @@ ## ############################################################################ -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ -" - -SRCREV = "38d830d00fc2f8c196d736094448e55623e4b35e" +SRCREV = "ccb138548314a767a897496c74c04a261a391027" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index f6e93db..a87a303 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "30a4041893c8132040cd982c9ca1204345801750" +SRCREV = "dba42c925db368aa958c38c6a3481f18a57bd71f" -- cgit v1.2.3-54-g00ecf