ffmpeg: updated to 3.4.1

1 files changed, 59 insertions, 22 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index c8fc02ee..1ac1f58a 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # $Id$
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -171,6 +171,8 @@
 #             * Update.
 # 3.4-2:      22/nov/2017 by Eric Hameleers <alien@slackware.com>
 #             * Rebuilt to fix the broken libx265 linking.
+# 3.4.1-1:    29/jan/2018 by Eric Hameleers <alien@slackware.com>
+#             * Updated.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -180,8 +182,8 @@
 
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-3.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.4.1}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
 
@@ -258,18 +260,18 @@ DOCS_X265="AUTHORS COPYING"
 # Support libraries:
 AMRWBENC=0.1.3
 AMR=0.1.3
-ASS=0.13.6
+ASS=0.14.0
 AVC1394=0.5.4
 DC1394=2.1.2
 FDKAAC=0.1.5
 MFX=20170608
 FRIBIDI=0.19.7
 GSM=1.0.16
-LAME=3.99.5
-LIBVA=1.8.0
+LAME=3.100
+LIBVA=2.0.0
 LIBZVBI=0.2.35
 OPUS=1.2.1
-ORC=0.4.26
+ORC=0.4.28
 RAW1394=2.0.5
 RTMP=2.3
 SCHROEDINGER=1.0.11
@@ -277,8 +279,8 @@ SDL2=2.0.7
 SPEEX=1.2.0
 V4L=1.12.2
 VDPAU=1.1.1
-VPX=1.6.1
-X264=20171119-2245
+VPX=1.7.0
+X264=20180128-2245
 X265=2.5
 
 # Where do we look for sources?
@@ -384,13 +386,13 @@ SRCURL[11]="http://rtmpdump.mplayerhq.hu/download/rtmpdump-${RTMP}.tgz"
 SRCPAT[11]="NO"
 
 # libvpx library, containing the VP8 codec
-SOURCE[12]="$SRCDIR/libvpx-${VPX}.tar.bz2"
-SRCURL[12]="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX}.tar.bz2"
+SOURCE[12]="$SRCDIR/libvpx-${VPX}.tar.gz"
+SRCURL[12]="https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz"
 SRCPAT[12]="NO"
 
 # Library supporting VAAPI (GPU-accelerated video playback interface)
 SOURCE[13]="$SRCDIR/libva-${LIBVA}.tar.bz2"
-SRCURL[13]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
+SRCURL[13]="https://github.com/01org/libva/releases/download/${LIBVA}/libva-${LIBVA}.tar.bz2"
 SRCPAT[13]="NO"
 
 # AMR-WB encoder libraries used to encode 3GPP audio
@@ -652,9 +654,9 @@ make_lame()
 {
 echo -e "**\n**  lame ...\n**"
 cd $TMP/tmp-$PRGNAM/lame-${LAME}
-# Fix compilation on x86 (xmmintrin.h error: inlining failed)
-cat $SRCDIR/patches/lame_x86-xmmintrin.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}_lame.log
+## Fix compilation on x86 (xmmintrin.h error: inlining failed)
+#cat $SRCDIR/patches/lame_x86-xmmintrin.patch | patch -p1 --verbose \
+#  2>&1 | tee $OUTPUT/patch-${PRGNAM}_lame.log
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -1046,11 +1048,14 @@ cd -
 make_x264()
 {
 echo -e "**\n**  x264  ...\n**"
-if [ "$ARCH" = "x86_64" ]; then
-  ARCHOPTS="--enable-pic"
-else
-  ARCHOPTS=""
-fi
+
+case "$ARCH" in
+  x86_64|arm*)
+    ARCHOPTS="--enable-pic" ;;
+  *)
+    ARCHOPTS="" ;;
+esac
+
 cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -1066,6 +1071,34 @@ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
 # Install x264 into a temp location so ffmpeg can pickup the library
 make install DESTDIR=$FFMPEGDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
+
+## To be enabled on next ffmpeg release:
+#echo -e "**\n**  x264 (10bit)  ...\n**"
+#echo -e "\n** 10-bit\n**" >> $OUTPUT/configure-${PRGNAM}_x264.log
+#echo -e "\n** 10-bit\n**" >> $OUTPUT/make-${PRGNAM}_x264.log
+#
+## Now add a x62410b (10-bit decoder) to the depsdir:
+#make clean
+#CFLAGS="$SLKCFLAGS" \
+#CXXFLAGS="$SLKCFLAGS" \
+#LDFLAGS="$SLKLDFLAGS" \
+#./configure \
+#  --prefix=/usr \
+#  --libdir=/usr/lib${LIBDIRSUFFIX} \
+#  --enable-static \
+#  --disable-cli \
+#  --bit-depth=10 \
+#  $ARCHOPTS \
+#  2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x264.log
+#sed -i -e 's/libx264/libx26410b/g' Makefile config.mak
+#sed -i -e 's/x264/x26410b/g' x264.pc
+#mv x264.pc x26410b.pc
+#sed -i -e 's/x264.pc/x26410b.pc/g' Makefile
+#make ${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
+## Install x264 into a temp location so ffmpeg can pickup the library
+#make install DESTDIR=$FFMPEGDEPSDIR \
+#  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
+
 # Add DOCS to the ffmpegdeps to have it added to ffmpeg package later:          
 mkdir -p $FFMPEGDEPSDIR/doc/x264
 cp -a $DOCS_X264 $FFMPEGDEPSDIR/doc/x264 || true
@@ -1182,7 +1215,6 @@ PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-static \
-  --disable-documentation \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
@@ -1294,7 +1326,6 @@ LDFLAGS="$SLKLDFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-dummy-driver \
   --enable-shared \
   --enable-static \
   --program-prefix= \
@@ -1535,6 +1566,12 @@ fi
 
 cd $TMP/tmp-$PRGNAM/ffmpeg-${VERSION}
 
+# Fix compilation with newer libx264:
+# To actually use the new multi-bitdepth in libx264 we need a newer release
+# of ffmpeg, and then enable 10bit support in make_x264()
+cat $SRCDIR/patches/x264_bitdepth.patch | patch -p1 --verbose \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+
 if [ "$ARCH" = "x86_64" ]; then
   ARCHOPTS="--arch=x86_64 --enable-pic"
 else