diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt index df666ec0a6..4eb5f4aa0a 100644 --- a/packages/addons/service/tvheadend42/changelog.txt +++ b/packages/addons/service/tvheadend42/changelog.txt @@ -1,3 +1,6 @@ +111 +- update to Tvheadend 4.2.2-32 + 110 - added tv_grab_file support for compressed files (gz bz2 xz) - update to Tvheadend 4.2.1.7 diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index ef997676fa..9410dcb082 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="tvheadend42" -PKG_VERSION="4d4bf14" -PKG_VERSION_NUMBER="4.2.1.7" +PKG_VERSION="76dbc3e" +PKG_VERSION_NUMBER="4.2.2-32" PKG_REV="111" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -79,6 +79,7 @@ pre_configure_target() { # transcoding if [ "$TARGET_ARCH" = x86_64 ]; then export AS=$TOOLCHAIN/bin/yasm + export LDFLAGS="$LDFLAGS -lX11 -lm -lvdpau -lva -lva-drm -lva-x11" fi export CROSS_COMPILE=$TARGET_PREFIX diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-03_temp_ffmpeg_downgrade.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-03_temp_ffmpeg_downgrade.patch deleted file mode 100644 index 152f63e7e9..0000000000 --- a/packages/addons/service/tvheadend42/patches/tvheadend42-03_temp_ffmpeg_downgrade.patch +++ /dev/null @@ -1,19 +0,0 @@ -Subject: [PATCH] tvheadend: HACK ffmpeg 3.1.5 instead of 3.2 - -diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg ---- a/Makefile.ffmpeg -+++ b/Makefile.ffmpeg -@@ -94,10 +94,10 @@ LIBMFX_URL = https://github.com/lu-zero/mfx_dispatch/archive/$(LIBMFX_TB) - LIBMFX_SHA1 = 84dbdf4a6b409067e863eb9564bb2efdec6d39ce - LIBMFX_DIFFS = libmfx.linux.path.diff - --FFMPEG = ffmpeg-3.2.4 --FFMPEG_TB = $(FFMPEG).tar.bz2 -+FFMPEG = ffmpeg-3.1.5 -+FFMPEG_TB = $(FFMPEG).tar.bz2 - FFMPEG_URL = http://ffmpeg.org/releases/$(FFMPEG_TB) --FFMPEG_SHA1 = bfdd9bc3bb9808f1c31e5eede37c932ea9785812 -+FFMPEG_SHA1 = 053dfea8c9e057fdf237885decd03147cb2412b1 - - - # ##############################################################################