4 files changed, 31 insertions, 27 deletions

diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.6.bb
index 667bc26b..8d26e7a5 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.4.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.6.bb
@@ -4,26 +4,27 @@
 
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
 
 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"
+SRC_URI[md5sum] = "ab5972089fe8746dc5fa5388e432a154"
+SRC_URI[sha256sum] = "771d71b5766f148bfb349cbc069a1808ad43f881d17cb11ec2ca27a959a9ad34"
 
 inherit fsl-eula-unpack
 
 do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
-    cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -d ${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"
+RDEPENDS:${PN}:append:libc-musl = " gcompat"
 
 # The packaged binaries have been stripped of debug info, so disable
 # operations accordingly.
@@ -32,5 +33,3 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 
 COMPATIBLE_MACHINE = "(imxdpu)"
-
-RDEPENDS:${PN}:append:libc-musl = " gcompat"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index c02a4f50..c5f2158e 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -1,16 +1,16 @@
 SUMMARY = "i.MX G2D Samples"
 DESCRIPTION = "Set of sample applications for i.MX G2D"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 
-DEPENDS = "virtual/libg2d cairo"
+DEPENDS = "cairo"
 
 PV = "2.1+git${SRCPV}"
 
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
 SRCBRANCH ?= "imx_2.1"
-SRCREV = "3efd75a90e3c606c9b7bed6791bcd4085ae69b9b"
+SRCREV = "a5f620fcf0e986a19e4acdfa48c95eaf79a5c570"
 
 S = "${WORKDIR}/git"
 
@@ -21,28 +21,36 @@ PACKAGECONFIG_IMPLEMENTATION                   = ""
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu   = "dpu"
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d          = "gpu-drm"
 PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
+PACKAGECONFIG_IMPLEMENTATION:mx93-nxp-bsp      = "pxp"
 
 PACKAGECONFIG[dpu] = " \
     BUILD_IMPLEMENTATION=dpu, \
     , \
-    imx-dpu-g2d wayland-native wayland-protocols, \
+    imx-dpu-g2d wayland-native wayland wayland-protocols, \
     , \
     , \
-    gpu-drm gpu-fbdev"
+    gpu-drm gpu-fbdev pxp"
 PACKAGECONFIG[gpu-drm] = " \
     BUILD_IMPLEMENTATION=gpu-drm, \
     , \
-    imx-gpu-g2d wayland-native wayland-protocols, \
+    imx-gpu-g2d wayland-native wayland wayland-protocols, \
     , \
     , \
-    dpu gpu-fbdev"
+    dpu gpu-fbdev pxp"
 PACKAGECONFIG[gpu-fbdev] = " \
     BUILD_IMPLEMENTATION=gpu-fbdev, \
     , \
     imx-gpu-g2d, \
     , \
     , \
-    dpu gpu-drm"
+    dpu gpu-drm pxp"
+PACKAGECONFIG[pxp] = " \
+    BUILD_IMPLEMENTATION=pxp, \
+    , \
+    imx-pxp-g2d wayland-native wayland wayland-protocols, \
+    , \
+    , \
+    dpu gpu-drm gpu-fbdev"
 
 EXTRA_OEMAKE += " \
     SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
@@ -57,4 +65,4 @@ FILES:${PN} += "/opt"
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
-COMPATIBLE_MACHINE = "(imxgpu2d)"
+COMPATIBLE_MACHINE = "(imxgpu2d|mx93-nxp-bsp)"
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.11.p1.0.bb
index d513c720..1d4e3cc5 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.6.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.0.bb
@@ -5,17 +5,16 @@
 
 DESCRIPTION = "G2D library using i.MX GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
 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"
+FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}"
+SRC_URI[aarch64.md5sum] = "7aafa5910ef3e3be1c449b4bddd97b56"
+SRC_URI[aarch64.sha256sum] = "9bf8ebbfc85245d75ab7d133c3e135a4c5f23a0430c75883af9700e9cb82c151"
+SRC_URI[arm.md5sum] = "e0da61541b0b95083a3c95cc0bba4f63"
+SRC_URI[arm.sha256sum] = "65427c12b43c7bb3838ec2bc91a5853c310652b920a65b2b52bacad8e761a8e4"
 
 S = "${WORKDIR}/${FSLBIN_NAME}"
 
@@ -40,7 +39,5 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 
-INSANE_SKIP:${PN} = "ldflags"
-
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(imxgpu2d)"
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index fbf56e0c..0f444cfa 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,10 +1,10 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2022 NXP
+# Copyright 2017-2023 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://EULA.txt;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ea25d099982d035af85d193c88a1b479"
 
 PROVIDES += "virtual/libg2d"
 
@@ -13,7 +13,7 @@ PV = "2.1.0+git${SRCPV}"
 SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
 SRCBRANCH ?= "imx_2.1"
-SRCREV = "178970dc7cdba69b94c2219b5bade46d67adb640"
+SRCREV = "8887f6bbf533affef7e22a65179a08a25f1547f1"
 
 S = "${WORKDIR}/git"