summaryrefslogtreecommitdiffstats
path: root/meta-agl-ic-container/recipes-demo/momiscreen
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-ic-container/recipes-demo/momiscreen')
-rw-r--r--meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen13
-rw-r--r--meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service9
-rw-r--r--meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb31
3 files changed, 25 insertions, 28 deletions
diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen
index d10b9da4..e5945860 100644
--- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen
+++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen
@@ -1,11 +1,8 @@
-XDG_RUNTIME_DIR=/run/user/0
-QT_QPA_PLATFORM=wayland-egl
-QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
+QT_QPA_PLATFORM=eglfs
+QT_QPA_EGLFS_DRMLEASE=lease
+DLM_RUNTIME_PATH=/var/display/drm-lease-manager
QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
QT_QPA_FONTDIR=/usr/share/fonts/truetype
-QT_IVI_SURFACE_ID=2000
-QT_WAYLAND_SHELL_INTEGRATION=ivi-shell
-QML_IMPORT_PATH=/usr/lib/qml/
-QML2_IMPORT_PATH=/usr/lib/qml/
-WAYLAND_DISPLAY=wayland-1
+XDG_RUNTIME_DIR=/run/user/0
HOME=/home/root
diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service
index a3f54e0c..ad68240d 100644
--- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service
+++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen.service
@@ -1,12 +1,15 @@
[Unit]
-Description=momiscreen
-After=multi-user.target weston.service
-Requires=multi-user.target weston.service
+Description=Homescreen for AGL Momi IVI
+After=multi-user.target
+Requires=multi-user.target
[Service]
Type=simple
EnvironmentFile=/etc/default/momiscreen
+EnvironmentFile=-/etc/default/qtwayland-common
ExecStart=/usr/bin/momiscreen
+Restart=on-failure
+StartLimitInterval=0
[Install]
WantedBy=multi-user.target
diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb
index 568eb066..ec199ac7 100644
--- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb
+++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb
@@ -1,29 +1,26 @@
-SUMMARY = "Momiyama home screen example"
-DESCRIPTION = "The momiscreen is a home screen example. \
- The momiscreen is not require agl-appfw."
+SUMMARY = "Homescreen for AGL Momi IVI"
+DESCRIPTION = "Homescreen for AGL Momi IVI."
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = " \
+ qttools-native \
qtbase \
- qtquickcontrols2 \
- qtgraphicaleffects \
- qtsvg \
- "
+ qtdeclarative \
+ qtwayland \
+"
-PV = "1.0.0"
+PV = "2.0.0"
SRC_URI = "git://git.automotivelinux.org/apps/momiscreen;protocol=https;branch=${AGL_BRANCH} \
file://momiscreen.service \
file://momiscreen \
"
-SRCREV = "22b44f911bf6c53298055626cef671a24e9e9069"
+SRCREV = "88fb60ad9d0c673f868d907ca451462ec16c9d7f"
S = "${WORKDIR}/git"
-inherit qmake5 systemd
-
-QT_INSTALL_PREFIX = "/usr"
+inherit cmake qt6-cmake systemd pkgconfig
do_install:append() {
install -d ${D}/${systemd_unitdir}/system
@@ -33,11 +30,11 @@ do_install:append() {
install -m 0755 ${WORKDIR}/momiscreen ${D}${sysconfdir}/default/
}
-FILES:${PN} += " \
- ${systemd_unitdir} \
- ${sysconfdir}/*/* \
- "
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE:${PN} = "momiscreen.service"
-RDEPENDS:${PN} = "qtsvg qtsvg-plugins qtsvg-qmlplugins"
+RDEPENDS:${PN} = " \
+ qtbase \
+ qtdeclarative \
+ qtwayland \
+"