From 9e231483b103f40502f16b78692a9f928cf78b45 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 8 Sep 2020 11:01:31 -0700 Subject: [PATCH] imx-gpu-viv: Fix packaging for libvulkan_VSI.so Fix the packaging now that libvulkan_VSI.so has a version. Signed-off-by: Tom Hochstein --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 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 7ac339bf..0194cfc1 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -241,11 +241,17 @@ do_install () { ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so if [ "${IS_MX8}" = "1" ]; then - # Change libvulkon.so driver soname, so that it does not clash with the - # vulkan-loader libvulkan.so - patchelf --set-soname libvulkan_VSI.so.1 ${D}${libdir}/libvulkan-${backend}.so - mv ${D}${libdir}/libvulkan-${backend}.so ${D}${libdir}/libvulkan_VSI.so + # Rename the vulkan implementation library which is wrapped by the vulkan-loader + # library of the same name + MAJOR=1 + FULL=$MAJOR.1.3 + mv ${D}${libdir}/libvulkan-${backend}.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 fi + for header in ${GLES3_HEADER_REMOVALS}; do rm -f ${D}${includedir}/GLES3/${header} done @@ -310,7 +316,7 @@ FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS}" FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}" RDEPENDS_libgbm-imx_append_mx8 = " libdrm" -FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${SOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" +FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" FILES_libopenvx-imx = " \ -- 2.40.1