imx-gpu-viv: update from 6.4.3.p4.2 to 6.4.3.p4.4

Update to the version used in lf5.15.52_2.1.0.

Note that the the vulkan installable client driver is provided with a
filename and soname that no longer clashes with the vulkan loader.
Thus the rename and soname magic is dropped.

License was updated to NXP EULA v39 August 2022.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

3 files changed, 6 insertions, 17 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 5c4b68cc..169606c2 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -6,7 +6,7 @@
 DESCRIPTION = "GPU driver and apps for i.MX"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
@@ -177,9 +177,7 @@ IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
 IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 
-LIBVULKAN_VERSION_MAJOR = "1"
-LIBVULKAN_VERSION       = "${LIBVULKAN_VERSION_MAJOR}.2.1"
-LIBVULKAN_API_VERSION   = "${LIBVULKAN_VERSION_MAJOR}.2.182"
+LIBVULKAN_API_VERSION   = "1.2.182"
 
 do_install () {
     install -d ${D}${libdir}
@@ -258,15 +256,6 @@ do_install () {
     fi
 
     if [ "${IS_MX8}" = "1" ]; then
-        # Rename the vulkan implementation library which is wrapped by the vulkan-loader
-        # library of the same name
-        MAJOR=${LIBVULKAN_VERSION_MAJOR}
-        FULL=${LIBVULKAN_VERSION}
-        mv ${D}${libdir}/libvulkan.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$FULL
-        patchelf --set-soname libvulkan_VSI.so.$MAJOR ${D}${libdir}/libvulkan_VSI.so.$FULL
-        rm ${D}${libdir}/libvulkan.so.$MAJOR ${D}${libdir}/libvulkan.so
-        ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so.$MAJOR
-        ln -s libvulkan_VSI.so.$FULL ${D}${libdir}/libvulkan_VSI.so
         if [ -z "${PACKAGES_VULKAN}" ]; then
             set -f
             for f in ${FILES:libvulkan-imx} ${FILES:libvulkan-imx-dev}; do
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb
index bb07fb10..2c7fbecc 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch32.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch32.bb
@@ -4,7 +4,7 @@
 
 require imx-gpu-viv-6.inc
 
-SRC_URI[md5sum] = "8e83cb642033ac3b85a5473b6d92687e"
-SRC_URI[sha256sum] = "89197fdb13dfc21c49968297c2e8b5cb8dd5563502278151d36b2dce2a2092ed"
+SRC_URI[md5sum] = "5cf2085e4b9706e4c964ed7fdb57bfe3"
+SRC_URI[sha256sum] = "5b9dd02cb2dfa564903872576cd6586fbf4a02abdb8e180978bd84205ab302a7"
 
 COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb
index 4136631b..531eb13c 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.4-aarch64.bb
@@ -1,7 +1,7 @@
 require imx-gpu-viv-6.inc
 
-SRC_URI[md5sum] = "22de8a5f59a56a7ef499f590d1659b6f"
-SRC_URI[sha256sum] = "52921c0b59529f1598084e991eda1863100754f28a7744ba958158dff8074b3b"
+SRC_URI[md5sum] = "b899f9d4a179eab622880fd22ec7cb64"
+SRC_URI[sha256sum] = "5c52bd15146c24d449638c6276c07103949c8efbc53d002518541bc37c57e424"
 
 INSANE_SKIP:append:libc-musl = " file-rdeps"