From 95a7d3e9bcd4b250c28c46ce95ac215066e0264a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 19 Apr 2016 10:07:08 +0300 Subject: automotive: update revisions Update neptune-ui and qtapplication manager, which need latest qtwayland. Add needed environment variable for wayland. Change-Id: I2e9eddd109546dca49451bff6bcf5623e16eb0bc Reviewed-by: Robert Griebl --- recipes-qt/automotive/neptune-ui_git.bb | 10 +++++----- recipes-qt/automotive/qtapplicationmanager_git.bb | 10 +++++----- recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf | 1 + .../b2qt-appcontroller/colibri-vf/appcontroller.conf | 1 + .../b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf | 1 + .../b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf | 1 + .../b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf | 1 + recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- 9 files changed, 17 insertions(+), 12 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index a71cce6..702ca90 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -20,17 +20,17 @@ ############################################################################## DESCRIPTION = "Neptune IVI UI" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c" inherit qt5-module sdk-sources systemd SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/neptune-ui \ + git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/neptune-ui \ file://neptune.service \ " -SRCREV = "9b05221285ce2369e1e87e88c86970b943797294" +SRCREV = "c405b322d773068521855e048f215c6ec59e965f" BRANCH = "master" S = "${WORKDIR}/git" @@ -48,7 +48,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/Main*.qml ${D}/opt/neptune - install -m 0644 ${S}/ClusterAndHUD.qml ${D}/opt/neptune + install -m 0644 ${S}/MainWithCluster.qml ${D}/opt/neptune install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune } diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 2c21d1b..240fedc 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -20,17 +20,17 @@ ############################################################################## DESCRIPTION = "Qt component for application lifecycle management" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=311507adb75495acc0b61d69109485ce" +LICENSE = "GPL-3.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1" inherit qmake5 sdk-sources SRC_URI = " \ - git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtapplicationmanager \ + git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/qtapplicationmanager \ " -SRCREV = "b7578378b578788c2ae9c60708a2908d3b090c16" -BRANCH = "master" +SRCREV = "97530155847257102fe0a159c681857fb9eb1194" +BRANCH = "5.7" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf index cefd3a9..05d666d 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf @@ -2,4 +2,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 env=QT_QUICK_CONTROLS_STYLE=Flat +env=XDG_RUNTIME_DIR=/tmp base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf index ff4d0da..89e6cd4 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf @@ -4,4 +4,5 @@ env=QSG_RENDER_LOOP=basic env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QUICK_CONTROLS_STYLE=Flat +env=XDG_RUNTIME_DIR=/tmp base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf index e3b35f0..29d8b6a 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf @@ -4,4 +4,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QTGLESSTREAM_DISPLAY=192.168.56.1 env=QT_QUICK_CONTROLS_STYLE=Flat +env=XDG_RUNTIME_DIR=/tmp base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf index c8cd106..7105f4b 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf @@ -4,4 +4,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src env=QT_QUICK_CONTROLS_STYLE=Flat +env=XDG_RUNTIME_DIR=/tmp base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf index bc143da..200aa90 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf @@ -2,4 +2,5 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=1 env=QT_QUICK_CONTROLS_STYLE=Flat +env=XDG_RUNTIME_DIR=/tmp base=linux diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 2fda7f9..30c7f3a 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "44f4395879ec9464c0a6dd3a7635fad05ad14118" +SRCREV = "15216555593740029f3c25ee16dc4dc248a017b7" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 2fda7f9..30c7f3a 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "44f4395879ec9464c0a6dd3a7635fad05ad14118" +SRCREV = "15216555593740029f3c25ee16dc4dc248a017b7" -- cgit v1.2.3-54-g00ecf