From 8b3b1d8cc8ecee226d298229f8db3e19d7460dcb Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 7 Dec 2019 15:33:03 +0100 Subject: [PATCH] ffmpegx: disable installing to sysroot There's no need to use a hidden directory anymore. --- packages/addons/addon-depends/comskip/package.mk | 6 +++--- packages/addons/addon-depends/ffmpegx/package.mk | 6 +----- packages/addons/service/tvheadend42/package.mk | 6 +++--- packages/addons/tools/ffmpeg-tools/package.mk | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/addons/addon-depends/comskip/package.mk b/packages/addons/addon-depends/comskip/package.mk index 364cb01a2f..2f76219895 100644 --- a/packages/addons/addon-depends/comskip/package.mk +++ b/packages/addons/addon-depends/comskip/package.mk @@ -18,9 +18,9 @@ pre_configure_target() { export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2" # pass ffmpegx to build - PKG_CONFIG_PATH="$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib/pkgconfig" - CFLAGS+=" -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include" - LDFLAGS+=" -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib" + PKG_CONFIG_PATH="$(get_install_dir ffmpegx)/usr/local/lib/pkgconfig" + CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include" + LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib" } make_target() { diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 1162c87bcb..56c2ce1c8d 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -9,7 +9,7 @@ PKG_SITE="https://ffmpeg.org" PKG_URL="https://ffmpeg.org/releases/ffmpeg-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls libvorbis opus x264 zlib" PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding." -PKG_BUILD_FLAGS="-gold" +PKG_BUILD_FLAGS="-gold -sysroot" # Dependencies get_graphicdrivers @@ -176,7 +176,3 @@ configure_target() { --disable-hardcoded-tables \ } - -makeinstall_target() { - make install DESTDIR="$INSTALL/../.INSTALL_PKG" -} diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 073dcdc6dc..cedfa24db9 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -82,9 +82,9 @@ pre_configure_target() { rm -rf .$TARGET_NAME # pass ffmpegx to build - PKG_CONFIG_PATH="$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib/pkgconfig" - CFLAGS+=" -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include" - LDFLAGS+=" -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib" + PKG_CONFIG_PATH="$(get_install_dir ffmpegx)/usr/local/lib/pkgconfig" + CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include" + LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib" # pass libhdhomerun to build CFLAGS+=" -I$(get_build_dir libhdhomerun)" diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index 257c402f8a..36272d76c5 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -19,5 +19,5 @@ PKG_ADDON_TYPE="xbmc.python.script" addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -L $(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -L $(get_install_dir ffmpegx)/usr/local/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin }