From bad86f1b18a51c813dea32c3f3c50431e2eb53a7 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Fri, 19 Aug 2022 11:56:03 -0500
Subject: imx-g2d-samples: Upgrade to latest 5.15.32-2.0.0

Includes new dependency on cairo.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit d942b0dcee4476d0074eebd52b153ec06e443c1b)
---
 recipes-graphics/imx-g2d/imx-g2d-samples_2.0.0.bb | 32 ---------------------
 recipes-graphics/imx-g2d/imx-g2d-samples_git.bb   | 34 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-graphics/imx-g2d/imx-g2d-samples_2.0.0.bb
 create mode 100644 recipes-graphics/imx-g2d/imx-g2d-samples_git.bb

(limited to 'recipes-graphics/imx-g2d')

diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_2.0.0.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_2.0.0.bb
deleted file mode 100644
index 9832aac2..00000000
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_2.0.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-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"
-
-DEPENDS = "virtual/libg2d"
-
-GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxpmicro/g2d-samples.git;protocol=https"
-SRCBRANCH ?= "imx_2.0"
-SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
-SRCREV = "267af142881d350218c2c2cead8f304a28bbee07"
-
-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"
-
-EXTRA_OEMAKE += " \
-    SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
-FILES:${PN} += "/opt"
-
-COMPATIBLE_MACHINE = "(imxgpu2d)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
new file mode 100644
index 00000000..8368aefc
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -0,0 +1,34 @@
+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"
+
+DEPENDS = "virtual/libg2d cairo"
+
+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"
+
+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"
+
+EXTRA_OEMAKE += " \
+    SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
+    ${PACKAGECONFIG_CONFARGS} \
+"
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
+FILES:${PN} += "/opt"
+
+COMPATIBLE_MACHINE = "(imxgpu2d)"
-- 
cgit v1.2.3-54-g00ecf