Update Momi IVI guest to migrate to Qt6

Qt6 packages structure was changed from Qt5.
This change adopt to this structure changes.

Bug-AGL: SPEC-5162

Change-Id: Ia64e066b1334436bea8654c48dd38cd89fa65fa5
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>

2 files changed, 39 insertions, 11 deletions

diff --git a/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-momi-ivi-qt.bb b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-momi-ivi-qt.bb
new file mode 100755
index 00000000..df891428
--- /dev/null
+++ b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-momi-ivi-qt.bb
@@ -0,0 +1,36 @@
+SUMMARY = "AGL Instrument Cluster Demo Qt Packages"
+DESCRIPTION = "This pacage group including Qt packages for AGL Instrument Cluster Demo."
+HOMEPAGE = "https://confluence.automotivelinux.org/display/IC"
+
+LICENSE = "Apache-2.0"
+
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
+inherit packagegroup
+
+PACKAGES = "\
+    packagegroup-agl-momi-ivi-qt \
+"
+RDEPENDS:${PN} += "\
+    qtbase qtbase-plugins qtbase-qmlplugins \
+    qtdeclarative qtdeclarative-qmlplugins \
+    qt3d qt3d-plugins qt3d-qmlplugins\
+    qtquick3d qtquick3d \
+    qtwayland qtwayland-plugins qtwayland-qmlplugins \
+    qtlocation qtlocation-plugins qtlocation-qmlplugins \
+    qtpositioning qtpositioning-plugins qtpositioning-qmlplugins \
+    qtsvg qtsvg-plugins qtsvg-qmlplugins \
+    qtmultimedia qtmultimedia-plugins qtmultimedia-qmlplugins \
+    \
+    gstreamer1.0 \
+    gstreamer1.0-plugins-base-meta \
+    gstreamer1.0-plugins-good-meta \
+    gstreamer1.0-plugins-bad-meta \
+    gstreamer1.0-plugins-ugly-meta \
+    gstreamer1.0-libav \
+    \
+    pulseaudio-server pulseaudio-pa-info pulseaudio-misc \
+    pulseaudio-module-alsa-sink pulseaudio-module-alsa-source \
+    pulseaudio-module-native-protocol-unix pulseaudio-module-loopback \
+    pulseaudio-module-null-sink pulseaudio-module-null-source \
+"
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 22184578..27f2fcbe 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
@@ -1,18 +1,13 @@
-SUMMARY = "LXC ivi demo guest image"
+SUMMARY = "Momi IVI demo guest image"
 LICENSE = "MIT"
 
 require guest-image-minimal.bb
 
 IMAGE_INSTALL += " \
-    weston \
-    weston-init-guest \
-    weston-ini-conf-guest \
-    wayland-ivi-extension \
-    ilm-manager \
+    packagegroup-agl-momi-ivi-qt \
+    momiscreen \
     mominavi \
     momiplay \
-    momiscreen \
-    packagegroup-agl-ic-qt \
     systemd-netif-config \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
@@ -22,9 +17,6 @@ IMAGE_INSTALL += " \
     ttf-dejavu-mathtexgyre \
     ttf-dejavu-common \
     ca-certificates \
-    wireplumber \
-    packagegroup-pipewire-base \
-    wireplumber-policy-config-agl \
 "
 
 IMAGE_INSTALL:append:rpi = " mesa-megadriver"