From b808f7785a43e046a6ce33af67298e273bc18336 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 1 Feb 2017 15:16:39 +0100 Subject: Update GammaRay to the latest 2.7 branch Change-Id: Ieb60632d524c9a501aacf71df7a0c35f69810ca1 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/gammaray_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index f9fb715..0603eef 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb @@ -2,15 +2,15 @@ SUMMARY = "GammaRay Qt introspection probe" HOMEPAGE = "http://www.kdab.com/gammaray" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=5996517d53e3c2722d457fb633e970ed" +LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=560b8b2e529f7a17ee5dde6e5d0c0d69" inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" -BRANCH = "master" -SRCREV = "b961eb1b84718256acc678ec16a2b45e98990cd7" -PV = "master+git${SRCPV}" +BRANCH = "2.7" +SRCREV = "dc7a5d383bf7aa7b3e0361fa1d871eb7fad1a04a" +PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" -- cgit v1.2.3-54-g00ecf From d3b2f4c81168f55aaa19454e92943386a97b35af Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Thu, 12 Jan 2017 10:12:15 +0100 Subject: AM: Add appman tools to automotive nativesdk Task-number: QTAUTO-274 Change-Id: I467e93dc25a314cda0a4c35fe990c2b1274bc251 Reviewed-by: Gordan Markus Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtapplicationmanager_git.bb | 15 +++++++-- .../meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb | 2 +- ...kagegroup-b2qt-automotive-qt5-toolchain-host.bb | 39 ++++++++++++++++++++++ recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 5 +++ recipes/libyaml/libyaml_%.bbappend | 30 +++++++++++++++++ 5 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb create mode 100644 recipes/libyaml/libyaml_%.bbappend (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 3b54890..c4f1eb4 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -29,16 +29,18 @@ 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=317fda864ac33d41406ff3938c3e78d1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "be9e9a37c2cd848cfdbb97990e0047f1a0834a8a" +SRCREV = "74d8bb0c8590dec7d6106781b1aa460756425d8f" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" + RDEPENDS_${PN} = "libcrypto ${PN}-tools" +RDEPENDS_${PN}_remove_mingw32 = "libcrypto" EXTRA_QMAKEVARS_PRE += "\ ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \ @@ -55,3 +57,12 @@ do_install_append() { FILES_${PN} += "\ /opt/am \ " + +BBCLASSEXTEND += "nativesdk" + +DEPENDS_class-nativesdk = "qtbase nativesdk-glibc-locale" +DEPENDS_class-nativesdk_remove_mingw32 += "nativesdk-glibc-locale" + +EXTRA_QMAKEVARS_PRE_class-nativesdk += "\ + -config tools-only \ + " diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb index e74dd92..94bf48d 100644 --- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb +++ b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb @@ -34,6 +34,6 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" inherit populate_b2qt_qt5_sdk -TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" +TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host" TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \ packagegroup-b2qt-automotive-qt5-toolchain-target" diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb new file mode 100644 index 0000000..acae372 --- /dev/null +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb @@ -0,0 +1,39 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK" +LICENSE = "The-Qt-Company-DCLA-2.1" +PR = "r0" + +inherit nativesdk packagegroup qtquickcompiler + +RDEPENDS_${PN} += "\ + nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \ + nativesdk-qtapplicationmanager-tools \ + " diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 78106f8..d79bf57 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -33,5 +33,10 @@ SRC_URI += "\ file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \ " +PACKAGECONFIG += "openssl" +PACKAGECONFIG_remove_mingw32 += "openssl" + +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" + fakeroot do_generate_qt_environment_file_mingw32() { } diff --git a/recipes/libyaml/libyaml_%.bbappend b/recipes/libyaml/libyaml_%.bbappend new file mode 100644 index 0000000..728a546 --- /dev/null +++ b/recipes/libyaml/libyaml_%.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$ +## +############################################################################ + +BBCLASSEXTEND += "nativesdk" -- cgit v1.2.3-54-g00ecf From 74b3f15cf43396fce210abbfa9146198e7af36d1 Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Wed, 22 Feb 2017 09:40:05 +0100 Subject: neptune-ui: add runtime dependencies Neptune-ui depends on qtquickcontrols-qmlplugins and qtgraphicaleffects-qmlplugins Change-Id: Ie78228e42795bed9ccbfc631f1b9ea8189b9fb0e Reviewed-by: Nedim Hadzic --- recipes-qt/automotive/neptune-ui_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index d4ef8e4..7397c11 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -46,6 +46,7 @@ SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ + qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_configure_prepend() { -- cgit v1.2.3-54-g00ecf From 09f8c75cfeb0ea6d6b77dbd25cfbf779aa395b45 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 28 Feb 2017 11:10:51 +0200 Subject: Update automotive components Use latest version of QtWayland from 5.8 branch, which is needed for qtapplicationmanager to work correctly. Change Drive CX to use basic rendering loop. Change-Id: If74255e982a676f1c556f2ef25975b675a484e05 Reviewed-by: Dominik Holland --- recipes-qt/automotive/neptune-ui_git.bb | 7 +---- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- .../tegra-t18x/appcontroller.conf | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 30 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 recipes-qt/qt5/qtwayland_git.bbappend (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 7397c11..11b81db 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -36,23 +36,18 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT = "git://github.com/qtproject" QT_MODULE = "qt-apps-neptune-ui" -QT_MODULE_BRANCH = "master" SRC_URI += " \ file://neptune.service \ " -SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f" +SRCREV = "7d865406d6ccc538f9fd658a0d2b557e115d6919" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -do_configure_prepend() { - echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro -} - do_install_append() { install -m 0755 -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index c4f1eb4..98d0042 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 = "74d8bb0c8590dec7d6106781b1aa460756425d8f" +SRCREV = "23a0e5a929b5b03f91ae532a765e2b7a543c3a99" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf index 64226cb..7236378 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf @@ -3,5 +3,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 env=QT_QUICK_CONTROLS_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp -env=QSG_RENDER_LOOP=windows +env=QSG_RENDER_LOOP=basic base=linux diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend new file mode 100644 index 0000000..7ef6ed9 --- /dev/null +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +SRCREV = "7d527c1914710a511c06713bbda1572b767cea34" -- cgit v1.2.3-54-g00ecf From c2f620c0dafbefe821e484ce44348ff41f660e6f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 6 Mar 2017 14:45:57 +0200 Subject: emulator: correctly append qtsimulator configuration Append configuration without overriding the defaults. Change-Id: Id8ceefb1a04f0ad825349cab549ac77b68c0de94 Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtlocation_git.bbappend | 4 ++-- recipes-qt/qt5/qtsensors_git.bbappend | 4 ++-- recipes-qt/qt5/qtsystems_git.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 2fed196..7ee2382 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -29,5 +29,5 @@ PACKAGECONFIG += "gypsy" -EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" -DEPENDS_emulator += "qtsimulator" +EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" +DEPENDS_append_emulator = " qtsimulator" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 890656c..655364b 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" -DEPENDS_emulator += "qtsimulator" +EXTRA_QMAKEVARS_PRE_append_emulator = " SENSORS_PLUGINS=simulator" +DEPENDS_append_emulator = " qtsimulator" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index f199937..2a949eb 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" -DEPENDS_emulator += "qtsimulator" +EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" +DEPENDS_append_emulator = " qtsimulator" -- cgit v1.2.3-54-g00ecf From cbad2b88d09dbfddd13aad179d2666a4ad743dd0 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 8 Mar 2017 13:59:53 +0100 Subject: Update GammaRay to the same version as used by the QtAS 1.1 host tools Change-Id: I61c590d3d901235cbe6e67f4d3a115ecc26b781c Reviewed-by: Jan Arne Petersen --- recipes-qt/automotive/gammaray_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 0603eef..ca5db11 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 = "2.7" -SRCREV = "dc7a5d383bf7aa7b3e0361fa1d871eb7fad1a04a" +SRCREV = "a22da6d63cab08f3ef8588611fdbda3f96731efe" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \ -- cgit v1.2.3-54-g00ecf From 7833bd3a6f9a5f737faa600c40c44b3b422a401d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 12:49:58 +0200 Subject: neptune: update to include fix for i18ndemo Change-Id: Icce4a1345accccf6becd237a28093dddd273b353 Reviewed-by: Volker Krause --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 11b81db..8a3abf3 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -41,7 +41,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "7d865406d6ccc538f9fd658a0d2b557e115d6919" +SRCREV = "504d9720ed7ef921af7e5f1ebf709662baac6555" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ -- cgit v1.2.3-54-g00ecf From 8f88b218cab885bdbc67db77c876fc5a7dd4e790 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 14 Feb 2017 15:08:50 +0200 Subject: Add multiscreen automotive demo Startup is disabled by default. Task-number: QTAUTO-275 Change-Id: I3c7cbca10dc3a0d0ca2cc512c34b02b6985fe0d9 Reviewed-by: Teemu Holappa --- recipes-qt/automotive/multiscreen-demo_git.bb | 65 ++++++++++++++++++++++ .../packagegroup-b2qt-automotive-addons.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 recipes-qt/automotive/multiscreen-demo_git.bb (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb new file mode 100644 index 0000000..1997bd5 --- /dev/null +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -0,0 +1,65 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +DESCRIPTION = "Multiscreen Demo" +LICENSE = "GPLv3 | The-Qt-Company-DCLA-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073" + +inherit qt5-module systemd +require recipes-qt/qt5/qt5-git.inc + +QT_GIT = "git://code.qt.io/qt-apps" +QT_MODULE_BRANCH = "master" + +SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" + +SRCREV_multiscreen = "77ecd7d03aeea3bb7d10ac8ef448920da11ae306" +SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" + +SRCREV_FORMAT = "multiscreen_assets" +SRCREV = "${SRCREV_multiscreen}" + +DEPENDS = "qtbase qtdeclarative qt3d" +RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard" + +EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=/opt" + +do_install_append() { + install -m 0755 ${S}/start.sh ${D}/opt/automotivedemo/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/scripts/automotivedemo.service ${D}${systemd_system_unitdir}/ +} + +FILES_${PN} += "\ + /opt/automotivedemo \ + " + +SYSTEMD_SERVICE_${PN} = "automotivedemo.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb index 391224e..bd7f777 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb @@ -42,4 +42,5 @@ RDEPENDS_${PN} += " \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \ gammaray \ qmllive-target \ + multiscreen-demo \ " -- cgit v1.2.3-54-g00ecf From 00b5087da9fa37ab49a29021bf4b1e405634a751 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 16 Mar 2017 17:10:21 +0200 Subject: AM: update revision Change-Id: I54f29272075b9efc5ce3d8eebaf582001f299382 Reviewed-by: Dominik Holland --- recipes-qt/automotive/qtapplicationmanager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 98d0042..4e71c85 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 = "23a0e5a929b5b03f91ae532a765e2b7a543c3a99" +SRCREV = "f472ef3662cf0a9bc2bf727c7cef18fd884df5a2" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" -- cgit v1.2.3-54-g00ecf