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 13632bfbe..82081a028 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 @@ -1,57 +1,3 @@ -# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique -# Copyright (C) 2016 Freescale Semiconductor -# Copyright (C) 2016, 2017 O.S. Systems Software LTDA. -# Copyright (C) 2017-2018 NXP - -PACKAGECONFIG_GRAPHICS:imxpxp = " \ - gles2" -PACKAGECONFIG_GRAPHICS:imxgpu2d = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ - ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" -PACKAGECONFIG_GRAPHICS:imxgpu3d = " \ - gles2 \ - ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" -PACKAGECONFIG_GRAPHICS_IMX_GPU = "" -PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \ - gbm kms" - -PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \ - gles2 gbm kms" - -PACKAGECONFIG += " \ - ${PACKAGECONFIG_PLATFORM}" - -PACKAGECONFIG_PLATFORM = "" -PACKAGECONFIG_PLATFORM:imxgpu2d = " \ - no-opengl \ - linuxfb \ - ${PACKAGECONFIG_PLATFORM_EGLFS}" -PACKAGECONFIG_PLATFORM:imxgpu3d = " \ - ${PACKAGECONFIG_PLATFORM_EGLFS}" - -PACKAGECONFIG_PLATFORM_EGLFS = "" -PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ - bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - 'eglfs', d), d)}" -PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = " \ - eglfs" - -PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" - -PACKAGECONFIG += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" -PACKAGECONFIG_VULKAN = "" -PACKAGECONFIG_VULKAN:imxgpu = " \ - ${PACKAGECONFIG_VULKAN_IMX_GPU}" -PACKAGECONFIG_VULKAN_IMX_GPU = "" -PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" -PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" - -# -# FROM meta-imx -# FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://qt-${IMX_BACKEND}.sh" @@ -63,6 +9,16 @@ 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_PLATFORM = "no-opengl linuxfb" + +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx9-nxp-bsp = "vulkan" + do_install:append () { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/qt-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/qt.sh diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtmultimedia_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtmultimedia_%.bbappend index 4b7a78ba8..fa6f85cdf 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtmultimedia_%.bbappend +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtmultimedia_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}" -PACKAGECONFIG_REMOVE ?= \ - "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', '', 'ffmpeg', d)}" +DEPENDS += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxrandr', '', d)} \ +" pkg_postinst:${PN}:ccimx6() { echo '# Use FSL gstreamer plugin video source' >> $D${sysconfdir}/profile.d/qt6.sh 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 new file mode 100644 index 000000000..410822601 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtpdf_%.bbappend @@ -0,0 +1 @@ +DEPENDS += "cups libdrm" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwayland_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwayland_%.bbappend deleted file mode 100644 index ca011758b..000000000 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwayland_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# etnaviv mesa does not have glx -PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" - -PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" -PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" -PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine/0001-Disable-Intel-backend-by-default.patch b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine/0001-Disable-Intel-backend-by-default.patch new file mode 100644 index 000000000..02caac589 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine/0001-Disable-Intel-backend-by-default.patch @@ -0,0 +1,36 @@ +From 9519b20c406df7c0518e5caeec4699a7efe842e4 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein +Date: Tue, 2 Apr 2024 17:06:26 -0500 +Subject: [PATCH] Disable Intel backend by default + +Fixes build break: +``` +| ld: build/src/core/Release/arm/obj/third_party/minigbm/minigbm/i915.o: in function `i915_clflush': +| /usr/src/debug/qtwebengine/6.7.0/src/3rdparty/chromium/third_party/minigbm/src/i915.c:403:(.text.i915_bo_flush+0x20): undefined reference to `__builtin_ia32_mfence' +| ld: /usr/src/debug/qtwebengine/6.7.0/src/3rdparty/chromium/third_party/minigbm/src/i915.c:405:(.text.i915_bo_flush+0x2a): undefined reference to `__builtin_ia32_clflush' +| collect2: error: ld returned 1 exit status +``` + +Upstream-Status: Pending +Fixes: 1f5b24f83baa747336b253cfcf18bf9231772cf0. +Signed-off-by: Tom Hochstein +--- + chromium/third_party/minigbm/BUILD.gn | 4 ++-- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/chromium/third_party/minigbm/BUILD.gn b/chromium/third_party/minigbm/BUILD.gn +index 4f121c0d900..739e2781cf8 100644 +--- a/chromium/third_party/minigbm/BUILD.gn ++++ b/chromium/third_party/minigbm/BUILD.gn +@@ -16,7 +16,7 @@ declare_args() { + + use_amdgpu_minigbm = false + use_exynos_minigbm = false +- use_intel_minigbm = true ++ use_intel_minigbm = false + use_marvell_minigbm = false + use_mediatek_minigbm = false + use_meson_minigbm = false +-- +2.34.1 + diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine_%.bbappend b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine_%.bbappend index 24b2f3b3e..7b192ee3e 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine_%.bbappend +++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-qt/qt6/qtwebengine_%.bbappend @@ -1 +1,7 @@ -DEPENDS += "libdrm" +DEPENDS += " \ + libdrm \ + virtual/libgl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xdamage', '', d)}" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://0001-Disable-Intel-backend-by-default.patch;patchdir=src/3rdparty"