diff options
| author |   Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2024-10-01 01:44:46 +0900 |
|---|---|---|
| committer | Naoto YAMAGUCHI <naoto.yamaguchi@aisin.co.jp> | 2024-10-09 16:49:01 +0000 |
| commit | 5406db62a6f753155050f00f68e09a71decf070d (patch) | |
| tree | 673ddd917be9e1234049fc4c4c63405150e3da2d /meta-agl-ic-container/recipes-demo/momiplay | |
| parent | 0905846dec112d69a532dac26bd2e31ef94d35d7 (diff) | |
Update each apps to migrate Qt6
The AGL IC container integration migrate to Qt6 from Qt5 now.
Each Apps needs modification.
This patch change rev and environment setting.
Bug-AGL: SPEC-5162
Change-Id: Ib7273fc13d5ab381bed7675662bd1cdc7f941c33
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container/recipes-demo/momiplay')
3 files changed, 15 insertions, 15 deletions
diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay index 62c21af9..9dfce0dc 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay @@ -1,11 +1,10 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl -QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2011 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ +QT_QPA_FONTDIR=/usr/share/fonts/truetype QML_IMPORT_PATH=/usr/lib/qml/ QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service index ef974023..69d08176 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay.service @@ -1,12 +1,15 @@ [Unit] Description=momiplayer -After=multi-user.target weston.service -Requires=multi-user.target weston.service +After=multi-user.target momiscreen.service +Requires=multi-user.target momiscreen.service [Service] Type=simple EnvironmentFile=/etc/default/momiplay +EnvironmentFile=-/etc/default/qtwayland-common ExecStart=/usr/bin/momiplay +Restart=on-failure +RestartSec=1s [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb b/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb index b4e17ffa..4daa2296 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb @@ -1,30 +1,29 @@ SUMMARY = "Momiyama mediaplayer example based on AGL sample app. at CC" DESCRIPTION = "The momiplay is a mediaplayer example based on AGL sample app. \ The momiplay is not require agl-appfw." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=17;md5=f4ad6901289f57f62d15bfefb5cc3633" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=17;md5=24274715d08cb2416c20d2907d19f413" DEPENDS = " \ + qttools-native \ qtbase \ - qtquickcontrols2 \ - qtgraphicaleffects \ + qtdeclarative \ + qtwayland \ qtsvg \ qtmultimedia \ " -PV = "1.0.0" +PV = "2.0.0" SRC_URI = "git://git.automotivelinux.org/apps/momiplayer;protocol=https;branch=${AGL_BRANCH} \ file://momiplay.service \ file://momiplay \ " -SRCREV = "cb21f0fe4259c3b427ef7b2dd2c43fa73369ae42" +SRCREV = "b4202d3d5aca7842314edbf010e2e8605a6a9e24" 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 @@ -40,7 +39,6 @@ FILES:${PN} += " \ " SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "momiplay.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" RDEPENDS:${PN} = " \ qtsvg qtsvg-plugins qtsvg-qmlplugins \ |