From 26623ba00d046deb990493fbf9052e1b0c0a5b74 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Wed, 1 Jul 2020 19:08:33 +0200
Subject: [PATCH] recipes-graphics: imx-gpu-viv: Update to new NXP BSP release
 imx-5.4.24-2.1.0.

This commit updates the imx-gpu-viv to the next version.

It includes the following improvments and fixes

* The work-around that moves .so for OpenCL, OpenVX, and Vulkan
  to the main packages triggers the QA Issue for dev-so:

    ERROR: imx-gpu-viv-1_6.4.0.p2.4-aarch64-r0 do_package_qa:
    QA Issue: non -dev/-dbg/nativesdk- package contains symlink .so:
    libvulkan-imx path '/work/aarch64-mx8m-poky-linux/imx-gpu-viv/1_6.4.0.p2.4-aarch64-r0/packages-split/libvulkan-imx/usr/lib/libvulkan_VSI.so' [dev-so]

    Suppress the QA check.

* Add versions for OpenCL, OpenVX, and Vulkan.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 .../imx-gpu-viv/imx-gpu-viv-v6.inc            | 10 ++++--
 .../imx-gpu-viv_6.4.0.p2.2-aarch64.bb         | 17 ----------
 ...2.bb => imx-gpu-viv_6.4.0.p2.4-aarch32.bb} |  4 +--
 .../imx-gpu-viv_6.4.0.p2.4-aarch64.bb         | 31 +++++++++++++++++++
 4 files changed, 41 insertions(+), 21 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb
 rename meta-digi-dey/recipes-graphics/imx-gpu-viv/{imx-gpu-viv_6.4.0.p2.2-aarch32.bb => imx-gpu-viv_6.4.0.p2.4-aarch32.bb} (78%)
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb

diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
index 6d2a0b4b7..332c0f73e 100644
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
@@ -13,9 +13,15 @@ GLES3_HEADER_REMOVALS_mx8mp  = "gl32.h"
 
 FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS}"
 
-FILES_libopenvx-imx = "${libdir}/libOpenVX*${SOLIBS} ${libdir}/libOvx*${SOLIBS}"
-FILES_libopenvx-imx-dev = "${includedir}/VX"
+FILES_libvulkan-imx_append = " ${libdir}/libvulkan_VSI${REALSOLIBS}"
+INSANE_SKIP_libvulkan-imx += "dev-so"
+
+FILES_libopenvx-imx_append = " ${libdir}/libOpenVX${REALSOLIBS} ${libdir}/libOvx*${SOLIBS}"
 RDEPENDS_libopenvx-imx = "libnn-imx"
+INSANE_SKIP_libopenvx-imx += "dev-so"
+
+FILES_libopencl-imx_append = " ${libdir}/libOpenCL${REALSOLIBS}"
+INSANE_SKIP_libopencl-imx += "dev-so"
 
 FILES_libnn-imx = "${libdir}/libNN*${SOLIBS}"
 
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb
deleted file mode 100644
index fd9141cfa..000000000
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require imx-gpu-viv-v6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
-
-# FIXME: Remove this patch when upstream handles backend-specific libGL
-SRC_URI += "file://Add-dummy-libgl.patch"
-
-SRC_URI[md5sum] = "66a99971a0fd6c49840194096720f639"
-SRC_URI[sha256sum] = "5609e0e22fc0bd88f2bd5e8c5e4e3f3c08701e144a22ffe741cdbe6877b4dd77"
-
-do_install_append() {
-    if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then
-        cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2.0
-    fi
-}
-
-COMPATIBLE_MACHINE = "(mx8)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb
similarity index 78%
rename from meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb
rename to meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb
index 475dfd06e..41c546835 100644
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
 # FIXME: Remove this patch when upstream handles backend-specific libGL
 SRC_URI += "file://Add-dummy-libgl.patch"
 
-SRC_URI[md5sum] = "4733a2638815fe2242a396a1e9385258"
-SRC_URI[sha256sum] = "cd3bc4d6be6d620aa8b15ed783b1d1e5a1b209130e12bc96163af0ab7d07e371"
+SRC_URI[md5sum] = "cd5e9ba9247aa0da5d97b0f030e2ede1"
+SRC_URI[sha256sum] = "9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5"
 
 do_install_append() {
     if [ "${IS_MX6SL}" != "1" ]; then
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb
new file mode 100644
index 000000000..534e7f40a
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb
@@ -0,0 +1,31 @@
+require imx-gpu-viv-v6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
+
+SRC_URI[md5sum] = "633029434f0ccc0e8a6b01d92cae95b2"
+SRC_URI[sha256sum] = "a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720"
+
+do_install_append() {
+    if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then
+        cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2.0
+    fi
+
+    # Remove the work done by the upstream install for libvulkan so
+    # we can install the newly versioned library files
+    rm ${D}${libdir}/libvulkan_VSI.so
+    # Copy backend-specific library and rename it for use by vulkan-loader
+    # library of the same name
+    for i in fb wl x11; do
+        if [ "$i" = "${backend}" ]; then
+            mv ${D}${libdir}/libvulkan-${backend}.so.1.1.3 ${D}${libdir}/libvulkan_VSI.so.1.1.3
+        else
+            rm ${D}${libdir}/libvulkan-${i}.so.1.1.3
+        fi
+    done
+    patchelf --set-soname libvulkan_VSI.so.1 ${D}${libdir}/libvulkan_VSI.so.1.1.3
+    rm ${D}${libdir}/libvulkan.so.1 ${D}${libdir}/libvulkan.so
+    ln -s libvulkan_VSI.so.1.1.3 ${D}${libdir}/libvulkan_VSI.so.1
+    ln -s libvulkan_VSI.so.1.1.3 ${D}${libdir}/libvulkan_VSI.so
+}
+
+COMPATIBLE_MACHINE = "(mx8)"