jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpegx: disable installing to sysroot

Browse Source 
There's no need to use a hidden directory anymore.
This commit is contained in:
Andre Heider 2019-12-07 15:33:03 +01:00
parent 93c1d6fc62
commit 8b3b1d8cc8
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/addons/addon-depends/comskip/package.mk
View File

@ -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() {

6
packages/addons/addon-depends/ffmpegx/package.mk
View File

@ -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"
}

6
packages/addons/service/tvheadend42/package.mk
View File

@ -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)"

2
packages/addons/tools/ffmpeg-tools/package.mk
View File

@ -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
}