diff options
| -rw-r--r-- | multimedia/ffmpeg/README | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 19 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.info | 6 |
4 files changed, 19 insertions, 50 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README index 380e286cb5..838085083e 100644 --- a/multimedia/ffmpeg/README +++ b/multimedia/ffmpeg/README @@ -13,6 +13,7 @@ FAAC=yes|no (default: no), requires faac (creates non-redistributable binary) FDK_AAC=yes|no (default: no), requires libfdk-aac (creates non-redistributable binary) FLITE=yes|no (default: no), requires flite FREI0R=yes|no (default: no), requires frei0r +GME=yes|no (default: no), requires libgme GSM=yes|no (default: no), requires gsm IEC61883=yes|no (default: no), requires libiec61883 and libavc1394 ILBC=yes|no (default: no), requires libilbc @@ -28,9 +29,11 @@ OPUS=yes|no (default: no), requires opus QUVI=yes|no (default: no), requires libquvi RTMP=yes|no (default: no), requires rtmpdump SCHROEDINGER=yes|no (default: no), requires schroedinger +SNAPPY=yes|no (default: no), requires snappy SPEEX=yes|no (default: no), requires speex TWOLAME=yes|no (default: no), requires twolame VIDSTAB=yes|no (default: no), requires vid.stab +WEBP=yes|no (default: no), requires libwebp X264=yes|no (default: no), requires x264 X265=yes|no (default: no), requires x265 XVID=yes|no (default: no), requires xvidcore diff --git a/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch deleted file mode 100644 index 15d2600d1c..0000000000 --- a/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index c7befb1d62..882b1e498d 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ffmpeg -# Copyright 2010-2015 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2010-2016 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> PRGNAM=ffmpeg -VERSION=${VERSION:-2.6.6} +VERSION=${VERSION:-2.8.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -100,6 +100,9 @@ libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ] && libvidstab="--enable-libvid libx265="" ; [ "${X265:-no}" != "no" ] && libx265="--enable-libx265" libzvbi="" ; [ "${ZVBI:-no}" != "no" ] && libzvbi="--enable-libzvbi" libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv" +libgme="" ; [ "${GME:-no}" != "no" ] && libgme="--enable-libgme" +libsnappy="" ; [ "${SNAPPY:-no}" != "no" ] && libsnappy="--enable-libsnappy" +libwebp="" ; [ "${WEBP:-no}" != "no" ] && libwebp="--enable-libwebp" #opencl=""; [ "${OPENCL:-no}" != "no" ] && opencl="--enable-opencl" opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \ @@ -123,7 +126,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -136,9 +139,6 @@ find -L . \ sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \ ./configure -# Some variables are removed from newer libvpx releases -patch -p1 < $CWD/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch - CFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \ CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \ ./configure \ @@ -168,6 +168,10 @@ CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \ --enable-libvpx \ --enable-libpulse \ --enable-libopenjpeg \ + --enable-libwavpack \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-fontconfig \ --arch=$ARCH \ $libdc1394 \ $mp3lame \ @@ -199,6 +203,9 @@ CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \ $libzvbi \ $libopencv \ $decklink \ + $libgme \ + $libsnappy \ + $libwebp \ $ssl make diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index 944d9c061f..a0cbfed238 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,8 +1,8 @@ PRGNAM="ffmpeg" -VERSION="2.6.6" +VERSION="2.8.6" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.6.6.tar.bz2" -MD5SUM="f7fce342f4c947376bf8ee6936681776" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.8.6.tar.xz" +MD5SUM="0cff5dae51375f0a31a651f986ed1534" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" |