From 5406db62a6f753155050f00f68e09a71decf070d Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Tue, 1 Oct 2024 01:44:46 +0900 Subject: 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 --- .../recipes-demo/mominavi/mominavi/mominavi | 6 ++--- .../mominavi/mominavi/mominavi.service | 7 +++-- .../recipes-demo/mominavi/mominavi_git.bb | 19 ++++--------- .../recipes-demo/momiplay/momiplay/momiplay | 5 ++-- .../momiplay/momiplay/momiplay.service | 7 +++-- .../recipes-demo/momiplay/momiplay_git.bb | 18 ++++++------- .../recipes-demo/momiscreen/momiscreen/momiscreen | 13 ++++----- .../momiscreen/momiscreen/momiscreen.service | 9 ++++--- .../recipes-demo/momiscreen/momiscreen_git.bb | 31 ++++++++++------------ .../images/guest-image-ivi-demo.bb | 1 + .../qtwayland-setting/files/qtwayland-common | 0 .../files/rcar-gen3/qtwayland-common | 1 + .../qtwayland-setting/files/rpi/qtwayland-common | 1 + .../qtwayland-setting/qtwayland-setting_1.0.bb | 18 +++++++++++++ 14 files changed, 74 insertions(+), 62 deletions(-) create mode 100644 meta-agl-ic-container/recipes-qt/qtwayland-setting/files/qtwayland-common create mode 100755 meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common create mode 100644 meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common create mode 100644 meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi index a683c9d5..f8693419 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi @@ -1,10 +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=2010 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/mominavi/mominavi/mominavi.service b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service index b49609e0..1be3ceab 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service @@ -1,12 +1,15 @@ [Unit] Description=mominavi -After=multi-user.target weston.service network-online.target -Requires=multi-user.target weston.service network-online.target +After=multi-user.target momiscreen.service network-online.target +Requires=multi-user.target momiscreen.service network-online.target [Service] Type=simple EnvironmentFile=/etc/default/mominavi +EnvironmentFile=-/etc/default/qtwayland-common ExecStart=/usr/bin/mominavi +Restart=on-failure +RestartSec=1s [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb index f9b36f9f..ec5463e2 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb @@ -6,36 +6,29 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ qtbase \ - qtquickcontrols2 \ + qtdeclarative \ + qtwayland \ qtlocation \ - qtgraphicaleffects \ qtsvg \ qtwebsockets \ " -PV = "1.0.0" +PV = "2.0.0" SRC_URI = "git://git.automotivelinux.org/apps/mominavi;protocol=https;branch=${AGL_BRANCH} \ file://mominavi.service \ file://mominavi \ " -SRCREV = "10c3f7996d4bbe04d237baff2ef16573bc9eb9ed" +SRCREV = "e36c747c21907b154d6170132933d5ee6d0596eb" S = "${WORKDIR}/git" -inherit qmake5 systemd +inherit qt6-qmake systemd -MOMIMAP_MAPBOX_ACCESS_TOKEN ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" -MOMIMAP_MAPBOX_STYLE ??= "mapbox://styles/wata2ki/ckoy853ue11a117nss0uxut76" MOMIMAP_INITIAL_LATITUDE ??= "36.129" MOMIMAP_INITIAL_LONGITUDE ??= "-115.1533" QT_INSTALL_PREFIX = "/usr" -do_configure:prepend() { - if [ "${MOMIMAP_MAPBOX_ACCESS_TOKEN}" = "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" ]; then - bbwarn "WARNING: You should set MapBox development key to MOMIMAP_MAPBOX_ACCESS_TOKEN variable in local.conf." - fi -} do_install:append() { install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/mominavi.service ${D}/${systemd_unitdir}/system @@ -43,8 +36,6 @@ do_install:append() { install -m 0755 -d ${D}${sysconfdir}/default/ install -m 0755 ${WORKDIR}/mominavi ${D}${sysconfdir}/default/ - echo 'MOMIMAP_MAPBOX_ACCESS_TOKEN=${MOMIMAP_MAPBOX_ACCESS_TOKEN}' >> ${D}${sysconfdir}/default/mominavi - echo 'MOMIMAP_MAPBOX_STYLE=${MOMIMAP_MAPBOX_STYLE}' >> ${D}${sysconfdir}/default/mominavi echo 'MOMIMAP_INITIAL_LATITUDE=${MOMIMAP_INITIAL_LATITUDE}' >> ${D}${sysconfdir}/default/mominavi echo 'MOMIMAP_INITIAL_LONGITUDE=${MOMIMAP_INITIAL_LONGITUDE}' >> ${D}${sysconfdir}/default/mominavi } 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 \ 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 \ +" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb index 20f2ca86..56b362c0 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb @@ -5,6 +5,7 @@ require guest-image-minimal.bb IMAGE_INSTALL += " \ packagegroup-agl-momi-ivi-qt \ + qtwayland-setting \ momiscreen \ mominavi \ momiplay \ diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/qtwayland-common b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/qtwayland-common new file mode 100644 index 00000000..e69de29b diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common new file mode 100755 index 00000000..bf0cad2c --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rcar-gen3/qtwayland-common @@ -0,0 +1 @@ +QT_WAYLAND_HARDWARE_INTEGRATION=linux-dmabuf-unstable-v1 diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common new file mode 100644 index 00000000..bf0cad2c --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/files/rpi/qtwayland-common @@ -0,0 +1 @@ +QT_WAYLAND_HARDWARE_INTEGRATION=linux-dmabuf-unstable-v1 diff --git a/meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb b/meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb new file mode 100644 index 00000000..001a204c --- /dev/null +++ b/meta-agl-ic-container/recipes-qt/qtwayland-setting/qtwayland-setting_1.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Environment variable setting for Qt Wayland" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" + + +SRC_URI = "file://qtwayland-common \ + " + +do_install() { + install -Dm644 ${WORKDIR}/qtwayland-common ${D}${sysconfdir}/default/qtwayland-common +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} += " \ + ${sysconfdir}/default/* \ + " + -- cgit 1.2.3-korg