2 files changed, 44 insertions, 16 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 e353b553..055ce263 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -25,6 +25,8 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 # We depend on mesa to fill in what is missing.
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
 
+DEPENDS:append:libc-musl = " gcompat"
+
 PROVIDES += " \
     imx-gpu-viv \
     libgal-imx \
@@ -69,8 +71,6 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-IMX_PACKAGES_GBM     = ""
-IMX_PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
 PACKAGES =+ "libclc-imx libclc-imx-dev \
         libgl-imx libgl-imx-dev \
         libgles1-imx libgles1-imx-dev \
@@ -83,13 +83,18 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \
         libegl-imx libegl-imx-dev \
         libgal-imx libgal-imx-dev \
         libvsc-imx \
-        ${IMX_PACKAGES_GBM} \
+        ${PACKAGES_GBM} \
         imx-gpu-viv-tools \
         imx-gpu-viv-demos \
-        libvulkan-imx libvulkan-imx-dev \
+        ${PACKAGES_VULKAN} \
         libopenvx-imx libopenvx-imx-dev \
         libnn-imx \
 "
+PACKAGES_GBM             = ""
+PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
+PACKAGES_VULKAN               = ""
+PACKAGES_VULKAN:aarch64       = "libvulkan-imx libvulkan-imx-dev"
+PACKAGES_VULKAN:mx8mm-nxp-bsp = ""
 python __anonymous () {
         has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0')
         if has_vivante_kernel_driver_support != '1':
@@ -216,15 +221,19 @@ do_install () {
     install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
 
     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 [ -n "${PACKAGES_VULKAN}" ]; 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
+        else
+            rm -f ${D}${libdir}/libvulkan.so* ${D}${libdir}/libSPIRV_viv${SOLIBS}*
+        fi
     fi
 
     # FIXME: MX6SL does not have 3D support; hack it for now
@@ -253,6 +262,24 @@ do_install () {
     chown -R root:root "${D}"
 }
 
+do_install:append:libc-musl() {
+    # libs
+    for f in `find ${D}${libdir} -name '*.so*' -type f`
+    do
+        patchelf --add-needed libgcompat.so.0 $f
+    done
+    # binaries
+    for f in `find ${D}/opt ${D}${bindir} -name '*' -type f -executable`
+    do
+        # prune scripts
+        if `patchelf --print-interpreter $f 2>&1 > /dev/null`
+        then
+            patchelf --set-interpreter ${root_prefix}`patchelf --print-interpreter $f` $f
+            patchelf --add-needed libgcompat.so.0 $f
+        fi
+    done
+}
+
 ALLOW_EMPTY:${PN} = "1"
 
 FILES:libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h"
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.2-aarch64.bb
index bd584dbe..4136631b 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.2-aarch64.bb
@@ -1,9 +1,10 @@
 require imx-gpu-viv-6.inc
 
-DEPENDS:append:libc-musl = " gcompat"
-INSANE_SKIP:append:libc-musl = " file-rdeps"
-
 SRC_URI[md5sum] = "22de8a5f59a56a7ef499f590d1659b6f"
 SRC_URI[sha256sum] = "52921c0b59529f1598084e991eda1863100754f28a7744ba958158dff8074b3b"
 
+INSANE_SKIP:append:libc-musl = " file-rdeps"
+
 COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
+
+RDEPENDS:${PN}:append:libc-musl = " gcompat"