ffmpeg-tools: use system gnutls

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2019-05-14 23:34:09 +00:00
parent 283ce84c32
commit 9abf1b269d
3 changed files with 5 additions and 13 deletions

View File

@ -34,11 +34,6 @@ fi
pre_configure_target() {
cd $PKG_BUILD
rm -rf .$TARGET_NAME
# pass gnutls to build
PKG_CONFIG_PATH="$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/pkgconfig"
CFLAGS="$CFLAGS -I$(get_build_dir gnutls)/.INSTALL_PKG/usr/include"
LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
CFLAGS="$CFLAGS -DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL"

View File

@ -1,3 +1,7 @@
107
- Use system gnutls
- Update FFmpeg to 4.1.3
106
- Use system libidn2

View File

@ -3,7 +3,7 @@
PKG_NAME="ffmpeg-tools"
PKG_VERSION="1.0"
PKG_REV="106"
PKG_REV="107"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
@ -20,11 +20,4 @@ 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
# copy gnutls lib that is needed for ffmpeg
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib
}