summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-19 11:25:52 +0300
committerJędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>2016-10-03 07:53:58 +0000
commit4d21fb7260721f5bb176d718ee08af74b46b6cf9 (patch)
tree9f7856c0c04d7ad75f44eb82a098d59d6d35e01b
parent300a9420bce2bcf4e0fffe30dae5cb0504e2cadb (diff)
downloadmeta-boot2qt-4d21fb7260721f5bb176d718ee08af74b46b6cf9.tar.gz
qt5: update to Qt 5.8
Change-Id: If37c30437c3e8d3f5ffafb3a47851d88ec050895 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--recipes-qt/automotive/qtapplicationmanager_git.bb2
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller.bb2
-rw-r--r--recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb4
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb1
-rw-r--r--recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb1
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bbappend2
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch31
-rw-r--r--recipes-qt/qt5/qt3d/0001-Remove-qgltf.patch25
-rw-r--r--recipes-qt/qt5/qt3d_git.bbappend14
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtbase_git.bbappend6
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bbappend8
-rw-r--r--recipes-qt/qt5/qtcharts_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdeclarative-render2d_git.bbappend30
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtdeviceutilities.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bbappend15
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bbappend15
-rw-r--r--recipes-qt/qt5/qtlocation_git.bbappend11
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtquickcompiler_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bbappend8
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bbappend13
-rw-r--r--recipes-qt/qt5/qtsensors_git.bbappend11
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bbappend11
-rw-r--r--recipes-qt/qt5/qtsvg_git.bbappend10
-rw-r--r--recipes-qt/qt5/qtsystems_git.bbappend2
-rw-r--r--recipes-qt/qt5/qttools_git.bbappend2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bbappend46
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bbappend2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Disable-angle-for-embedded-linux.patch26
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bbappend7
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bbappend9
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bbappend2
-rw-r--r--scripts/manifest.xml3
42 files changed, 74 insertions, 277 deletions
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"
34inherit qmake5 34inherit qmake5
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76" 37SRCREV = "39230c74667a70b66b19c541ae0ba4d0d9620ed0"
38 38
39DEPENDS = "qtbase qtdeclarative libyaml libarchive \ 39DEPENDS = "qtbase qtdeclarative libyaml libarchive \
40 ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" 40 ${@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
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37SRC_URI = " \ 37SRC_URI = " \
38 git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \ 38 git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;${QT_MODULE_BRANCH_PARAM};protocol=http \
39 file://appcontroller.conf \ 39 file://appcontroller.conf \
40 " 40 "
41 41
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 @@
29 29
30DESCRIPTION = "Virtual input plugin for QtSimulator" 30DESCRIPTION = "Virtual input plugin for QtSimulator"
31LICENSE = "The-Qt-Company-DCLA-2.1" 31LICENSE = "The-Qt-Company-DCLA-2.1"
32LIC_FILES_CHKSUM = "file://qvinput.h;md5=709ec9e3c40137fa6068a903c57acdc1;beginline=1;endline=17" 32LIC_FILES_CHKSUM = "file://qvinput.h;md5=f25c7436dbc72d4719a5684b28dbcf4b;beginline=1;endline=17"
33 33
34inherit qt5-module 34inherit qt5-module
35 35
@@ -37,7 +37,7 @@ SRC_URI = " \
37 git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ 37 git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \
38 " 38 "
39 39
40SRCREV = "ab4a9f13831f44f3dcd375fa17ed7e102647febe" 40SRCREV = "011e1c40716c8323f247e927de6640653d6811c4"
41BRANCH = "master" 41BRANCH = "master"
42PV = "1.0+git${SRCPV}" 42PV = "1.0+git${SRCPV}"
43 43
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} += " \
49 qtconnectivity-dev \ 49 qtconnectivity-dev \
50 qtdatavis3d-dev \ 50 qtdatavis3d-dev \
51 qtdeclarative-dev \ 51 qtdeclarative-dev \
52 qtdeclarative-render2d-dev \
53 qtdeclarative-staticdev \ 52 qtdeclarative-staticdev \
54 qtdeviceutilities-dev \ 53 qtdeviceutilities-dev \
55 qtgraphicaleffects-dev \ 54 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} += " \
42 qtconnectivity \ 42 qtconnectivity \
43 qtdatavis3d \ 43 qtdatavis3d \
44 qtdeclarative \ 44 qtdeclarative \
45 qtdeclarative-render2d \
46 qtdeclarative-tools \ 45 qtdeclarative-tools \
47 qtdeviceutilities \ 46 qtdeviceutilities \
48 qtgraphicaleffects \ 47 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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" 30SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e"
31 31
32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
33 33
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 @@
1From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build
5
6---
7 qt3d.pro | 7 ++++++-
8 1 file changed, 6 insertions(+), 1 deletion(-)
9
10diff --git a/qt3d.pro b/qt3d.pro
11index a26e76d..263e3c4 100644
12--- a/qt3d.pro
13+++ b/qt3d.pro
14@@ -1,4 +1,4 @@
15-requires(contains(QT_CONFIG, opengl))
16+!tools-only:requires(contains(QT_CONFIG, opengl))
17
18 load(configure)
19 qtCompileTest(assimp)
20@@ -17,3 +17,8 @@ load(qt_parts)
21
22 OTHER_FILES += \
23 sync.profile
24+
25+tools-only {
26+ sub_tools.depends -= sub_src
27+ SUBDIRS = sub_tools
28+}
29--
301.9.1
31
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 @@
1From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 18 Nov 2015 10:14:18 +0200
4Subject: [PATCH] Remove qgltf
5
6assimp does not compile for ARM because of GCC bug
7(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964)
8
9Task-number: QTBUG-49153
10---
11 tools/tools.pro | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/tools/tools.pro b/tools/tools.pro
15index 055f412..c1eba7f 100644
16--- a/tools/tools.pro
17+++ b/tools/tools.pro
18@@ -1,3 +1,3 @@
19 TEMPLATE = subdirs
20-SUBDIRS = qgltf
21+#SUBDIRS = qgltf
22 qgltf.CONFIG += host_build
23--
241.9.1
25
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" 30SRCREV = "52121396c55e6100316f006c87b4fdaa8b5a0719"
31
32LIC_FILES_CHKSUM = " \
33 file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
34 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
35 file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
36"
37
38SRC_URI_append_class-target = " \
39 file://0001-Remove-qgltf.patch \
40 "
41
42SRCREV = "db3baec236841f9390e9450772838cb7ba878069"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" 30SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e"
31 31
32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" 32FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:"
33 33
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 += " \
33 alsa \ 33 alsa \
34 cups \ 34 cups \
35 fontconfig \ 35 fontconfig \
36 freetype \
36 glib \ 37 glib \
37 iconv \ 38 iconv \
38 icu \ 39 icu \
@@ -53,7 +54,4 @@ do_configure_prepend() {
53 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 54 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
54} 55}
55 56
56SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" 57SRCREV = "e395e79145ff861b2dd87e404d229d769a19ab7e"
57
58# Temporarily here, until merged upstream
59PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "6c5121eab75e61f807c2df0f14988317f220b945"
31 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
32 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
33 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
34"
35
36SRCREV = "269b1d5699f6c95d46553e7ee547f1c4b7545e63"
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 @@
29 29
30inherit qtquickcompiler 30inherit qtquickcompiler
31 31
32SRCREV = "c121fb4ad00bc9617a011e040ef5ed695610a504" 32SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "dc1e5850237660df4c64c5ed29e5f7824be6ce81" 30SRCREV = "9d22c12fe4bc6b19c83aa6cf421b90dbeae5f045"
31 31
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "2523056490c3f7a35d176deb583ba46899fe260b" 30SRCREV = "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 @@
1############################################################################
2##
3## Copyright (C) 2016 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "6839f03051d2950e4721cbb5ee88fa7b07109588" 30SRCREV = "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"
40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
41 41
42SRC_URI = " \ 42SRC_URI = " \
43 git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ 43 git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \
44 " 44 "
45 45
46SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" 46SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "8b5cb6185a014eb65150bef11aebdecb6a723aef"
31 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
32 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
33 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
34 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
35 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
36 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
37 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
38 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
39 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
40 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
41"
42
43SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "7795bb6c194692abbca31a9734c83a78362c8063"
31 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
32 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
33 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
34 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
35 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
36 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
37 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
38 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
39 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
40 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
41"
42
43SRCREV = "167f91bebe2ee53fcd13d843dc9e0aad80b92d82"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \
31 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
32 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
33 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
34 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
35 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
36 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
37"
38
39PACKAGECONFIG += "gypsy" 30PACKAGECONFIG += "gypsy"
40 31
41EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 32EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
42DEPENDS_emulator += "qtsimulator" 33DEPENDS_emulator += "qtsimulator"
43 34
44SRCREV = "19642842cea91a4588828362eba023c5da5ab57b" 35SRCREV = "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)
31 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 31 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" 32 ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
33 33
34SRCREV = "29a46aa4ac38bf9faedbaca6d1c191d38d2db079" 34SRCREV = "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 = " \
37 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ 37 git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \
38 " 38 "
39 39
40SRCREV = "973a3d4c78c4435c34f1967a737e8b358c88f16f" 40SRCREV = "803b02f35ed57ae5d82c8f4efa43c5bf1e19557f"
41 41
42S = "${WORKDIR}/git" 42S = "${WORKDIR}/git"
43 43
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "c5a44092c8b73c540862c4a160c31487a8518992"
31 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
32 file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
33 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
34"
35
36SRCREV = "b63d182dc2ab737a814bdee06f20907bec9c26eb"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "3b093789b07c670e29d3275e26c4e7122db042ae"
31 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
32 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
33 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
34 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
35 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
36 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
37 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
38 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
39"
40
41SRCREV = "22fab1502f562bccb3c16dde0288aa867e3b094a"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \
31 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
32 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
33 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
34 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
35 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
36 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
37"
38
39EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" 30EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
40DEPENDS_emulator += "qtsimulator" 31DEPENDS_emulator += "qtsimulator"
41 32
42SRCREV = "beac0b2e3ea4b292f0473c00bcf68d75360f89ef" 33SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "398eda8be9eb3415ca44cc35dad3422311d8e221" 30SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "0e79f14e56eb43abcb903d5ece41221f6032ef26"
31 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
32 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
33 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
34 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
35 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
36 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
37"
38
39SRCREV = "10967b1443720116744ecfc42fe442681d149c5a"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "55825068ab0e3102bf5f8843c0cccab1ff120ae1" 30SRCREV = "5a00abdefd1c050aae8760dfc01ae5e3631077aa"
31
32LIC_FILES_CHKSUM = " \
33 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
34 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
35 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
36 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
37 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
38"
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 @@
30EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" 30EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
31DEPENDS_emulator += "qtsimulator" 31DEPENDS_emulator += "qtsimulator"
32 32
33SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" 33SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "cb72077e562a5a53e52f7ac94b0c3c26320c6242" 30SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "38d6c3fe848487970640068ec12fc0c87a2938ee" 30SRCREV = "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 @@
29 29
30inherit qtquickcompiler 30inherit qtquickcompiler
31 31
32SRCREV = "ad1da1a8c3be6ec804f3965b47d0762654f81731" 32PACKAGECONFIG = "lipi-toolkit lang-all hunspell"
33 33
34# To enabled Nuance T9 Write support, you need to provide the licensed components 34SRCREV = "78fa7c11ea79067d819bbcbaa903086eae929015"
35# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
36# for example:
37#T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
38#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
39#PACKAGECONFIG = "t9write lang-all"
40
41PACKAGECONFIG ?= "lipi-toolkit lang-all hunspell"
42PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell"
43PACKAGECONFIG[t9write] = "CONFIG+=t9write"
44PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
45PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
46PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
47PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
48PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
49PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
50PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
51PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
52PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
53PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
54PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
55PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
56PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
57PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
58PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
59PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
60PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
61PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
62PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
63PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
64PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"
65
66EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
67EXTRA_QMAKEVARS_PRE += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"
68
69PACKAGES += "${PN}-dictionaries"
70RRECOMMENDS_${PN} += "${PN}-dictionaries"
71FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
72
73FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
74FILES_${PN}-dbg += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit/lib/.debug"
75INSANE_SKIP_${PN} += "libdir"
76INSANE_SKIP_${PN}-dbg += "libdir"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" 30SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" 30SRCREV = "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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "d342edcc22d3c9c0299e86805d93e7031507345b" 30SRCREV = "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 @@
1From 9081e0d5e9432fcb0f1526ecb3788c64d6c731cb Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 27 Sep 2016 14:13:07 +0300
4Subject: [PATCH] Disable angle for embedded linux
5
6Angle has now hard dependency to mesa (libdrm/gbm).
7
8Change-Id: Ie1e2ef56692f5e311bb2011a15dba9de1bb8de2f
9---
10 src/core/config/embedded_linux.pri | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri
14index 844877e..7a909f1 100644
15--- a/src/core/config/embedded_linux.pri
16+++ b/src/core/config/embedded_linux.pri
17@@ -39,5 +39,6 @@ GYP_CONFIG += \
18 use_x11=0 \
19 v8_use_snapshot=false \
20 want_separate_host_toolset=1 \
21+ angle_enable_gl=0 \
22
23 WEBENGINE_CONFIG *= reduce_binary_size
24--
251.9.1
26
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.
12 1 file changed, 18 deletions(-) 12 1 file changed, 18 deletions(-)
13 13
14diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc 14diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
15index 0ce9980..8963d11 100644 15index 58aa147..4ab682a 100644
16--- a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc 16--- a/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
17+++ b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc 17+++ b/src/3rdparty/chromium/gpu/command_buffer/service/feature_info.cc
18@@ -1014,24 +1014,6 @@ void FeatureInfo::InitializeFeatures() { 18@@ -1258,26 +1258,6 @@ void FeatureInfo::InitializeFeatures() {
19 } 19 }
20 } 20 }
21 21
@@ -36,10 +36,12 @@ index 0ce9980..8963d11 100644
36- validators_.read_pixel_format.AddValue(GL_RG_EXT); 36- validators_.read_pixel_format.AddValue(GL_RG_EXT);
37- validators_.render_buffer_format.AddValue(GL_R8_EXT); 37- validators_.render_buffer_format.AddValue(GL_R8_EXT);
38- validators_.render_buffer_format.AddValue(GL_RG8_EXT); 38- validators_.render_buffer_format.AddValue(GL_RG8_EXT);
39- validators_.texture_unsized_internal_format.AddValue(GL_RED_EXT);
40- validators_.texture_unsized_internal_format.AddValue(GL_RG_EXT);
39- } 41- }
40 UMA_HISTOGRAM_BOOLEAN("GPU.TextureRG", feature_flags_.ext_texture_rg); 42 UMA_HISTOGRAM_BOOLEAN("GPU.TextureRG", feature_flags_.ext_texture_rg);
41 43
42 #if !defined(OS_MACOSX) 44 bool has_opengl_dual_source_blending =
43-- 45--
441.9.1 461.9.1
45 47
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 @@
29 29
30FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" 30FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
31 31
32SRC_URI += " \
33 file://0001-Disable-angle-for-embedded-linux.patch \
34 "
32SRC_URI_append_mx6 = " \ 35SRC_URI_append_mx6 = " \
33 file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ 36 file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \
34 " 37 "
35 38
36SRCREV_qtwebengine = "801356387748f237b7dc24f9772774573fd83ef0" 39SRCREV_qtwebengine = "6106d6b0b3833e63aeb568f37a47fc6adca8fdb9"
37SRCREV_chromium = "7f6555e9921bfff1886f1e63bb802c252281e882" 40SRCREV_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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30LIC_FILES_CHKSUM = " \ 30SRCREV = "ccb138548314a767a897496c74c04a261a391027"
31 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
32 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
33 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
34 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
35"
36
37SRCREV = "38d830d00fc2f8c196d736094448e55623e4b35e"
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 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30SRCREV = "30a4041893c8132040cd982c9ca1204345801750" 30SRCREV = "dba42c925db368aa958c38c6a3481f18a57bd71f"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 2ad25df..e6a423c 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -9,6 +9,7 @@
9 <remote fetch="git://github.com/architech-boards" name="architech"/> 9 <remote fetch="git://github.com/architech-boards" name="architech"/>
10 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/> 10 <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
11 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/> 11 <remote fetch="git://code.qt.io/yocto" name="qtyocto"/>
12 <remote fetch="ssh://codereview.qt-project.org/yocto" name="gerrit"/>
12 <remote fetch="git://git.yoctoproject.org" name="intel"/> 13 <remote fetch="git://git.yoctoproject.org" name="intel"/>
13 <remote fetch="git://github.com/openembedded" name="oe-mirror"/> 14 <remote fetch="git://github.com/openembedded" name="oe-mirror"/>
14 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> 15 <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
@@ -23,7 +24,7 @@
23 path="sources/meta-openembedded"/> 24 path="sources/meta-openembedded"/>
24 <project name="meta-qt5" 25 <project name="meta-qt5"
25 remote="qtyocto" 26 remote="qtyocto"
26 revision="c82a99ecbeff88ff8a1f6eaa272a352e97992ab1" 27 revision="9195d9dc805fd3132023ff33bc77ace1f3f7e40f"
27 path="sources/meta-qt5"/> 28 path="sources/meta-qt5"/>
28 <project name="meta-mingw" 29 <project name="meta-mingw"
29 remote="qtyocto" 30 remote="qtyocto"