From 8ad260216c663085fb5f6115da54600cec2565ac Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Wed, 24 Apr 2024 09:05:06 +0000
Subject: WIP: Prepare for QT6

Change-Id: I4d63976c68f03499df40cba4ebe39a5f85c64fcd
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---
 .../cluster-refgui/cluster-refgui_git.bb           | 50 ----------------------
 .../cluster-refgui/cluster-refgui_git.bbDISABLED   | 50 ++++++++++++++++++++++
 .../feature/agl-ic-container/50_bblayers.conf.inc  |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb
 create mode 100644 meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bbDISABLED

diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb
deleted file mode 100644
index d7cb85f9..00000000
--- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "AGL Cluster Reference GUI"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5335066555b14d832335aa4660d6c376"
-
-DEPENDS = " \
-    qttools-native \
-    qtmultimedia \
-    cluster-service \
-"
-
-BRANCH = "master"
-SRC_URI = "git://git.automotivelinux.org/src/cluster-refgui;protocol=https;branch=${BRANCH} \
-           file://cluster.service \
-           file://cluster \
-"
-SRCREV = "cbb63f0e45340f6dd2cc9f360ed4da15c745186f"
-
-S = "${WORKDIR}/git"
-
-inherit cmake cmake_qt5 systemd pkgconfig
-
-# NOTE:
-# The app currently assumes the mp4 video file is in the same
-# directory, so changing this to ${bindir} to better match FHS
-# requires code changes.
-APP_DIR = "/opt/apps"
-EXTRA_OECMAKE = "-DAPPS_INST_DIR=${APP_DIR}"
-
-SYSTEMD_SERVICE:${PN} = "cluster.service"
-
-do_install:append() {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
-    
-    install -m 0755 -d ${D}${sysconfdir}/default/
-    install -m 0755 ${WORKDIR}/cluster ${D}${sysconfdir}/default/
-}
-
-FILES:${PN} += "${APP_DIR}/"
-
-RDEPENDS:${PN} = " \
-    qtbase \
-    qtdeclarative \
-    qt3d \
-    qtgraphicaleffects \
-    qtmultimedia \
-    qtquickcontrols \
-    qtquickcontrols2 \
-    qtwayland \
-"
diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bbDISABLED b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bbDISABLED
new file mode 100644
index 00000000..d7cb85f9
--- /dev/null
+++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui_git.bbDISABLED
@@ -0,0 +1,50 @@
+DESCRIPTION = "AGL Cluster Reference GUI"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5335066555b14d832335aa4660d6c376"
+
+DEPENDS = " \
+    qttools-native \
+    qtmultimedia \
+    cluster-service \
+"
+
+BRANCH = "master"
+SRC_URI = "git://git.automotivelinux.org/src/cluster-refgui;protocol=https;branch=${BRANCH} \
+           file://cluster.service \
+           file://cluster \
+"
+SRCREV = "cbb63f0e45340f6dd2cc9f360ed4da15c745186f"
+
+S = "${WORKDIR}/git"
+
+inherit cmake cmake_qt5 systemd pkgconfig
+
+# NOTE:
+# The app currently assumes the mp4 video file is in the same
+# directory, so changing this to ${bindir} to better match FHS
+# requires code changes.
+APP_DIR = "/opt/apps"
+EXTRA_OECMAKE = "-DAPPS_INST_DIR=${APP_DIR}"
+
+SYSTEMD_SERVICE:${PN} = "cluster.service"
+
+do_install:append() {
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
+    
+    install -m 0755 -d ${D}${sysconfdir}/default/
+    install -m 0755 ${WORKDIR}/cluster ${D}${sysconfdir}/default/
+}
+
+FILES:${PN} += "${APP_DIR}/"
+
+RDEPENDS:${PN} = " \
+    qtbase \
+    qtdeclarative \
+    qt3d \
+    qtgraphicaleffects \
+    qtmultimedia \
+    qtquickcontrols \
+    qtquickcontrols2 \
+    qtwayland \
+"
diff --git a/templates/feature/agl-ic-container/50_bblayers.conf.inc b/templates/feature/agl-ic-container/50_bblayers.conf.inc
index 119cacb7..16da1c4d 100644
--- a/templates/feature/agl-ic-container/50_bblayers.conf.inc
+++ b/templates/feature/agl-ic-container/50_bblayers.conf.inc
@@ -2,7 +2,7 @@ AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
 AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
 AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
 AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
-AGL_META_QT5 = "${METADIR}/external/meta-qt5"
+AGL_META_QT6 = "${METADIR}/external/meta-qt6"
 
 BBLAYERS =+ " \
   ${METADIR}/meta-agl-devel/meta-agl-ic-container \
-- 
cgit 1.2.3-korg