From b1a6da98d63849df18628160d268c6a9b1521702 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 24 Apr 2024 11:04:55 -0700
Subject: imx-dpu-g2d: Upgrade 2.1.10 -> 2.1.12

Adds a separate package for i.MX 95 support.

Align with NXP BSP 6.6.3-1.0.0.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb | 38 ----------------------
 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb | 45 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 38 deletions(-)
 delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb
 create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb

diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb
deleted file mode 100644
index 16011bd40..000000000
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.10.bb
+++ /dev/null
@@ -1,38 +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=db4762b09b6bda63da103963e6e081de"
-
-DEPENDS = "libgal-imx libdrm"
-PROVIDES += "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true"
-IMX_BIN_NAME = "${BP}-${IMX_SRCREV_ABBREV}"
-IMX_SRCREV_ABBREV = "7ed5396"
-SRC_URI[md5sum] = "eed4f724973192564474efbda83f67bc"
-SRC_URI[sha256sum] = "bca725e442c1438990cf1b41a59194e6efbd080c63d9b683a0d572e27f900e25"
-
-S = "${WORKDIR}/${IMX_BIN_NAME}"
-
-inherit fsl-eula-unpack
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
-    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
-}
-
-INSANE_SKIP:append:libc-musl = " file-rdeps"
-RDEPENDS:${PN}:append:libc-musl = " gcompat"
-
-# 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)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb
new file mode 100644
index 000000000..b10cd997a
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb
@@ -0,0 +1,45 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2024 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=44a8052c384584ba09077e85a3d1654f"
+
+DEPENDS = "libdrm ${LIBGAL_IMX}"
+LIBGAL_IMX              = "libgal-imx"
+LIBGAL_IMX:mx95-nxp-bsp = ""
+
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
+IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
+
+IMX_SRCREV_ABBREV = "ee47ef7"
+IMX_SRC_URI_NAME = "v1"
+SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526"
+SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0"
+
+IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7"
+IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
+SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d"
+SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b"
+
+S = "${WORKDIR}/${IMX_BIN_NAME}"
+
+inherit fsl-eula-unpack
+
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    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"
+
+COMPATIBLE_MACHINE = "(imxdpu)"
-- 
cgit v1.2.3-54-g00ecf