tvheadend42: update to 4.2.2-75

This commit is contained in:
cvh 2017-06-24 17:48:41 +02:00
parent 363e69cb95
commit fd6f00f001
3 changed files with 5 additions and 23 deletions

View File

@ -1,5 +1,5 @@
111 111
- update to Tvheadend 4.2.2-32 - update to Tvheadend 4.2.2-75
110 110
- added tv_grab_file support for compressed files (gz bz2 xz) - added tv_grab_file support for compressed files (gz bz2 xz)

View File

@ -17,8 +17,8 @@
################################################################################ ################################################################################
PKG_NAME="tvheadend42" PKG_NAME="tvheadend42"
PKG_VERSION="76dbc3e" PKG_VERSION="a84adb2"
PKG_VERSION_NUMBER="4.2.2-32" PKG_VERSION_NUMBER="4.2.2-75"
PKG_REV="111" PKG_REV="111"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
@ -79,6 +79,8 @@ pre_configure_target() {
# transcoding # transcoding
if [ "$TARGET_ARCH" = x86_64 ]; then if [ "$TARGET_ARCH" = x86_64 ]; then
export AS=$TOOLCHAIN/bin/yasm export AS=$TOOLCHAIN/bin/yasm
export LDFLAGS="$LDFLAGS -lX11 -lm -lvdpau -lva -lva-drm -lva-x11"
export ARCH=$TARGET_ARCH
fi fi
export CROSS_COMPILE=$TARGET_PREFIX export CROSS_COMPILE=$TARGET_PREFIX
@ -94,7 +96,6 @@ fi
post_make_target() { post_make_target() {
$CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
$STRIP $PKG_BUILD/build.linux/tvheadend
} }
makeinstall_target() { makeinstall_target() {

View File

@ -1,19 +0,0 @@
Subject: [PATCH] tvheadend: HACK ffmpeg 3.1.5 instead of 3.3
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.3
-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 = 2590af8c754ce8d55745b1e5647e498bf271dc77
+FFMPEG_SHA1 = 053dfea8c9e057fdf237885decd03147cb2412b1
# ##############################################################################