From 0661394cdfef69afd454ea515eb9a395afda44fb Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Date: Mon, 31 Aug 2020 21:45:03 +0000
Subject: imx-dpu-g2d: upgrade to 1.8.7

This version adds runtime dependency to libopencl-imx since it is
required to support HEVC tile format for Amphion VPU.

NOTE: This version uses v11 EULA from NXP.

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
---
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.3.bb | 30 -------------------
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb | 35 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.3.bb
 create mode 100644 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb

diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.3.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.3.bb
deleted file mode 100644
index 4465ee7e..00000000
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.3.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2019 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=fd4b227530cd88a82af6a5982cfb724d"
-PROVIDES += "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "57a0a0a7d20e4ea1a0d2dcd162abfa79"
-SRC_URI[sha256sum] = "f8bc83e23263e179bd66492dafaeb104a3967337d76325d0ec97993ae846fb13"
-
-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"
-
-COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb
new file mode 100644
index 00000000..ae6da7b6
--- /dev/null
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.7.bb
@@ -0,0 +1,35 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2019 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=228c72f2a91452b8a03c4cab30f30ef9"
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "2b8fea58c87a724c1d5c023ee8bd551b"
+SRC_URI[sha256sum] = "7533e34f447e8b076fa6461ac83806efdd677310094741eef2a67858034730fe"
+
+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)"
-- 
cgit v1.2.3-54-g00ecf