From b042488e906fae9faf79959b2697ae35e9465267 Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.z@gmail.com>
Date: Thu, 21 Oct 2021 10:07:58 +0000
Subject: imx-dpu-g2d: upgrade to 1.9.4

Add runtime dependency to libopencl-imx.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
(cherry picked from commit b4e6d31c41834703c9e76cf5a795147d6a44dab7)
---
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.2.bb | 35 -----------------------
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb | 35 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.2.bb
 create mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb

diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.2.bb
deleted file mode 100644
index e4baefb54..000000000
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2021 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
-PROVIDES += "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "a267c87677d600ecf07d4c8f42941532"
-SRC_URI[sha256sum] = "02e4e649f2af6c867cb666df10f032af48b0907e1529fa6c5958dad7e38aebbe"
-
-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}
-    cp -r ${S}/gpu-demos/opt ${D}
-}
-
-FILES:${PN} = "${libdir}/libg2d* /opt"
-FILES:${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
-INSANE_SKIP:${PN} += "ldflags"
-
-RDEPENDS:${PN} = "libgal-imx libdrm"
-
-# This is required to provide support for VPU Amphion HEVC tile format
-# From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99):
-# VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx.
-RDEPENDS:${PN} += "libopencl-imx"
-
-COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb
new file mode 100644
index 000000000..c340505e0
--- /dev/null
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.4.bb
@@ -0,0 +1,35 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "0b7fc529b3af3ecc3087a99cca0c627d"
+SRC_URI[sha256sum] = "42d470373fd72b2e2aa8d8a226e133c61b0a88e4e5bddbfec9509f7d2764f206"
+
+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}
+    cp -r ${S}/gpu-demos/opt ${D}
+}
+
+FILES:${PN} = "${libdir}/libg2d* /opt"
+FILES:${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
+INSANE_SKIP:${PN} += "ldflags"
+
+RDEPENDS:${PN} = "libgal-imx libdrm libopencl-imx"
+
+# This is required to provide support for VPU Amphion HEVC tile format
+# From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99):
+# VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx.
+RDEPENDS:${PN} += "libopencl-imx"
+
+COMPATIBLE_MACHINE = "(imxdpu)"
-- 
cgit v1.2.3-54-g00ecf