From c0c98ab5cc94b914b4df4382e7aee5bc2a1cb263 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 19 Jan 2018 11:08:39 +0200 Subject: kontron: update SMARC-sAMX6i BSP to r03.00 Change-Id: Ia33509ecbbc9394b7cbdcd548abb0f6f28cf3c73 Reviewed-by: Rainer Keller --- conf/distro/include/smarc-samx6i.conf | 3 ++ ...LLVMLinux-use-static-inline-in-ARM-ftrace.patch | 52 ------------------- ...ux-Change-extern-inline-to-static-inline-.patch | 59 ---------------------- ...cache-flush-management-symbols-when-MULTI.patch | 31 ------------ .../recipes/linux/linux-smx6_3.14.28.bbappend | 45 ----------------- .../recipes/linux/linux-smx6_4.10.11.bbappend | 33 ++++++++++++ .../recipes/mesa/mesa-etnaviv_17.0.3.bbappend | 32 ++++++++++++ meta-smx6-extras/recipes/perf/perf.bbappend | 30 +++++++++++ meta-smx6-extras/recipes/qt5/qtbase_git.bbappend | 30 +++++++++++ .../qt5/qtbase/smarc-samx6i/oe-device-extra.pri | 3 ++ scripts/manifest.xml | 2 +- 11 files changed, 132 insertions(+), 188 deletions(-) delete mode 100644 meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch delete mode 100644 meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch delete mode 100644 meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch delete mode 100644 meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend create mode 100644 meta-smx6-extras/recipes/linux/linux-smx6_4.10.11.bbappend create mode 100644 meta-smx6-extras/recipes/mesa/mesa-etnaviv_17.0.3.bbappend create mode 100644 meta-smx6-extras/recipes/perf/perf.bbappend create mode 100644 meta-smx6-extras/recipes/qt5/qtbase_git.bbappend create mode 100644 recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf index 39dd17d..240e3dd 100644 --- a/conf/distro/include/smarc-samx6i.conf +++ b/conf/distro/include/smarc-samx6i.conf @@ -40,3 +40,6 @@ MACHINE_EXTRA_INSTALL += "\ KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" BBMASK += "meta-smx6/recipes-qt" + +# examples is added in meta-smx6 layer conf +PACKAGECONFIG_remove_pn-qtbase = "examples" diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch deleted file mode 100644 index ee61a74..0000000 --- a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001 -From: Behan Webster -Date: Wed, 24 Sep 2014 01:06:46 +0100 -Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h - -With compilers which follow the C99 standard (like modern versions of gcc and -clang), "extern inline" does the wrong thing (emits code for an externally -linkable version of the inline function). In this case using static inline -and removing the NULL version of return_address in return_address.c does -the right thing. - -Signed-off-by: Behan Webster -Reviewed-by: Mark Charlebois -Acked-by: Steven Rostedt -Signed-off-by: Russell King ---- - arch/arm/include/asm/ftrace.h | 2 +- - arch/arm/kernel/return_address.c | 5 ----- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h -index f89515a..2bb8cac 100644 ---- a/arch/arm/include/asm/ftrace.h -+++ b/arch/arm/include/asm/ftrace.h -@@ -45,7 +45,7 @@ void *return_address(unsigned int); - - #else - --extern inline void *return_address(unsigned int level) -+static inline void *return_address(unsigned int level) - { - return NULL; - } -diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c -index fafedd8..f6aa84d 100644 ---- a/arch/arm/kernel/return_address.c -+++ b/arch/arm/kernel/return_address.c -@@ -63,11 +63,6 @@ void *return_address(unsigned int level) - #warning "TODO: return_address should use unwind tables" - #endif - --void *return_address(unsigned int level) --{ -- return NULL; --} -- - #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ - - EXPORT_SYMBOL_GPL(return_address); --- -1.9.1 - diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch deleted file mode 100644 index 064e28b..0000000 --- a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch +++ /dev/null @@ -1,59 +0,0 @@ -From eb38d22ea05961666878dfb88c68629eacfb1399 Mon Sep 17 00:00:00 2001 -From: Behan Webster -Date: Tue, 3 Sep 2013 22:27:26 -0400 -Subject: [PATCH] ARM: LLVMLinux: Change "extern inline" to "static inline" in - glue-cache.h - -With compilers which follow the C99 standard (like modern versions of gcc and -clang), "extern inline" does the wrong thing (emits code for an externally -linkable version of the inline function). "static inline" is the correct choice -instead. - -Author: Behan Webster -Signed-off-by: Behan Webster -Reviewed-by: Mark Charlebois ---- - arch/arm/include/asm/glue-cache.h | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h -index c81adc0..a3c24cd 100644 ---- a/arch/arm/include/asm/glue-cache.h -+++ b/arch/arm/include/asm/glue-cache.h -@@ -130,22 +130,22 @@ - #endif - - #ifndef __ASSEMBLER__ --extern inline void nop_flush_icache_all(void) { } --extern inline void nop_flush_kern_cache_all(void) { } --extern inline void nop_flush_kern_cache_louis(void) { } --extern inline void nop_flush_user_cache_all(void) { } --extern inline void nop_flush_user_cache_range(unsigned long a, -+static inline void nop_flush_icache_all(void) { } -+static inline void nop_flush_kern_cache_all(void) { } -+static inline void nop_flush_kern_cache_louis(void) { } -+static inline void nop_flush_user_cache_all(void) { } -+static inline void nop_flush_user_cache_range(unsigned long a, - unsigned long b, unsigned int c) { } - --extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { } --extern inline int nop_coherent_user_range(unsigned long a, -+static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { } -+static inline int nop_coherent_user_range(unsigned long a, - unsigned long b) { return 0; } --extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { } -+static inline void nop_flush_kern_dcache_area(void *a, size_t s) { } - --extern inline void nop_dma_flush_range(const void *a, const void *b) { } -+static inline void nop_dma_flush_range(const void *a, const void *b) { } - --extern inline void nop_dma_map_area(const void *s, size_t l, int f) { } --extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } -+static inline void nop_dma_map_area(const void *s, size_t l, int f) { } -+static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } - #endif - - #ifndef MULTI_CACHE --- -1.9.1 - diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch deleted file mode 100644 index c61a4dc..0000000 --- a/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 56e321cd19ee4909ca623ce1c351c966904123a9 Mon Sep 17 00:00:00 2001 -From: Pantelis Antoniou -Date: Fri, 4 Jan 2013 00:32:33 +0200 -Subject: [PATCH] arm: Export cache flush management symbols when !MULTI_CACHE - -When compiling a kernel without CONFIG_MULTI_CACHE enabled the -dma access functions end up not being exported. Fix it. - -Signed-off-by: Pantelis Antoniou -Signed-off-by: Otavio Salvador ---- - arch/arm/kernel/setup.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index 1e8b030..c6a9a61 100644 ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -1080,3 +1080,12 @@ const struct seq_operations cpuinfo_op = { - .stop = c_stop, - .show = c_show - }; -+ -+/* export the cache management functions */ -+#ifndef MULTI_CACHE -+ -+EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area)); -+EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area)); -+EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range)); -+ -+#endif diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend deleted file mode 100644 index 574e60b..0000000 --- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend +++ /dev/null @@ -1,45 +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$ -## -############################################################################ - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ - file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch \ - file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \ - " - -do_preconfigure_prepend() { - sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \ - -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \ - -i ${WORKDIR}/defconfig - - echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig - echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig - echo "CONFIG_CGROUPS=y" >> ${WORKDIR}/defconfig -} diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_4.10.11.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_4.10.11.bbappend new file mode 100644 index 0000000..c8222b9 --- /dev/null +++ b/meta-smx6-extras/recipes/linux/linux-smx6_4.10.11.bbappend @@ -0,0 +1,33 @@ +############################################################################ +## +## Copyright (C) 2018 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$ +## +############################################################################ + +do_configure_prepend() { + echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig + echo "CONFIG_CGROUPS=y" >> ${WORKDIR}/defconfig +} diff --git a/meta-smx6-extras/recipes/mesa/mesa-etnaviv_17.0.3.bbappend b/meta-smx6-extras/recipes/mesa/mesa-etnaviv_17.0.3.bbappend new file mode 100644 index 0000000..9f11d6a --- /dev/null +++ b/meta-smx6-extras/recipes/mesa/mesa-etnaviv_17.0.3.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2018 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$ +## +############################################################################ + +EXTRA_OECONF += "--disable-libunwind" + +PROVIDES += "virtual/libgbm" diff --git a/meta-smx6-extras/recipes/perf/perf.bbappend b/meta-smx6-extras/recipes/perf/perf.bbappend new file mode 100644 index 0000000..afbed0d --- /dev/null +++ b/meta-smx6-extras/recipes/perf/perf.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2018 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$ +## +############################################################################ + +EXTRA_OEMAKE += "NO_JVMTI=1" diff --git a/meta-smx6-extras/recipes/qt5/qtbase_git.bbappend b/meta-smx6-extras/recipes/qt5/qtbase_git.bbappend new file mode 100644 index 0000000..602782e --- /dev/null +++ b/meta-smx6-extras/recipes/qt5/qtbase_git.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +PACKAGECONFIG += "gbm kms" diff --git a/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri b/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri new file mode 100644 index 0000000..ae04468 --- /dev/null +++ b/recipes-qt/qt5/qtbase/smarc-samx6i/oe-device-extra.pri @@ -0,0 +1,3 @@ +QMAKE_PLATFORM += boot2qt +QT_QPA_DEFAULT_PLATFORM = eglfs +EGLFS_DEVICE_INTEGRATION = eglfs_kms diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 21d611c..6aa649c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -99,7 +99,7 @@ groups="notdefault,internal"/> -- cgit v1.2.3-54-g00ecf From f00d9ee406001081464d5c0ce67cf893755f8f34 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 30 Jan 2018 09:08:48 +0200 Subject: qtquickcontrols2: Fix background regression Cherry-pick change from 5.9 branch that missed v5.9.4 release. Task-number: AUTOSUITE-189 Change-Id: I21184bb76098b8603a7cd7bf9d7336103dbe1332 Reviewed-by: Mikko Gronoff --- ...-background-size-regression-caused-by-def.patch | 43 ++++++++++++++++++++++ recipes-qt/qt5/qtquickcontrols2_git.bbappend | 34 +++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch create mode 100644 recipes-qt/qt5/qtquickcontrols2_git.bbappend diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch new file mode 100644 index 0000000..920273e --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch @@ -0,0 +1,43 @@ +From 83046de497827a69bf05cd0b06ca6421b51e02b8 Mon Sep 17 00:00:00 2001 +From: J-P Nurmi +Date: Mon, 22 Jan 2018 10:58:06 +0100 +Subject: [PATCH] Control: fix background size regression caused by deferred + execution + +Task-number: QTBUG-65880 +Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e +Reviewed-by: Mitch Curtis +--- + src/quicktemplates2/qquickcontrol.cpp | 1 + + tests/auto/controls/data/tst_popup.qml | 8 ++++++++ + 2 files changed, 9 insertions(+) + +diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp +index 6fbd4c07..957936df 100644 +--- a/src/quicktemplates2/qquickcontrol.cpp ++++ b/src/quicktemplates2/qquickcontrol.cpp +@@ -1343,6 +1343,7 @@ void QQuickControl::componentComplete() + d->executeBackground(true); + d->executeContentItem(true); + QQuickItem::componentComplete(); ++ d->resizeBackground(); + d->resizeContent(); + if (!d->hasLocale) + d->locale = QQuickControlPrivate::calcLocale(d->parentItem); +diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml +index bec50ad0..1f3a097f 100644 +--- a/tests/auto/controls/data/tst_popup.qml ++++ b/tests/auto/controls/data/tst_popup.qml +@@ -1253,4 +1253,12 @@ TestCase { + control.open() + verify(control.visible) + } ++ ++ function test_deferredBackgroundSize() { ++ var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100}) ++ verify(control) ++ ++ compare(control.background.width, 200) ++ compare(control.background.height, 100) ++ } + } diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend new file mode 100644 index 0000000..b546098 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -0,0 +1,34 @@ +############################################################################ +## +## Copyright (C) 2018 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$ +## +############################################################################ + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Control-fix-background-size-regression-caused-by-def.patch \ + " -- cgit v1.2.3-54-g00ecf From 765598f189f50f905627a73cfabb29acae405a9a Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 31 Jan 2018 15:48:36 +0100 Subject: Update GammaRay Change-Id: I30c38c3ba14398b7ae30183cb9718737fed388d6 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/gammaray_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 67dbfb7..4b86e53 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -9,7 +9,7 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" BRANCH = "5.9" -SRCREV = "6b6edf6fec523ab2c61694e045de5ece272fa4b0" +SRCREV = "5424a06612a0079cdddd2e326930fa4537713859" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ -- cgit v1.2.3-54-g00ecf From 0c5437b2baf2a8241665a5bdfcb7dd0e88ad9f34 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 19 Jan 2018 17:13:54 +0100 Subject: qtivi: Fix the broken python3 binary inside an yocto SDK QtIvi creates a virtualenv using the python3 binary from the native sysroot. This virtualenv is also used for the SDK. As it is not intended for the SDK it is using the wrong interpreter location. This workaround installs the python3 binary into the nativesdk sysroot where the qtivi nativesdk recipe can pick it up and copy it into its virtualenv. This needs to be improved in future versions and is discussed here: AUTOSUITE-176 Task-number: AUTOSUITE-179 Change-Id: Ib134231204cc8c6a56f2a93bedb553ecbcbd9123 Reviewed-by: Samuli Piippo Reviewed-by: Tobias Olausson --- recipes-qt/automotive/qtivi_git.bb | 13 +++++++++++++ recipes/python/python3_%.bbappend | 10 ++++++++++ 2 files changed, 23 insertions(+) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 40cfbf1..b5536a4 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -89,6 +89,19 @@ do_install_prepend() { set_python_paths } +# This needs a modified python3 recipe which copies the binary into a path where this recipe can pick it up +# This is needed to provide a proper executable using the correct interpreter in the SDK. +# See https://bugreports.qt.io/browse/AUTOSUITE-176 +do_install_append_class-nativesdk() { + export IVIGENERATOR_ENABLED="${@bb.utils.contains("PACKAGECONFIG", "ivigenerator-native", "1", "0", d)}" + + if [ "${IVIGENERATOR_ENABLED}" = "1" ]; then + cp ${STAGING_BINDIR}/qt5/python3* ${D}/${OE_QMAKE_PATH_BINS}/ivigenerator/qtivi_qface_virtualenv/bin/ + rm -f ${D}/${OE_QMAKE_PATH_BINS}/ivigenerator/qtivi_qface_virtualenv/bin/python + ln -sf python3 ${D}/${OE_QMAKE_PATH_BINS}/ivigenerator/qtivi_qface_virtualenv/bin/python + fi +} + BBCLASSEXTEND += "native nativesdk" diff --git a/recipes/python/python3_%.bbappend b/recipes/python/python3_%.bbappend index 9015f3f..b3a5eb7 100644 --- a/recipes/python/python3_%.bbappend +++ b/recipes/python/python3_%.bbappend @@ -1 +1,11 @@ SRC_URI_remove = "file://python-3.3-multilib.patch" + +# We need to install the python3 binary into the sysroot to let qtivi install that binary +# into the correct location. +# We can't install it directly into ${bindir} as this would be picked up by other recipes +# and produce a lot of errors. Instead put it inside a qt5 folder where only qtivi picks it up +# This is a workaround and needs to be replaced by a proper solution discussed here: +# https://bugreports.qt.io/browse/AUTOSUITE-176 +sysroot_stage_all_append_class-nativesdk () { + sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}/qt5 +} -- cgit v1.2.3-54-g00ecf From 68fe0bc63390a5a8961018a4ffe39267c5661146 Mon Sep 17 00:00:00 2001 From: Bramastyo Harimukti Date: Thu, 1 Feb 2018 14:39:26 +0100 Subject: Neptune-UI: Update to use the latest Neptune-UI Change-Id: Idd7948ffc61ca0a52ceb25f6bf04792780e205a7 Reviewed-by: Dominik Holland --- recipes-qt/automotive/neptune-ui_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 250cc73..827cffc 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -1,6 +1,7 @@ ############################################################################ ## ## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 Pelagicore AG. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -41,7 +42,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "644c1e15abebe0e2cc71bfc2f36253c0cb0f4b61" +SRCREV = "dedb15175d6efc9489b6b9894757b4d7cc260e0e" DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ -- cgit v1.2.3-54-g00ecf From 4f9a24de60022d820c864cf81069e48ce41f65b6 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 5 Feb 2018 15:00:54 +0200 Subject: automotive: update revisions Sync embedded component SHA1s to match with host versions of qtivi & qtapplicationmanager. Change-Id: Ic5895cec20b374011fd8b79f724003fe96c02aeb Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtapplicationmanager_git.bb | 4 ++-- recipes-qt/automotive/qtivi_git.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 73d8809..b2418b1 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "b956d8ff205eaaf2e8f83446e2023fd491562669" +SRCREV = "2c5aa14677e3038ee46bf727122f090497e777ba" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index b5536a4..0938511 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "30cda3fdc858b0bc53fd018c77f79b80a1d312aa" +SRCREV_qtivi = "81fc854f8652438fd8e9d9e0c3accd0bfeb74f68" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From e22239acfa03d397f1cc30e77809ae549da72d3d Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 6 Feb 2018 11:13:57 +0200 Subject: automotive: update revisions Sync embedded component SHA1s to match with host versions Change-Id: I2834366e0a15d55c40ec7d6520961e51d99bad37 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/gammaray_git.bb | 2 +- recipes-qt/automotive/multiscreen-demo_git.bb | 4 ++-- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- recipes-qt/automotive/qtivi_git.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 4b86e53..218082a 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -9,7 +9,7 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" BRANCH = "5.9" -SRCREV = "5424a06612a0079cdddd2e326930fa4537713859" +SRCREV = "847272e3fd01141c0238c2fba24db1eefd439b05" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 7ce28b0..51369cf 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -42,7 +42,7 @@ SRC_URI += "\ file://automotivedemo.service \ " -SRCREV_multiscreen-demo = "e7126b85bacab4571da6d8b5ba8517f3bb0abd47" +SRCREV_multiscreen-demo = "6d02e36c4280cee5b0c31323016ae666c73afef4" SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" SRCREV_FORMAT = "multiscreen-demo_assets" diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index b2418b1..b6f35ec 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=43a31c6abffdd61c938811959b3c1b71" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "2c5aa14677e3038ee46bf727122f090497e777ba" +SRCREV = "76cb60941c69e049f7cd740a099f020dd2ed0ba5" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 0938511..90b53b2 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "81fc854f8652438fd8e9d9e0c3accd0bfeb74f68" +SRCREV_qtivi = "ebb5e4d115d219881fd4aff7f805b580ba4a1c38" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From 5c5f709a38eb2900a585892c7aaf5912e5655d9e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 8 Feb 2018 13:32:58 +0200 Subject: automotive: update revisions Sync embedded component SHA1s to match with host versions Task-number: QTBUG-66224 Change-Id: I0eb1cc4eae25d25def7498e5e553f3d882d7df03 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtapplicationmanager_git.bb | 4 ++-- recipes-qt/automotive/qtivi_git.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index b6f35ec..8b626e4 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -29,12 +29,12 @@ DESCRIPTION = "Qt component for application lifecycle management" LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "76cb60941c69e049f7cd740a099f020dd2ed0ba5" +SRCREV = "8df633d8195f16221ca348d527ab8671142f7426" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 90b53b2..e5ec263 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "ebb5e4d115d219881fd4aff7f805b580ba4a1c38" +SRCREV_qtivi = "f7a88c01c71ba50228ad99094277057cdedf74bf" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From 7bfb5a88454a34ebeb0d556b90fe8378ea7312bb Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 9 Feb 2018 12:31:10 +0200 Subject: automotive: update revisions Sync embedded component SHA1s to match with host versions Task-number: QTBUG-66224 Change-Id: I9b413aa145f68afab1a2dad9a655a78839bc784b Reviewed-by: Samuli Piippo --- recipes-qt/automotive/gammaray_git.bb | 2 +- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 218082a..09e78d8 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -9,7 +9,7 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" BRANCH = "5.9" -SRCREV = "847272e3fd01141c0238c2fba24db1eefd439b05" +SRCREV = "2febf153fc388da8b03bb432201f303ea6089c66" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 8b626e4..1c1db98 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=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "8df633d8195f16221ca348d527ab8671142f7426" +SRCREV = "8764748b7df3f966ec0dcf22a42524d811d43c13" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" -- cgit v1.2.3-54-g00ecf From 2563827c79dd4003292cb67f3dca16fdaa1615d0 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 12 Feb 2018 15:41:08 +0200 Subject: automotive: update qtivi Sync with latest host version Task-number: QTBUG-66224 Change-Id: I91cee1be0e585c01de26c11ff07c2eff4700cd6c Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtivi_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index e5ec263..cf4bf01 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "f7a88c01c71ba50228ad99094277057cdedf74bf" +SRCREV_qtivi = "1c3f4c3d9924057fb185dce36162dcb16bb92355" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From f7eb0d86fc40f457ac41fa3d559b147743c2658f Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Thu, 15 Feb 2018 11:48:00 +0100 Subject: Update GammaRay to the 2.9.0 release Change-Id: Id709058c3bceb1ce2ab2fa2f5091e6e915ed0029 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/gammaray_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 09e78d8..7466822 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -9,7 +9,7 @@ inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" BRANCH = "5.9" -SRCREV = "2febf153fc388da8b03bb432201f303ea6089c66" +SRCREV = "87656b9c344077d84682b53ba3e4676e18b57f9e" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ -- cgit v1.2.3-54-g00ecf From 0230c6dac00c636c3a1b3c30359535e7cc227671 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 15 Feb 2018 12:41:36 +0200 Subject: automotive: update qtivi & qtapplicatiomanager Sync with latest host version Task-number: QTBUG-66224 Change-Id: Id0a93e71c20b0fa97a92cb54af1deec9003d059c Reviewed-by: Timo Aarnipuro --- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- recipes-qt/automotive/qtivi_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 1c1db98..02e04bb 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=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "8764748b7df3f966ec0dcf22a42524d811d43c13" +SRCREV = "06f3adf84ee4fc2287def8ca1c6b4036409f5c86" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index cf4bf01..6e84b95 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "1c3f4c3d9924057fb185dce36162dcb16bb92355" +SRCREV_qtivi = "faf02ce5ffd951765dad7fedc9091285c3327016" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From 0a77aaa46dce2bdd5be51d2de110eb11217ea1ec Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 20 Feb 2018 15:08:56 +0200 Subject: automotive: update qtapplicationmanager Fixes: QTAUTO-515 QTAUTO-786 Task-number: QTBUG-66224 Change-Id: I56f2144ff1c6e9c83fe94bd1faabdae73434082f Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 02e04bb..f175c56 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=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "06f3adf84ee4fc2287def8ca1c6b4036409f5c86" +SRCREV = "f741a32756dcb6cc740160265d76da5375e8e918" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" -- cgit v1.2.3-54-g00ecf From 4db78b54773e07e8ac919033fd3dae6e13dc5673 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 21 Feb 2018 14:47:41 +0200 Subject: intel: update mesa to 17.0.2 Use recipes from pyro branch to update mesa to 17.0.2, which has support for the Intel NUCs with Kaby Lake. Task-number: QTAUTO-798 Change-Id: Ia2402c9acc57f1286b85d4e8eb53b17de7222d01 Reviewed-by: Nikolay Zamotaev Reviewed-by: Mikko Gronoff --- .../0001-Use-wayland-scanner-in-the-path.patch | 37 ++++++++++++++++++++++ .../mesa/files/disable-asm-on-non-gcc.patch | 29 +++++++++++++++++ .../files/replace_glibc_check_with_linux.patch | 26 +++++++++++++++ meta-intel-extras/recipes/mesa/mesa_17.0.2.bb | 18 +++++++++++ 4 files changed, 110 insertions(+) create mode 100644 meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch create mode 100644 meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch create mode 100644 meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch create mode 100644 meta-intel-extras/recipes/mesa/mesa_17.0.2.bb diff --git a/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch new file mode 100644 index 0000000..e49695b --- /dev/null +++ b/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -0,0 +1,37 @@ +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Tue, 15 Nov 2016 15:20:49 +0200 +Subject: [PATCH] Simplify wayland-scanner lookup + +Don't use pkg-config to lookup the path of a binary that's in the path. + +Alternatively we'd have to prefix the path returned by pkg-config with +PKG_CONFIG_SYSROOT_DIR. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen +--- + configure.ac | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e56e35a..a92005a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) + fi + +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') +-if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +-fi ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + + # Do per-EGL platform setups and checks + egl_platforms=`IFS=', '; echo $with_egl_platforms` +-- +2.1.4 + diff --git a/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch b/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch new file mode 100644 index 0000000..d2d6755 --- /dev/null +++ b/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch @@ -0,0 +1,29 @@ +Configure checks for compiler to be gcc and then it enables asm_offsets +generation. see + +https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d + +However, we missed the check when enabling this on cross compilation +when architecture for both host and target is x86 + +Fixes errors like +./gen_matypes > matypes.h +/bin/bash: ./gen_matypes: No such file or directory + +-Khem + +Upstream-Status: Submitted + +Index: mesa-12.0.1/configure.ac +=================================================================== +--- mesa-12.0.1.orig/configure.ac ++++ mesa-12.0.1/configure.ac +@@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU + if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then + case "$host_cpu" in + i?86 | x86_64 | amd64) +- if test "x$host_cpu" != "x$target_cpu"; then ++ if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then + enable_asm=no + AC_MSG_RESULT([no, cross compiling]) + fi diff --git a/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch b/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch new file mode 100644 index 0000000..0280ee8 --- /dev/null +++ b/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch @@ -0,0 +1,26 @@ +endianness check is OS wide and not specific to libc + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Signed-off-by: Jussi Kukkonen +--- + src/util/u_endian.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/u_endian.h b/src/util/u_endian.h +index b9d563d..2d5eab9 100644 +--- a/src/util/u_endian.h ++++ b/src/util/u_endian.h +@@ -27,7 +27,7 @@ + #ifndef U_ENDIAN_H + #define U_ENDIAN_H + +-#if defined(__GLIBC__) || defined(ANDROID) ++#if defined(__linux__) + #include + + #if __BYTE_ORDER == __LITTLE_ENDIAN +-- +2.1.4 + diff --git a/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb b/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb new file mode 100644 index 0000000..b95f301 --- /dev/null +++ b/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb @@ -0,0 +1,18 @@ +require recipes-graphics/mesa/${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ +" + +SRC_URI[md5sum] = "8f808e92b893d412fbd6510e1d16f5c5" +SRC_URI[sha256sum] = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit v1.2.3-54-g00ecf From 882f824ec9921b2e1618a192e519fb4790118928 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 21 Feb 2018 13:44:37 +0200 Subject: automotive: update components Fixes: neptune-ui: workaround for AUTOSUITE-189 qtivi: QTAUTO-806 qtapplicationmanager: QTAUTO-799, QTAUTO-785 Task-number: QTBUG-66224 Change-Id: I4e459ef361baaedfffa9e37103eaa136d0c4cd34 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- recipes-qt/automotive/qtivi_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 827cffc..4b4cb01 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -42,7 +42,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "dedb15175d6efc9489b6b9894757b4d7cc260e0e" +SRCREV = "d4888e5c9e6338804617f6206722332311419753" DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index f175c56..b839cdb 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=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "f741a32756dcb6cc740160265d76da5375e8e918" +SRCREV = "e044325ab5271cdf8043e2f198f37b0f11e60a3a" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 6e84b95..5cbf131 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -50,7 +50,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "faf02ce5ffd951765dad7fedc9091285c3327016" +SRCREV_qtivi = "8d482b27c6c0c2b664104fd777ddee92652ab65c" SRCREV_qface = "9da793d6cbc63d617ad5e2ffd13e9f6d055c88e8" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf From f1d263cd84e3fc25936e45e36692ca05a6d501e2 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 23 Feb 2018 14:59:01 +0200 Subject: automotive: update qtapplicationmanager Fixes QTAUTO-790 Task-number: QTBUG-66224 Change-Id: I604b74bd25eed978fb564138a65c14821bb19357 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index b839cdb..ae66e8a 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=ff238b33ff354a0d8d79851a9c061717" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "e044325ab5271cdf8043e2f198f37b0f11e60a3a" +SRCREV = "5581e400c95a1ff736c55c9d93bd451302970c11" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" -- cgit v1.2.3-54-g00ecf From fd6c9faf1b50301692314dd1aeced9fb3cc85447 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Sun, 25 Feb 2018 19:35:46 +0200 Subject: automotive: update neptune-ui Fixes QTAUTO-807 Task-number: QTBUG-66224 Change-Id: If77aeaf699bd808bdfe4cd29e74a81c4f105c193 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 4b4cb01..acfc3c7 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -42,7 +42,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "d4888e5c9e6338804617f6206722332311419753" +SRCREV = "7b64754e5d1aa3ea3b63347bc5637bae9795e193" DEPENDS = "qtbase qtdeclarative qttools-native qtquickcontrols2 qtapplicationmanager" RDEPENDS_${PN} = "qtivi qtvirtualkeyboard dbus \ -- cgit v1.2.3-54-g00ecf From 8d03cf7bde54707fe70f05be57983cfce4a8374f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 27 Feb 2018 12:14:44 +0200 Subject: neptune-ui: fetch sources from code.qt.io instead of github Workaround for github fetch/update issues Change-Id: Ibd07080e5799d1fe8963ea2c681c186d98ddfd88 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index acfc3c7..d656aef 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -35,8 +35,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82" inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-neptune-ui" +QT_GIT = "git://code.qt.io/qt-apps" SRC_URI += " \ file://neptune.service \ -- cgit v1.2.3-54-g00ecf From dc20529cd55600787c003f5db4c82352740c3cf6 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 19 Feb 2018 09:51:58 +0200 Subject: meta-qt5: update meta layer - Pull in latest upstream/rocko commits. - Keep older qtsystems with old license files due emulator dependency Change-Id: I5c9c7cce77e1f308bd360dbe7b0b756a6e4e3203 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtsystems_git.bbappend | 9 ++++++++- scripts/manifest.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index 57c8285..8ae3521 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -30,4 +30,11 @@ EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" DEPENDS_append_emulator = " qtsimulator" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 6aa649c..48329fe 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Mon, 5 Mar 2018 09:50:36 +0200 Subject: meta-qt5: update meta layer - Update submodules to first 5.9.5 branch snapshot - mysql_config path fix - Update Qt SRC_URI from github.com to code.qt.io Adjust meta-boot2qt recipes accordingly due Qt source mirror change. Task-number: QTBUG-66252 Change-Id: Ide5542c7d3439fc4ce72e053bbbb63b1a36d7365 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/multiscreen-demo_git.bb | 2 +- recipes-qt/automotive/neptune-ui_git.bb | 2 +- recipes-qt/automotive/qmllive-target_git.bb | 6 +-- recipes-qt/automotive/qtwebbrowser_git.bb | 5 +-- recipes-qt/b2qt-addons/b2qt-demos.bb | 14 +++---- recipes-qt/b2qt-addons/b2qt-launcher.bb | 6 +-- recipes-qt/b2qt-addons/democompositor_git.bb | 6 +-- recipes-qt/b2qt-addons/qdbd.bb | 8 ++-- recipes-qt/qt5/qtotaupdate.bb | 3 +- ...-background-size-regression-caused-by-def.patch | 43 ---------------------- recipes-qt/qt5/qtquickcontrols2_git.bbappend | 34 ----------------- scripts/manifest.xml | 2 +- 12 files changed, 26 insertions(+), 105 deletions(-) delete mode 100644 recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch delete mode 100644 recipes-qt/qt5/qtquickcontrols2_git.bbappend diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 51369cf..c81adee 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://code.qt.io/qt-apps" +QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "master" SRC_URI += "\ diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index d656aef..5fc3965 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -35,7 +35,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=c41b4a3e669de55dfe304b8376b04a82" inherit qt5-module systemd require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://code.qt.io/qt-apps" +QT_GIT_PROJECT = "qt-apps" SRC_URI += " \ file://neptune.service \ diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb index 4bf7ef8..54f1188 100644 --- a/recipes-qt/automotive/qmllive-target_git.bb +++ b/recipes-qt/automotive/qmllive-target_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -35,8 +35,8 @@ LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-qmllive" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "qmllive" QT_MODULE_BRANCH = "master" SRC_URI += " \ diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb index 25e28df..9cc0d37 100644 --- a/recipes-qt/automotive/qtwebbrowser_git.bb +++ b/recipes-qt/automotive/qtwebbrowser_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6" inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-qtwebbrowser" +QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "dev" SRCREV = "023733af5523a5ad84359926224fa106001215f4" diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index f133352..b816a11 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -33,18 +33,18 @@ LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4 inherit qmake5 -QT_PROJECT_GIT = "git://github.com/qtproject" +QT_GIT_PROJECT = "" SRC_URI = " \ - ${QT_PROJECT_GIT}/qt-apps-boot2qt-demos.git;branch=${BRANCH};name=demos \ - ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ - ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ - ${QT_PROJECT_GIT}/qt-apps-qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ + ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH};name=demos \ + ${QT_GIT}qt/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ + ${QT_GIT}qt/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ + ${QT_GIT}qt-apps/qtwebbrowser.git;branch=${BROWSER_BRANCH};name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ " -PV = "5.7+git${SRCPV}" +PV = "5.9.5+git${SRCPV}" BRANCH = "5.7" BROWSER_BRANCH = "dev" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 32f569b..0a0a21f 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-boot2qt-launcher" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "boot2qt-launcher" SRC_URI += " \ file://b2qt-startup.sh \ diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb index 8834e19..3d9a196 100644 --- a/recipes-qt/b2qt-addons/democompositor_git.bb +++ b/recipes-qt/b2qt-addons/democompositor_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginli inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-boot2qt-demos" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "boot2qt-demos" SRCREV = "b9585b440819e1444b20f30435f81c46801158c5" diff --git a/recipes-qt/b2qt-addons/qdbd.bb b/recipes-qt/b2qt-addons/qdbd.bb index 3a9a002..c98e682 100644 --- a/recipes-qt/b2qt-addons/qdbd.bb +++ b/recipes-qt/b2qt-addons/qdbd.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -36,9 +36,9 @@ inherit distro_features_check inherit qmake5 require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qtproject" -QT_MODULE = "qt-apps-qdb" -QT_MODULE_BRANCH = "5.8" +QT_GIT_PROJECT = "qt-apps" +QT_MODULE = "qdb" +QT_MODULE_BRANCH = "5.9" SRC_URI += "file://b2qt-gadget-network.sh \ file://defaults \ diff --git a/recipes-qt/qt5/qtotaupdate.bb b/recipes-qt/qt5/qtotaupdate.bb index ee7623c..495598a 100644 --- a/recipes-qt/qt5/qtotaupdate.bb +++ b/recipes-qt/qt5/qtotaupdate.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,7 +34,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -QT_GIT = "git://github.com/qt" QT_MODULE_BRANCH = "master" SRCREV = "9a7eef1fec80e732451d501a658df9f8058a404d" diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch deleted file mode 100644 index 920273e..0000000 --- a/recipes-qt/qt5/qtquickcontrols2/0001-Control-fix-background-size-regression-caused-by-def.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 83046de497827a69bf05cd0b06ca6421b51e02b8 Mon Sep 17 00:00:00 2001 -From: J-P Nurmi -Date: Mon, 22 Jan 2018 10:58:06 +0100 -Subject: [PATCH] Control: fix background size regression caused by deferred - execution - -Task-number: QTBUG-65880 -Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e -Reviewed-by: Mitch Curtis ---- - src/quicktemplates2/qquickcontrol.cpp | 1 + - tests/auto/controls/data/tst_popup.qml | 8 ++++++++ - 2 files changed, 9 insertions(+) - -diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp -index 6fbd4c07..957936df 100644 ---- a/src/quicktemplates2/qquickcontrol.cpp -+++ b/src/quicktemplates2/qquickcontrol.cpp -@@ -1343,6 +1343,7 @@ void QQuickControl::componentComplete() - d->executeBackground(true); - d->executeContentItem(true); - QQuickItem::componentComplete(); -+ d->resizeBackground(); - d->resizeContent(); - if (!d->hasLocale) - d->locale = QQuickControlPrivate::calcLocale(d->parentItem); -diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml -index bec50ad0..1f3a097f 100644 ---- a/tests/auto/controls/data/tst_popup.qml -+++ b/tests/auto/controls/data/tst_popup.qml -@@ -1253,4 +1253,12 @@ TestCase { - control.open() - verify(control.visible) - } -+ -+ function test_deferredBackgroundSize() { -+ var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100}) -+ verify(control) -+ -+ compare(control.background.width, 200) -+ compare(control.background.height, 100) -+ } - } diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend deleted file mode 100644 index b546098..0000000 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Control-fix-background-size-regression-caused-by-def.patch \ - " diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 48329fe..96bcf7f 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Mon, 5 Mar 2018 12:55:31 +0200 Subject: qtdeviceutilities: update to latest version - Update recipe to use code.qt.io mirror - Fixes: QTBUG-66280 & minor UI bugs Change-Id: I8328fa693c58630b289bb4582d05ce41c48139d0 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtdeviceutilities.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index e671414..60b5534 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,10 +39,6 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ - " - -SRCREV = "9421f40d1eb977889fb6cd2fc8e554efd41d5453" +SRCREV = "ade83ab2c5dc02a0e59c4abcf528bc3592179137" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf