diff options
| -rw-r--r-- | multimedia/mythtv/README | 2 | ||||
| -rw-r--r-- | multimedia/mythtv/doinst.sh | 17 | ||||
| -rw-r--r-- | multimedia/mythtv/libvpxenc.patch | 42 | ||||
| -rw-r--r-- | multimedia/mythtv/mythtv.SlackBuild | 19 | ||||
| -rw-r--r-- | multimedia/mythtv/mythtv.info | 6 |
5 files changed, 68 insertions, 18 deletions
diff --git a/multimedia/mythtv/README b/multimedia/mythtv/README index 93ae755f3c06a..7bc1ddcc8699c 100644 --- a/multimedia/mythtv/README +++ b/multimedia/mythtv/README @@ -6,5 +6,5 @@ and operating systems. MythTV is known to work on Linux and Mac OS X See README.SLACKWARE after installation for setup information. Optional but recommended dependencies: -libdvdcss, libavc1394, libiec61883, jack-audio-connection-kit, libvdpau, +libdvdcss, libavc1394, libiec61883, jack-audio-connection-kit, gsm, xmltv, mjpegtools, transcode, exif, and lirc. diff --git a/multimedia/mythtv/doinst.sh b/multimedia/mythtv/doinst.sh index 4034523b95082..99ebfdadb849b 100644 --- a/multimedia/mythtv/doinst.sh +++ b/multimedia/mythtv/doinst.sh @@ -11,13 +11,18 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.mythbackend.new: -if [ -e etc/rc.d/rc.mythbackend ]; then - cp -a etc/rc.d/rc.mythbackend etc/rc.d/rc.mythbackend.new.incoming - cat etc/rc.d/rc.mythbackend.new > etc/rc.d/rc.mythbackend.new.incoming - mv etc/rc.d/rc.mythbackend.new.incoming etc/rc.d/rc.mythbackend.new -fi +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} +preserve_perms etc/rc.d/rc.mythbackend.new config etc/rc.d/rc.mythbackend.new config etc/logrotate.d/mythbackend.new config etc/mythtv/config.xml.new diff --git a/multimedia/mythtv/libvpxenc.patch b/multimedia/mythtv/libvpxenc.patch new file mode 100644 index 0000000000000..e8c21288cb255 --- /dev/null +++ b/multimedia/mythtv/libvpxenc.patch @@ -0,0 +1,42 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jzern@google.com> +Date: Mon, 19 Oct 2015 22:44:11 -0700 +Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings + +VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed +from libvpx and the remaining values were never used here + +Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: James Zern <jzern@google.com> +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", +-- +1.7.10.4 + + diff --git a/multimedia/mythtv/mythtv.SlackBuild b/multimedia/mythtv/mythtv.SlackBuild index 2aa092f4a21d2..9358289f8da6d 100644 --- a/multimedia/mythtv/mythtv.SlackBuild +++ b/multimedia/mythtv/mythtv.SlackBuild @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mythtv -VERSION=0.27.4 +VERSION=${VERSION:-0.27.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,15 +64,15 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-fixes-0.27 -tar xvf $CWD/$PRGNAM-fixes-0.27.tar.gz -cd $PRGNAM-fixes-0.27 +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; cd mythtv # Pass libdir to zeromq. @@ -80,6 +80,9 @@ sed -i \ -e"s|--without-documentation|--without-documentation --libdir=/usr/lib$LIBDIRSUFFIX|" \ configure +# Thanks to ARCH Linux +patch -d external/FFmpeg -p1 < $CWD/libvpxenc.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/mythtv/mythtv.info b/multimedia/mythtv/mythtv.info index f32a5b3ac8a5e..6b62181111a4a 100644 --- a/multimedia/mythtv/mythtv.info +++ b/multimedia/mythtv/mythtv.info @@ -1,8 +1,8 @@ PRGNAM="mythtv" -VERSION="0.27.4" +VERSION="0.27.6" HOMEPAGE="http://www.mythtv.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/slackbuildsdirectlinks/mythtv/mythtv-fixes-0.27.tar.gz" -MD5SUM="dc663ddb329ad8ee28be5840d3e7de94" +DOWNLOAD="https://github.com/MythTV/mythtv/archive/v0.27.6.tar.gz" +MD5SUM="187756e9f5dc1d6f887bfe5848db6fc5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libass faac lame MySQL-python lxml urlgrabber perl-http-message libwww-perl perl-Net-UPnP perl-IO-Socket-INET6 x264 xvidcore" |