diff options
31 files changed, 42 insertions, 45 deletions
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index ffd38c13..afe70217 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass @@ -35,7 +35,7 @@ python enable_internal_build () { return e.data.setVar('ENABLE_QDBD', "1") - e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") +# e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") e.data.setVar('PREMIRRORS', "\ ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \ diff --git a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch index 48a4085e..af414ad3 100644 --- a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch +++ b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch @@ -1,4 +1,4 @@ -From 49a04f4faa135fa6ef56fc35dfb9dfe55ff2a3c4 Mon Sep 17 00:00:00 2001 +From 9966e10f36876daa910ce301a175633771470e82 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 18 Nov 2015 10:14:18 +0200 Subject: [PATCH] Remove qgltf @@ -12,14 +12,11 @@ Task-number: QTBUG-49153 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools.pro b/tools/tools.pro -index 055f412..c1eba7f 100644 +index 09c7d8e..8f093ce 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs --SUBDIRS = qgltf -+#SUBDIRS = qgltf +-!android:SUBDIRS += qgltf ++#!android:SUBDIRS += qgltf qgltf.CONFIG += host_build --- -1.9.1 - diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 0c504573..7c487ace 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -38,6 +38,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "ccc1f3af652e4f2785d9ac60eeae521130740b1a" +PACKAGECONFIG ?= "taglib" +PACKAGECONFIG[taglib] = "CONFIG+=config_taglib CONFIG+=done_config_taglib,CONFIG+=done_config_taglib,taglib" -DEPENDS = "qtbase qtdeclarative" +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" + +SRCREV = "1163c5e8e269d73b4e422a12e47f7db34285c4a0" + +DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 654344f4..996b6d69 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" +SRCREV = "947cace7993807d173656300f4440ae5166624fe" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 6a6c5f64..e1a8c5cd 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "6e8e228852f0930638b0e0272509809a0fb9ab42" +SRCREV = "a2c6c81f5c67390629a313ff7ba985d0967ca1fa" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 4341016e..1e564ede 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" +SRCREV = "947cace7993807d173656300f4440ae5166624fe" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index d97b4bca..22a5de19 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -34,12 +34,10 @@ PACKAGECONFIG_GL_emulator = "gles2 eglfs" PACKAGECONFIG += " \ accessibility \ - alsa \ cups \ fontconfig \ freetype \ glib \ - iconv \ icu \ libinput \ linuxfb \ @@ -59,7 +57,4 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de" - -# temporarily here -PACKAGECONFIG[no-opengl] = "-no-opengl" +SRCREV = "947cace7993807d173656300f4440ae5166624fe" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index fff88813..5245f4c1 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "6c5121eab75e61f807c2df0f14988317f220b945" +SRCREV = "c8cf923ee5076db1b37fdd012994adf72ce6445e" diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend index 67e39a5c..b8dbec43 100644 --- a/recipes-qt/qt5/qtcharts_git.bbappend +++ b/recipes-qt/qt5/qtcharts_git.bbappend @@ -29,4 +29,4 @@ inherit qtquickcompiler -SRCREV = "15447eed96be05b2607fa23c6455c37ab1990282" +SRCREV = "38386fda213cd50e3a3284b69ae15d5f33a7e049" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 63d97b25..ffb028a1 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -SRCREV = "515ff5b0f9a2245a13cec6f2d37edd1715cdae8c" +SRCREV = "78c593fcdd9cdfa5804404f2120768544c01c7f5" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend index d2073bab..edfb5aca 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bbappend +++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "96086b01a3e732cfb58cfd6e15a8dfc53550eb13" +SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 6932e55d..b5455579 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "9d085bf0024c442b14b7d22bc629574058176deb" +SRCREV = "fc5c77e371867cf6be8e270e452e21e5ac338283" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index e2bfe77f..28954685 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "8b5cb6185a014eb65150bef11aebdecb6a723aef" +SRCREV = "863682782bd7ba3edc33d3e13938437af0637320" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 54cdb51e..9b82ddd1 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "99d9e0c527ad91f186628ece1c8b3a5ec07f7add" +SRCREV = "65db62e4398c5ddfba1ea7825987b3f4ab04369e" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 89992b23..6a399d16 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -32,4 +32,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "8aabdb0975c3532324d299dfa62aa333a56d2d3b" +SRCREV = "ba9b7b9ef674d93680070f6c4bb1053d0d2325dd" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index a62f5eaf..0b68fe89 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 = "0cb4dc5c1fded81b4f47945b51b8de0b0151bf67" +SRCREV = "77567bad82081ffb166578bdeac52fb1f2dce464" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index eefc210d..03ffc688 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "e09a8591990e5281929ca2a7bb180bb3a35556ba" +SRCREV = "661bba4f11666d5d9018a6a1d16a71c324bdf123" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 4e9fcd06..2d773fe8 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "3bc99dd69fb9099a13dd94ebd081dba5c68d6def" +SRCREV = "84b48cadc8f68d57d1a750e6aec690f46582e0c5" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 6744cf39..44fea173 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -30,4 +30,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "8065e461421ea17a942ea09d67aaa053a136a54e" +SRCREV = "07bf3002fecd493a47bfb97420d3c3fbe6ee1458" diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend index 412a1dd7..b76fd603 100644 --- a/recipes-qt/qt5/qtserialbus_git.bbappend +++ b/recipes-qt/qt5/qtserialbus_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "8e4bd5bcfd6093c980866a6b258311e7d8ae5bbf" +SRCREV = "fb63280f12042be341df9de55aa94ca23e991fe9" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 66523886..8c516e8f 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "e2a658a2472d9fa710c251a065f488bae981c0ae" +SRCREV = "4e667fa7f88144e198692d9794baacc86bb4eb98" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index f0974e54..ebbcf594 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "5a00abdefd1c050aae8760dfc01ae5e3631077aa" +SRCREV = "51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 83f1bb17..3949e00e 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "b8113e90e2a1d9ea38a478990a93615f432ac35b" +SRCREV = "c3b5247161eff3b521381a9ada14b180e330a037" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index c46ef30b..11e1de57 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "64f3b105fb67d813512b287be6fdaec409d6d943" +SRCREV = "3ddc17398e5634e43d3ed5fa88bcf8c8b158ae06" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend index f0c1d43e..f6b9550b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -31,4 +31,4 @@ inherit qtquickcompiler PACKAGECONFIG = "lipi-toolkit lang-all hunspell" -SRCREV = "947a55149aec2724158934efde1be496b3c5e04e" +SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 6afd1fe8..b765686a 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "3443483c9efdcfbfe049f96c83f83a5bf1d81e61" +SRCREV = "545ef2e21d74128733f3b9b117d7c6024826cbb5" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 7d47bb3a..ebb1b0f8 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "bf66a8531e0ada3ade7e873bc3fae824237acd3e" +SRCREV = "8cc9153f413c36d505794adfaca4f4724692fa81" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 5cde1ea3..6f9c12ab 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "ac3d8780a0293793dbc3cd47b96aab4613dec5d9" -SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d" +SRCREV_qtwebengine = "a79fd91391c489ea1cd7baf717778b75e4847b92" +SRCREV_chromium = "93b3786290ac16c95f15c95e2c2f3d8254171ab6" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 449ca7a1..db609180 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "ccb138548314a767a897496c74c04a261a391027" +SRCREV = "5e66a1c5d25caef259e6e8b41023004c2b8de355" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 10391c2c..80ae6d9d 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "977d0fb3f0bf776e2aad3c8ff795115ce62909ff" +SRCREV = "594ad16ae17072a44219228783f2ae051f88eba0" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1791bea1..018a4c1a 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -23,12 +23,12 @@ path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="4e113c7b8e0a7512d2f0ad306decc8b4885ef807" + revision="c4a0a450b4275cc3869cf389c92e86b62f09fcea" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" path="sources/meta-mingw" - revision="70e42fd678d494bf11a12cb57eff820142543159"/> + revision="4a877547146f32f4540664b0c677d99b33d12bfd"/> <project name="meta-fsl-arm" remote="yocto" |