From db3ed4765a6540e9cee42540123e35079306238d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 29 Mar 2017 09:53:07 +0300 Subject: neptune: update to latest version Change-Id: I82f64cea54658353528dba083f0eb15334858424 Reviewed-by: Dominik Holland --- 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 8a3abf3..368050b 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 = "504d9720ed7ef921af7e5f1ebf709662baac6555" +SRCREV = "a4b46cdb7a6b4123a341857ff71a47332479acea" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ -- cgit v1.2.3-54-g00ecf From 960bbabec91bd7c13d0238a70759ee310c1fb470 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 30 Mar 2017 14:32:58 +0200 Subject: neptune-ui: Update to the latest version Also fix the neptune.service to the new standalone yaml file Task-number: QTAUTO-329 Change-Id: Id561cd051f799998f88968cf8160cd04a04087a2 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui/neptune.service | 2 +- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service index e9f3793..7793d0b 100644 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ b/recipes-qt/automotive/neptune-ui/neptune.service @@ -3,7 +3,7 @@ Description=Neptune After=dbus.service dbus-session.service systemd-user-sessions.service [Service] -ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml Restart=on-failure WorkingDirectory=/opt/neptune diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 368050b..1209c68 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 = "a4b46cdb7a6b4123a341857ff71a47332479acea" +SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ -- cgit v1.2.3-54-g00ecf From 68e55e210d4b2d86bdacb08a72db90108306479f Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 30 Mar 2017 14:32:42 +0200 Subject: qtivi: Update to the latest version Change-Id: If830306dfb29a1a28d323a3b7176572de73dba63 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtivi_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index e3dd3fd..8423f99 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -44,6 +44,6 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a15c13d6255d23ce90997913b7c1347fef396fa8" +SRCREV = "8cabf3fb534d572c905fc0a783dbb4ebc98df41c" DEPENDS = "qtbase qtdeclarative qtmultimedia" -- cgit v1.2.3-54-g00ecf From 96cd5d35ca029573bc7a4d8a7b3d5d9f10f97c70 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 3 Apr 2017 14:23:41 +0300 Subject: multiscreen-demo: update revision Change-Id: Id760ab89cc2d9c6fcf9aac8652aa7bf05c053d15 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/multiscreen-demo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 1997bd5..63860e0 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -39,7 +39,7 @@ 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_multiscreen = "c4e489dc70974212e47edbf876bd02e1e7fd7877" SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" SRCREV_FORMAT = "multiscreen_assets" -- cgit v1.2.3-54-g00ecf From f8c441c1201d0a92c7c6e08d3f21a4e4f0006696 Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Tue, 4 Apr 2017 12:34:30 +0200 Subject: neptune-ui: rdepends on dbus-session Change-Id: I0e829d71411f68493d5a276b08ab0f89b7c99643 Reviewed-by: Samuli Piippo --- 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 1209c68..9535a1b 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -44,7 +44,7 @@ SRC_URI += " \ SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" DEPENDS = "qtbase qtdeclarative" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ +RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus-session \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -- cgit v1.2.3-54-g00ecf From 573282df8e7e7b108bb3717084f0677372055b37 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 5 Apr 2017 13:45:28 +0300 Subject: Multiscreen-demo: update revision Change-Id: Ibc1cbff42bfc5dd66c3bacc7c9d66fa7186ee0a9 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/multiscreen-demo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 63860e0..0c9a2bb 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -39,7 +39,7 @@ QT_MODULE_BRANCH = "master" SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" -SRCREV_multiscreen = "c4e489dc70974212e47edbf876bd02e1e7fd7877" +SRCREV_multiscreen = "f4cd6b9667b4649b4ef8b4bb645850b05aceebde" SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" SRCREV_FORMAT = "multiscreen_assets" -- cgit v1.2.3-54-g00ecf From 117aaf1974f41527cd12620d141adb5beb38f392 Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Wed, 5 Apr 2017 10:06:36 +0200 Subject: neptune-ui: depends on qttools-native * Switch RDEPENDS from dbus-session to dbus * The i18ndemo plugin depends on lrelease Build error: build/tmp/sysroots/x86_64-linux/usr/bin/qt5/lrelease: Command not found Change-Id: I595b6633f6ef9dacdeef4393d381a7a81f358538 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 9535a1b..ad94fc8 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -43,8 +43,8 @@ SRC_URI += " \ SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" -DEPENDS = "qtbase qtdeclarative" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus-session \ +DEPENDS = "qtbase qtdeclarative qttools-native" +RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -- cgit v1.2.3-54-g00ecf From 09aff0bac92e648856d3eee80479c876a3e0fab7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 6 Apr 2017 15:58:39 +0300 Subject: neptune-ui: update revision Change-Id: I791a1f2d33715d6da0bc19fad4f4b1a0b38a019d Reviewed-by: Mikko Gronoff --- 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 ad94fc8..30ead52 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 = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" +SRCREV = "1770881783025b04ff5b4c7da7810d1648485b92" DEPENDS = "qtbase qtdeclarative qttools-native" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ -- cgit v1.2.3-54-g00ecf