7 files changed, 4 insertions, 151 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index ab29270b9..3b05b2abd 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -61,12 +61,6 @@ PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
 
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
 
-RPROVIDES_OPENCL               = "opencl-icd-loader-dev"
-RPROVIDES_OPENCL:mx7-nxp-bsp   = ""
-RPROVIDES_OPENCL:mx8mm-nxp-bsp = ""
-
-RPROVIDES:${PN}:append:imx-nxp-bsp = " ${RPROVIDES_OPENCL}"
-
 PE = "1"
 
 inherit fsl-eula-unpack
@@ -393,6 +387,9 @@ FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
                        ${sysconfdir}/OpenCL/vendors/Vivante.icd"
 FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
 RDEPENDS:libopencl-imx = "libclc-imx"
+RPROVIDES:libopencl-imx               = "virtual-opencl-icd"
+RPROVIDES:libopencl-imx:mx7-nxp-bsp   = ""
+RPROVIDES:libopencl-imx:mx8mm-nxp-bsp = ""
 
 FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
 FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/pkgconfig/vg.pc"
diff --git a/recipes-graphics/mali/mali-imx.inc b/recipes-graphics/mali/mali-imx.inc
index 87f73440f..97a1175e7 100644
--- a/recipes-graphics/mali/mali-imx.inc
+++ b/recipes-graphics/mali/mali-imx.inc
@@ -43,6 +43,7 @@ FILES:${PN}-libgles2 = " \
     ${libdir}/libGLESv2${SOLIBS}"
 FILES:${PN}-opencl-icd = " \
     ${sysconfdir}/OpenCL"
+RPROVIDES:${PN}-opencl-icd = "virtual-opencl-icd"
 FILES:${PN}-libvulkan = " \
     ${sysconfdir}/vulkan"
 RDEPENDS:${PN}-libvulkan = "vulkan-wsi-layer"
diff --git a/recipes-graphics/mesa/mesa.bbappend b/recipes-graphics/mesa/mesa.bbappend
index 1c75c9884..926f57589 100644
--- a/recipes-graphics/mesa/mesa.bbappend
+++ b/recipes-graphics/mesa/mesa.bbappend
@@ -1,46 +1,3 @@
-PROVIDES:remove:imxgpu   = "virtual/egl"
-PROVIDES:remove:imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2"
-
-PACKAGECONFIG:remove:imxgpu   = "egl gbm"
-PACKAGECONFIG:remove:imxgpu3d = "gles"
-
-# FIXME: mesa should support 'x11-no-tls' option
-python () {
-    overrides = d.getVar("OVERRIDES").split(":")
-    if "imxgpu2d" not in overrides:
-        return
-
-    x11flag = d.getVarFlag("PACKAGECONFIG", "x11", False)
-    d.setVarFlag("PACKAGECONFIG", "x11", x11flag.replace("--enable-glx-tls", "--enable-glx"))
-}
-
 # Enable Etnaviv and Freedreno support
 PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv freedreno"
-
-# For NXP BSP, GPU drivers don't support dri
-PACKAGECONFIG:remove:imxgpu:use-nxp-bsp = "dri"
-
-# mainline/etnaviv:
 RRECOMMENDS:${PN}-megadriver:append:use-mainline-bsp = " libdrm-etnaviv mesa-etnaviv-env"
