From 25f4fa76417a46194e58b75a6a92c48a536e35e6 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 18 Dec 2024 16:10:14 +0100 Subject: [PATCH] qt6-layer: NXP: sync with meta-imx scarthgap-6.6.52-2.2.0 Part of these changes are related to the update to Qt 6.8. Slightly modify qtquick3d_git.bbappend to mirror NXP's configuration (i.MX GPU drivers don't support OpenXR) Signed-off-by: Gabriel Valcazar --- .../qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend | 9 +++++---- .../qt6-layer/NXP/recipes-qt/qt6/qtpdf_%.bbappend | 2 +- .../qt6-layer/NXP/recipes-qt/qt6/qtquick3d_git.bbappend | 7 +++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtquick3d_git.bbappend diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend index 82081a028..f0732e361 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtbase_%.bbappend @@ -9,13 +9,14 @@ IMX_BACKEND = \ IMX_BACKEND_FB = "linuxfb" IMX_BACKEND_FB:imxgpu3d = "eglfs" -PACKAGECONFIG_GRAPHICS:imxdrm = "gbm kms" -PACKAGECONFIG_GRAPHICS:imxpxp = "${PACKAGECONFIG_GRAPHICS_IMX_DRM}" -PACKAGECONFIG_GRAPHICS_IMX_DRM = "" -PACKAGECONFIG_GRAPHICS_IMX_DRM:imxdrm = "gbm kms" +PACKAGECONFIG_GRAPHICS_IMX_GPU:mx9-nxp-bsp = " \ + gbm kms" PACKAGECONFIG_PLATFORM = "no-opengl linuxfb" +PACKAGECONFIG_PLATFORM_EGLFS:mx9-nxp-bsp = " \ + eglfs" + PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "vulkan" PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp = "vulkan" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtpdf_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtpdf_%.bbappend index 410822601..280c6e5f3 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtpdf_%.bbappend +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtpdf_%.bbappend @@ -1 +1 @@ -DEPENDS += "cups libdrm" +DEPENDS += "drm" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtquick3d_git.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtquick3d_git.bbappend new file mode 100644 index 000000000..313fb5497 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtquick3d_git.bbappend @@ -0,0 +1,7 @@ +# Digi: NXP enables the openxr config here to mirror the source default, only +# to disable it in a separate file (fsl-imx-base.inc) in their meta-imx-sdk +# layer. Since we don't include this layer, simply disable the config here by +# not adding it to PACKAGECONFIG. +#PACKAGECONFIG:class-target:append = " openxr" + +PACKAGECONFIG[openxr] = "-DFEATURE_quick3dxr_openxr=ON,-DFEATURE_quick3dxr_openxr=OFF"