tvheadend42: use system gnutls

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2019-05-14 23:29:59 +00:00
parent 0d77410ee4
commit 283ce84c32
2 changed files with 4 additions and 11 deletions

View File

@ -1,3 +1,6 @@
120
- Use system gnutls
119
- Use system libidn2

View File

@ -5,7 +5,7 @@ PKG_NAME="tvheadend42"
PKG_VERSION="5c218500579d5bd1c1f7e7a4b5f7f0fb35baa626"
PKG_SHA256="a9fe5a4c36aa185e3f0a73a709f0dc05794ae9c12f5d888985b559ff68a2508d"
PKG_VERSION_NUMBER="4.2.7-44"
PKG_REV="119"
PKG_REV="120"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tvheadend.org"
@ -86,9 +86,6 @@ pre_configure_target() {
CFLAGS="$CFLAGS -I$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/include"
LDFLAGS="$LDFLAGS -L$(get_build_dir ffmpegx)/.INSTALL_PKG/usr/local/lib"
# pass gnutls to build
LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"
# pass libhdhomerun to build
CFLAGS="$CFLAGS -I$(get_build_dir libhdhomerun)"
@ -109,13 +106,6 @@ addon() {
cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
# copy gnutls lib that is needed for ffmpeg
mkdir -p $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/libnettle.so.6 $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 gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib
# set only version (revision will be added by buildsystem)
sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml