imx-gpu-g2d: update from 6.4.3.p4.4 to 6.4.3.p4.6

- Update to the version used in NXP Yocto branch kirkstone-5.15.71-2.2.0
- The 8M Mini does not support OpenCL, so install an SOC-specific G2D
  library built without OpenCL. (see e3e0817b in meta-imx)
- Also the binaries seem to be stripped now, so skip that step to avoid
  build errors

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

2 files changed, 46 insertions, 33 deletions

diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb
deleted file mode 100644
index 524f15e96..000000000
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "G2D library using i.MX GPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
-DEPENDS = "libgal-imx"
-PROVIDES = "virtual/libg2d"
-
-FSLBIN_NAME     = "${PN}-${PV}-${TARGET_ARCH}"
-
-SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
-SRC_URI[aarch64.md5sum] = "98d46bca2ae66e31b7e4878a7b622b99"
-SRC_URI[aarch64.sha256sum] = "8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02"
-SRC_URI[arm.md5sum] = "ff96d069092424a50ba4542d6ef5e931"
-SRC_URI[arm.sha256sum] = "7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580"
-
-S = "${WORKDIR}/${FSLBIN_NAME}"
-
-inherit fsl-eula-unpack
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir}
-    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
-}
-
-INSANE_SKIP:${PN} = "ldflags"
-
-COMPATIBLE_MACHINE = "(imxgpu2d)"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb
new file mode 100644
index 000000000..d513c7200
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb
@@ -0,0 +1,46 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2022 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "G2D library using i.MX GPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+DEPENDS = "libgal-imx"
+PROVIDES = "virtual/libg2d"
+
+FSLBIN_NAME     = "${PN}-${PV}-${TARGET_ARCH}"
+
+SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
+SRC_URI[aarch64.md5sum] = "41e6c3a6f8d4151d30c1f34341465b30"
+SRC_URI[aarch64.sha256sum] = "70e007f66459ee6a392f4a21f4d4a753ff22a75b728cc7d952251b00ba3ab51e"
+SRC_URI[arm.md5sum] = "4c751218aa4db1f545bcec17ee963cc0"
+SRC_URI[arm.sha256sum] = "288f78419d825e71563c38a39a738f040e098b581b76e6f8b8fc5895e7d9d7c4"
+
+S = "${WORKDIR}/${FSLBIN_NAME}"
+
+inherit fsl-eula-unpack
+
+SOC_INSTALL_DIR               = "SOC_INSTALL_DIR_NOT_SET"
+SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm"
+
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then
+        cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir}
+    fi
+    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
+}
+
+# The packaged binaries have been stripped of debug info, so disable
+# operations accordingly.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+INSANE_SKIP:${PN} = "ldflags"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(imxgpu2d)"