imx-gpu-viv: Upgrade 6.4.11.p2.2 -> 6.4.11.p2.4

Drops OpenGL support.

Align with NXP BSP 6.6.3-1.0.0.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

6 files changed, 30 insertions, 41 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 56a9ec4d..e33df444 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -1,6 +1,6 @@
 # Copyright (C) 2012-2016 Freescale Semiconductor
 # Copyright (C) 2012-2018 O.S. Systems Software LTDA.
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "GPU driver and apps for i.MX"
@@ -20,11 +20,6 @@ DEPENDS += " \
 DEPENDS:append:imxdrm = " libdrm wayland"
 DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 
-# imx-gpu-viv does not provide everything it needs to for virtual/libgl
-# on x11 backend or on Wayland backend with XWayland support.
-# We depend on mesa to fill in what is missing.
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
-
 DEPENDS:append:libc-musl = " gcompat"
 
 PROVIDES += " \
@@ -40,7 +35,6 @@ EXTRA_PROVIDES = " \
     ${PROVIDES_OPENVX} \
 "
 EXTRA_PROVIDES:append:imxgpu3d = " \
-    virtual/libgl \
     virtual/libgles1 \
     virtual/libgles2 \
 "
@@ -86,7 +80,6 @@ PACKAGECONFIG[valgrind] = ""
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
 PACKAGES =+ " \
-        libgl-imx libgl-imx-dev \
         libgles1-imx libgles1-imx-dev \
         libgles2-imx libgles2-imx-dev \
         libgles3-imx-dev \
@@ -149,7 +142,7 @@ python __anonymous() {
 
     # For the packages that make up the OpenGL interfaces, inject variables so that
     # they don't get Debian-renamed (which would remove the -imx suffix).
-    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
+    for p in (("libegl", "libegl1"),
               ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
               ("libgles3",), ("libgbm",)):
         fullp = p[0] + "-imx"
@@ -291,8 +284,6 @@ do_install () {
     if [ "${IS_MX6SL}" = "1" ]; then
         rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \
                \
-               ${D}${libdir}/libGL* ${D}${includedir}/GL* ${D}${libdir}/pkgconfig/gl.pc \
-               \
                ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \
                \
                ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \
@@ -377,15 +368,6 @@ OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev"
 INSANE_SKIP:libopenvx-imx += "dev-deps"
 
-FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS} ${libdir}/libGL${SOLIBS}"
-FILES:libgl-imx-dev = "${includedir}/GL ${libdir}/pkgconfig/gl.pc"
-# libGL is only targeting X11 backend, and in case if Wayland-only is used -
-# package QA complains on missing RDEPENDS, which are only available for X11.
-# Skip "file-rdeps" QA for this package.
-INSANE_SKIP:libgl-imx += "file-rdeps"
-# libEGL does dlopen of libGL.so
-INSANE_SKIP:libgl-imx += "dev-so"
-
 FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
 FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc"
 RPROVIDES:libgles1-imx = "libgles-imx"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb
deleted file mode 100644
index 07a92246..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
-
-IMX_SRCREV_ABBREV = "fd0148d"
-
-SRC_URI[md5sum] = "267d3e2d580e264157b7de01df22fb66"
-SRC_URI[sha256sum] = "15efe6da5d4bac2a6067c2a898190be8754df6f14128c3db4756cff59c6da049"
-
-COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb
deleted file mode 100644
index cea83ddc..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.2-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
-
-IMX_SRCREV_ABBREV = "fd0148d"
-
-SRC_URI[md5sum] = "b76784e04f24ec9f2bedf2dd377ed5a8"
-SRC_URI[sha256sum] = "6e34f3718925ba37c362cd09a3228cc56d03cfad323ebae0932f64449dbaeb2e"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb
new file mode 100644
index 00000000..2b172466
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch32.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+
+IMX_SRCREV_ABBREV = "b07999b"
+
+SRC_URI[md5sum] = "eae60321ac971293d3213c88b9198ca0"
+SRC_URI[sha256sum] = "ef9be89d3dd3b6448c720e061a8b81bdd26f7a5ff70de1786a5feef2e4836474"
+
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb
new file mode 100644
index 00000000..b3c39736
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.4-aarch64.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f"
+
+IMX_SRCREV_ABBREV = "b07999b"
+
+SRC_URI[md5sum] = "142d9b9ef6f440b8e307569873bdb6b5"
+SRC_URI[sha256sum] = "ba86656c357c5d9793058695f320e4cf650d4693e84321870bad392f2a622807"
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend
index dafd27f0..6545571f 100644
--- a/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -1 +1,8 @@
-COMPATIBLE_MACHINE:imxgpu = "(-)"
+DEPENDS:append:imxgpu = " virtual/egl"
+
+do_install:append:imxgpu() {
+    # imx-gpu-viv and mali-imx both provide /usr/include/KHR, so drop the mesa-gl one
+    rm -rf ${D}${includedir}/KHR
+}
+
+COMPATIBLE_MACHINE:imxgpu = "(imxgpu)"