From 8e102951ebcbdb8017226830e33a9354cf85b97e Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Thu, 17 Nov 2016 10:16:39 +0200 Subject: Update qtdeviceutilities module revision Change-Id: Ia06a124b84c78f2a1cb2e8b572c16e096b668657 Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtdeviceutilities.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index a4c0418..399b320 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -43,6 +43,6 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ " -SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" +SRCREV = "129e04b7aa0c73bedab3671d2de7599f7b9af9d6" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From cbb9502193d49293e7cac62370d3649cdba9ba62 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 2 Sep 2016 12:46:16 +0300 Subject: beaglebone: start qtlauncher only after /dev/fb0 exists Beaglebone creates /dev/fb0 late in the boot process, which causes Qt applications to crash if started too early. Make systemd notice fb0 creation and bind application startup to it. (cherry picked from commit 300a9420bce2bcf4e0fffe30dae5cb0504e2cadb) Change-Id: I8875334407c5a01bd6597e2c4fc1af96e396c639 Reviewed-by: Kalle Viironen --- meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules | 1 + meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb | 5 +++++ recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service | 11 +++++++++++ .../b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service | 11 +++++++++++ 4 files changed, 28 insertions(+) create mode 100644 meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules create mode 100644 recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service create mode 100644 recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules b/meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules new file mode 100644 index 0000000..ca5ebc8 --- /dev/null +++ b/meta-ti-extras/recipes/libgles/libgles-omap3/99-fb.rules @@ -0,0 +1 @@ +KERNEL=="fb0", TAG+="systemd" diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb index 1b1bf22..fe484f5 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb @@ -38,6 +38,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gf file://cputype \ file://rc.pvr \ file://99-bufferclass.rules \ + file://99-fb.rules \ " SRC_URI[md5sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', '${MD5SUM_HARDFP}', '${MD5SUM_SOFTFP}', d)}" @@ -53,3 +54,7 @@ do_configure_append() { sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak done } + +do_install_append() { + install -m 0644 ${WORKDIR}/99-fb.rules ${D}${sysconfdir}/udev/rules.d/ +} diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service b/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service new file mode 100644 index 0000000..cdf6480 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/b2qt.service @@ -0,0 +1,11 @@ +[Unit] +Description=B2Qt user application +BindsTo=dev-fb0.device +After=dev-fb0.device +ConditionPathExists=/usr/bin/b2qt + +[Service] +ExecStart=-/usr/bin/appcontroller /usr/bin/b2qt + +[Install] +WantedBy=multi-user.target diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service b/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service new file mode 100644 index 0000000..1094675 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-launcher/beaglebone/qtlauncher.service @@ -0,0 +1,11 @@ +[Unit] +Description=B2Qt Launcher Demo +BindsTo=dev-fb0.device +After=dev-fb0.device +ConditionPathExists=!/usr/bin/b2qt + +[Service] +ExecStart=-/usr/bin/appcontroller /usr/bin/qtlauncher --applications-root /data/user/qt + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf From 9e2f18f4c4c0ef7cfb80693802b501a253d8b079 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 21 Nov 2016 08:11:49 +0200 Subject: qt5: update submodules Change-Id: I5ac8a0f31b2553575cbab782cb2ed8a7e42f4eea Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 4c832e0..8bd9135 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" +SRCREV = "db6c31af0177025f178cb42d5febbdc47dc87778" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index bcd3aa2..175a81d 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" +SRCREV = "db6c31af0177025f178cb42d5febbdc47dc87778" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 4b0d206..6e573b1 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -53,5 +53,5 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "3654a401f8e046e2fa5a340d0380cc0088a03048" +SRCREV = "db6c31af0177025f178cb42d5febbdc47dc87778" -- cgit v1.2.3-54-g00ecf From ddbf2f6be8ef6ee2ca72c3bc2de183993849189b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 21 Nov 2016 11:51:49 +0200 Subject: mesa: make sure we get libgles3-dev package in toolchain There is no libgles3 library available, but mesa has the headers in a separate package. Add dependency so that libgles2 pull also the libgles3 headers. Change-Id: I756a0c80aeaa9b5017a3e2e2144cd5c1e5429823 Task-number: QTBUG-57188 Reviewed-by: Karim Pinter Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes/mesa/mesa_%.bbappend | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 recipes/mesa/mesa_%.bbappend diff --git a/recipes/mesa/mesa_%.bbappend b/recipes/mesa/mesa_%.bbappend new file mode 100644 index 0000000..fc55a18 --- /dev/null +++ b/recipes/mesa/mesa_%.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$ +## +############################################################################ + +RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev" -- cgit v1.2.3-54-g00ecf From 654805e97a66b98e2c3fbf13821f25afd2d9ce39 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 29 Nov 2016 12:45:06 +0200 Subject: gdb: correctly enable python for mingw sdk build Needs a fix in meta-mingw to correctly enable python for gdb build. Fixes raspberrypi toolchain on windows which did not include python support in the gdb. Task-number: QTBUG-57316 Change-Id: I98f7147420b03dd877ba10866f69ec1c53a870f0 Reviewed-by: Mikko Gronoff --- recipes/gdb/gdb-cross-canadian_7.%.bbappend | 1 + scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/gdb/gdb-cross-canadian_7.%.bbappend b/recipes/gdb/gdb-cross-canadian_7.%.bbappend index b217805..34c14b7 100644 --- a/recipes/gdb/gdb-cross-canadian_7.%.bbappend +++ b/recipes/gdb/gdb-cross-canadian_7.%.bbappend @@ -29,6 +29,7 @@ DEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python" RDEPENDS_${PN}_append_sdkmingw32 = " nativesdk-prebuild-python" +EXTRA_OECONF_remove_sdkmingw32 = " --with-python=no" EXTRA_OECONF_append_sdkmingw32 = " --with-python" do_install_append_sdkmingw32() { diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ad454d1..2966f85 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -31,7 +31,7 @@ + revision="475d9366eb74ef5c10ec398281dce75ceedddf1c"/> Date: Thu, 1 Dec 2016 14:46:31 +0200 Subject: qt5: update submodules Change-Id: Ia05a3bbcdf0fb30497bef816c58d44eab20e6d00 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 8bd9135..04ffab9 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "db6c31af0177025f178cb42d5febbdc47dc87778" +SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 175a81d..023411a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "db6c31af0177025f178cb42d5febbdc47dc87778" +SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 6e573b1..61235d4 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -53,5 +53,5 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "db6c31af0177025f178cb42d5febbdc47dc87778" +SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index aadbc09..57a9903 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 = "15ded5ca62f53a01f85a52326f0b335a8a012bbd" +SRCREV_qtwebengine = "9cc97f0c63049a8076476acc89c875c9e240abfb" SRCREV_chromium = "881a7672e23192eaf7e1ac2f94e086b560104f10" -- cgit v1.2.3-54-g00ecf From 68b683a85571d76ccaf9e61e71325aacb74e4e7e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 Dec 2016 10:02:24 +0200 Subject: colibri-imx7: use opengldummy for egl and libgles2 Use opengldummy instead mesa for the headers and libs, which are required only for building Qt and not at runtime. Change-Id: I82ff661e842375bd68dffb3db790b0309c71d14a Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- conf/distro/include/colibri-imx7.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 8b580d4..ca75b0a 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf @@ -43,4 +43,7 @@ BOOT_SCRIPTS += " \ u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ " +PREFERRED_PROVIDER_virtual/egl = "opengldummy" +PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" + DISTRO_FEATURES_remove = "webengine" -- cgit v1.2.3-54-g00ecf