From a49d6a713f1f090d0142ba0cbee5f3aa5a5f0900 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Thu, 5 Jan 2023 11:20:37 +0100
Subject: imx-dpu-g2d: update from 2.1.2 to 2.1.4

- Update to the version used in NXP Yocto branch kirkstone-5.15.71-2.2.0
- 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>
(cherry picked from commit 95c89b6f281d67ef1f1da0c7e1d92b77aed51e86)
---
 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb | 30 ----------------------
 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb | 36 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb
 create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb

diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb
deleted file mode 100644
index b3bcbdf14..000000000
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "G2D library using i.MX DPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
-
-DEPENDS = "libgal-imx libdrm"
-PROVIDES += "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "85daf26176695de80a024b5f67037f08"
-SRC_URI[sha256sum] = "1023814d810c0a85c91cb2170c77f663f624331261ba0e1ab1ce29e8c192e1bc"
-
-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"
-INSANE_SKIP:append:libc-musl = " file-rdeps"
-
-COMPATIBLE_MACHINE = "(imxdpu)"
-
-RDEPENDS:${PN}:append:libc-musl = " gcompat"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb
new file mode 100644
index 000000000..667bc26bb
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb
@@ -0,0 +1,36 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2022 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "G2D library using i.MX DPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+
+DEPENDS = "libgal-imx libdrm"
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "488d9f63b2d02c687a0bc8c3debfb51c"
+SRC_URI[sha256sum] = "62050bc5dd35e942c97e7a8ab22b0b98d02e27a38935b585e622cdc5221ef2a3"
+
+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"
+INSANE_SKIP:append:libc-musl = " file-rdeps"
+
+# 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"
+
+COMPATIBLE_MACHINE = "(imxdpu)"
+
+RDEPENDS:${PN}:append:libc-musl = " gcompat"
-- 
cgit v1.2.3-54-g00ecf