3 files changed, 38 insertions, 12 deletions

diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb
index e2f5912b..b3bcbdf1 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.0.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.2.bb
@@ -4,14 +4,14 @@
 
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+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] = "fa60a480c8d98cee969aa520bc829bf4"
-SRC_URI[sha256sum] = "65acc7345dcaf39536d60ee4516ad731c403790ed05d61a818601392554a6620"
+SRC_URI[md5sum] = "85daf26176695de80a024b5f67037f08"
+SRC_URI[sha256sum] = "1023814d810c0a85c91cb2170c77f663f624331261ba0e1ab1ce29e8c192e1bc"
 
 inherit fsl-eula-unpack
 
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 8368aefc..46bd3a55 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -10,15 +10,39 @@ PV = "2.1+git${SRCPV}"
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https"
 SRCBRANCH ?= "imx_2.1"
-SRCREV = "3268f291a15b2d8d5f650f627764a52eb0a8fc15"
+SRCREV = "5a38513b97ff83b46777cf73da3cbe37b4976498"
 
 S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
-
-PACKAGECONFIG[wayland] = "USE_WAYLAND=true,USE_WAYLAND=false,wayland-native wayland-protocols"
+PACKAGECONFIG ??= "${PACKAGECONFIG_IMPLEMENTATION}"
+PACKAGECONFIG_IMPLEMENTATION                   = ""
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxdpu   = "dpu"
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d          = "gpu-drm"
+PACKAGECONFIG_IMPLEMENTATION:imxgpu2d:imxfbdev = "gpu-fbdev"
+
+PACKAGECONFIG[dpu] = " \
+    BUILD_IMPLEMENTATION=dpu, \
+    , \
+    imx-dpu-g2d wayland-native wayland-protocols, \
+    , \
+    , \
+    gpu-drm gpu-fbdev"
+PACKAGECONFIG[gpu-drm] = " \
+    BUILD_IMPLEMENTATION=gpu-drm, \
+    , \
+    imx-gpu-g2d wayland-native wayland-protocols, \
+    , \
+    , \
+    dpu gpu-fbdev"
+PACKAGECONFIG[gpu-fbdev] = " \
+    BUILD_IMPLEMENTATION=gpu-fbdev, \
+    , \
+    imx-gpu-g2d, \
+    , \
+    , \
+    dpu gpu-drm"
 
 EXTRA_OEMAKE += " \
     SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
@@ -31,4 +55,6 @@ do_install() {
 
 FILES:${PN} += "/opt"
 
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
 COMPATIBLE_MACHINE = "(imxgpu2d)"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb
index 223fb955..524f15e9 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.2.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.3.p4.4.bb
@@ -5,17 +5,17 @@
 
 DESCRIPTION = "G2D library using i.MX GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+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] = "bf2a4e45835863f0563760fc8a1b7d58"
-SRC_URI[aarch64.sha256sum] = "ff50ddfee2d989798a2aba84ef9114e01f8d867293891dc0aacfab1640cbf8a3"
-SRC_URI[arm.md5sum] = "45d0fce306a6e0c7237b27da7c787f26"
-SRC_URI[arm.sha256sum] = "0ba9806c4efa0154fc9f7be406e42bc2c50b975abd32cbe322cf7bcf6ae0d350"
+SRC_URI[aarch64.md5sum] = "98d46bca2ae66e31b7e4878a7b622b99"
+SRC_URI[aarch64.sha256sum] = "8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02"
+SRC_URI[arm.md5sum] = "ff96d069092424a50ba4542d6ef5e931"
+SRC_URI[arm.sha256sum] = "7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580"
 
 S = "${WORKDIR}/${FSLBIN_NAME}"