-
-BACKEND = \
-    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-        bb.utils.contains('DISTRO_FEATURES',     'x11',     'x11', \
-                                                             'fb', d), d)}"
-
-# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
-do_install:append:imxgpu3d () {
-    rm -f ${D}${libdir}/libGL.* \
-          ${D}${includedir}/GL/gl.h \
-          ${D}${includedir}/GL/glcorearb.h \
-          ${D}${includedir}/GL/glext.h \
-          ${D}${includedir}/GL/glx.h \
-          ${D}${includedir}/GL/glxext.h
-    if [ "${BACKEND}" = "x11" ]; then
-        rm -f ${D}${libdir}/pkgconfig/gl.pc
-    fi
-}
-
-do_install:append:imxgpu () {
-    rm -rf ${D}${includedir}/KHR
-}
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
deleted file mode 100644
index 960bf3b50..000000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c76f5d2c0a0dda534888025d7236465202884665 Mon Sep 17 00:00:00 2001
-From: Xianzhong <xianzhong.li@nxp.com>
-Date: Thu, 5 Aug 2021 16:57:43 +0800
-Subject: [PATCH] glamor: Fix fbo pixmap format with GL_BGRA_EXT
-
-Red and Blue channels are swizzled in GLES path,
-Fix color inverse problem with ximagesink command:
-gst-launch-1.0 videotestsrc pattern=6 num-buffers=1 ! video/x-raw,format=BGRx ! videoconvert ! ximagesink display=:0 -v
-
-This fix requires GL_EXT_texture_format_BGRA8888 extention, not applicable for upstream.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
----
- glamor/glamor.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -586,10 +586,17 @@ glamor_setup_formats(ScreenPtr screen)
- 
-     if (glamor_priv->is_gles) {
-         assert(X_BYTE_ORDER == X_LITTLE_ENDIAN);
-+#if GL_EXT_texture_format_BGRA8888
-+        glamor_add_format(screen, 24, PICT_x8r8g8b8,
-+                          GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE);
-+        glamor_add_format(screen, 32, PICT_a8r8g8b8,
-+                          GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE);
-+#else
-         glamor_add_format(screen, 24, PICT_x8b8g8r8,
-                           GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE);
-         glamor_add_format(screen, 32, PICT_a8b8g8r8,
-                           GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE);
-+#endif
-     } else {
-         glamor_add_format(screen, 24, PICT_x8r8g8b8,
-                           GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE);
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index cf1c3a50f..161df0498 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -2,8 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch"
 
-SRC_URI:append:imxgpu = " file://0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch"
-
 IMX_OPENGL_PKGCONFIGS_REMOVE        = ""
 IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
 OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"
diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend
index d8f5bdde5..d8f5bdde5 100644
--- a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bbappend
+++ b/recipes-graphics/xwayland/xwayland_%.bbappend
diff --git a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb b/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
deleted file mode 100644
index 1d7ee80f6..000000000
--- a/recipes-graphics/xwayland/xwayland_24.1.6.imx.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-# This recipe copy helps keep meta-freescale master branch compatible
-# with Yocto walnascar.
-# (From OE-Core rev: 737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7)
-
-SUMMARY = "XWayland is an X Server that runs under Wayland."
-DESCRIPTION = "XWayland is an X Server running as a Wayland client, \
-and thus is capable of displaying native X11 client applications in a \
-Wayland compositor environment. The goal of XWayland is to facilitate \
-the transition from X Window System to Wayland environments, providing \
-a way to run unported applications in the meantime."
-HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone"
-
-DEFAULT_PREFERENCE = "-1"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
-
-SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz"
-BP_ORIGINAL = "${BPN}-24.1.6"
-SRC_URI[sha256sum] = "737e612ca36bbdf415a911644eb7592cf9389846847b47fa46dc705bd754d2d7"
-S = "${UNPACKDIR}/${BP_ORIGINAL}"
-
-UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
-
-inherit meson features_check pkgconfig
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
-
-DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt libtirpc"
-
-OPENGL_PKGCONFIGS = "glx glamor dri3"
-PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
-"
-PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence"
-PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor"
-PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11"
-PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl"
-PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
-PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
-
-# Xorg requires a SHA1 implementation, pick one
-XORG_CRYPTO ??= "openssl"
-PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl"
-PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle"
-PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt"
-XWAYLAND_EI ??= "xwayland_ei_false"
-PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false"
-PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei"
-PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei"
-
-do_install:append() {
-    # remove files not needed and clashing with xserver-xorg
-    rm -rf ${D}/${libdir}/xorg/
-}
-
-FILES:${PN} += "${libdir}/xorg/protocol.txt"
-
-RDEPENDS:${PN} += "xkbcomp"
-
-CVE_STATUS_GROUPS = "CVE_STATUS_REDHAT"
-CVE_STATUS_REDHAT = "CVE-2025-26594 CVE-2025-26595 CVE-2025-26596 CVE-2025-26597 CVE-2025-26598 CVE-2025-26599 CVE-2025-26600 CVE-2025-26601"
-CVE_STATUS_REDHAT[status] = "fixed-version: these are tracked as versionless redhat CVEs in NVD DB, fixed in 24.1.6"