From 3641b93750969a52b852c16d4e019bbdb3acde3b Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 24 Aug 2023 16:44:18 +0200 Subject: [PATCH] qt6: add preliminary support for mp1 platforms Make sure all packagegroups and examples needed for Qt6 support are accesible to both NXP and STM-based platforms. https://onedigi.atlassian.net/browse/DEL-8655 Signed-off-by: Gabriel Valcazar --- .../qt6-layer/STM/recipes-qt/qt6/qtbase_%.bbappend | 1 + .../STM/recipes-qt/qt6/qtdeclarative_%.bbappend | 1 + .../examples/cinematicexperience-rhi/icon_qt.png | Bin .../examples/cinematicexperience-rhi_%.bbappend | 0 .../examples/cinematicexperience-rhi_1.0.bb | 0 .../packagegroups}/packagegroup-qt6-demos.bb | 4 ++++ .../packagegroups}/packagegroup-qt6-dey.bb | 5 +++++ .../packagegroups}/packagegroup-qt6-webengine.bb | 0 .../{NXP => }/recipes-qt/qt6/qtquick3d_%.bbappend | 0 9 files changed, 11 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtbase_%.bbappend create mode 100644 meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtdeclarative_%.bbappend rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP => }/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png (100%) rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP => }/recipes-qt/examples/cinematicexperience-rhi_%.bbappend (100%) rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP => }/recipes-qt/examples/cinematicexperience-rhi_1.0.bb (100%) rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP/recipes-fsl/packagegroup => recipes-qt/packagegroups}/packagegroup-qt6-demos.bb (84%) rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP/recipes-fsl/packagegroup => recipes-qt/packagegroups}/packagegroup-qt6-dey.bb (95%) rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP/recipes-fsl/packagegroup => recipes-qt/packagegroups}/packagegroup-qt6-webengine.bb (100%) rename meta-digi-dey/dynamic-layers/qt6-layer/{NXP => }/recipes-qt/qt6/qtquick3d_%.bbappend (100%) diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtbase_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtbase_%.bbappend new file mode 100644 index 000000000..6cc5b2b7f --- /dev/null +++ b/meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtbase_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append:class-target = " examples" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtdeclarative_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtdeclarative_%.bbappend new file mode 100644 index 000000000..6cc5b2b7f --- /dev/null +++ b/meta-digi-dey/dynamic-layers/qt6-layer/STM/recipes-qt/qt6/qtdeclarative_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append:class-target = " examples" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png similarity index 100% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/examples/cinematicexperience-rhi/icon_qt.png diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/examples/cinematicexperience-rhi_%.bbappend similarity index 100% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_%.bbappend rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/examples/cinematicexperience-rhi_%.bbappend diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_1.0.bb b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/examples/cinematicexperience-rhi_1.0.bb similarity index 100% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/examples/cinematicexperience-rhi_1.0.bb rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/examples/cinematicexperience-rhi_1.0.bb diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-demos.bb b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-demos.bb similarity index 84% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-demos.bb rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-demos.bb index 044dcc8d7..c0018f27e 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-demos.bb +++ b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-demos.bb @@ -25,3 +25,7 @@ RDEPENDS:${PN}:append:ccimx93 = " \ RDEPENDS:${PN}:append:imxgpu3d = " \ qt3d-examples \ " +RDEPENDS:${PN}:append:ccmp15 = " \ + cinematicexperience-rhi \ + cinematicexperience-rhi-tools \ +" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb similarity index 95% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb index d839fab74..f9e00565a 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb +++ b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb @@ -36,6 +36,11 @@ QT6_IMAGE_INSTALL:imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT6 QT6_IMAGE_INSTALL:imxgpu3d = " \ ${QT6_IMAGE_INSTALL_common} \ " + +QT6_IMAGE_INSTALL:ccmp15 = " \ + ${QT6_IMAGE_INSTALL_common} \ +" + RDEPENDS:${PN} += " \ ${QT6_IMAGE_INSTALL} \ " diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-webengine.bb b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-webengine.bb similarity index 100% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-webengine.bb rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-webengine.bb diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtquick3d_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/qt6/qtquick3d_%.bbappend similarity index 100% rename from meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtquick3d_%.bbappend rename to meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/qt6/qtquick3d_%.bbappend