From 01329fa7564861fa29f95ca0f9f11e46bd5b4072 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 18 Nov 2023 11:08:07 +0000 Subject: [PATCH] ffmpeg-tools: enable lib.private via RPATH --- packages/addons/tools/ffmpeg-tools/package.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index b8f0529da9..8189e6d42f 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -19,17 +19,18 @@ PKG_ADDON_NAME="FFmpeg Tools" PKG_ADDON_TYPE="xbmc.python.script" addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private} cp -L $(get_install_dir ffmpegx)/usr/local/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/* # libs if [ "${TARGET_ARCH}" = "x86_64" ]; then cp -PL $(get_install_dir x265)/usr/lib/libx265.so.199 \ - ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private fi if [ "${DISPLAYSERVER}" = "x11" ]; then cp -PL $(get_install_dir libxcb)/usr/lib/{libxcb.so.1,libxcb-shm.so.0,libxcb-shape.so.0,libxcb-xfixes.so.0} \ - ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private fi }