ffmpeg: updated to 2.8

1 files changed, 22 insertions, 13 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 0a639079..d301675f 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -139,6 +139,10 @@
 # 2.7.2-1:    07/sep/2015 by Eric Hameleers <alien@slackware.com>
 #             * Update. Also updated internal libraries: fdkaac, libass,
 #               libva, libvdpau, speex, x264, x265
+# 2.8-1:      24/sep/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update. Enabled SSL support (openssl in the non-free package,
+#               gnutls in the patent-free package).
+#               Updated internal libraries: libvpx, x264.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -154,7 +158,7 @@
 # ordinary end user, no one will bother you for using them.
 # For the binaries based on this SlackBuild that I distribute, it is a
 # different story. I am not allowed to distribute binary packages that
-# incorporate patented code. So here you go. My Slackware package was built
+# incorporate non-free code. So here you go. My Slackware package was built
 # with "USE_PATENTS=NO" i.e. without using the lame mp3 and aac libs.
 #USE_PATENTS="NO"
 USE_PATENTS=${USE_PATENTS:-"YES"}
@@ -163,7 +167,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-2.7.2}
+VERSION=${VERSION:-2.8}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
@@ -221,8 +225,8 @@ SCHROEDINGER=1.0.11
 SPEEX=1.2rc2
 V4L=1.6.0
 VDPAU=1.1.1
-VPX=v1.3.0
-X264=20150906-2245
+VPX=1.4.0
+X264=20150923-2245
 X265=1.7
 
 # Where do we look for sources?
@@ -334,7 +338,7 @@ SRCPAT[12]="NO"
 
 # libvpx library, containing the VP8 codec
 SOURCE[13]="$SRCDIR/libvpx-${VPX}.tar.bz2"
-SRCURL[13]="http://webm.googlecode.com/files/libvpx-${VPX}.tar.bz2"
+SRCURL[13]="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX}.tar.bz2"
 SRCPAT[13]="NO"
 
 # Library supporting VAAPI (GPU-accelerated video playback interface)
@@ -1544,16 +1548,17 @@ if [ -d ffmpeg-export-* ]; then
   mv ffmpeg-export-* ffmpeg-${VERSION}
 fi
 
-# Only use patented code if we are allowing it:
+# Only use non-free code if we are allowing it:
 if [ "${USE_PATENTS}" == "YES" ]; then
-  USE_PATENTED="--enable-libmp3lame \
+  USE_NONFREE="--enable-libmp3lame \
                 --enable-libfaac \
                 --enable-libvo-aacenc \
                 --enable-libfdk-aac \
+                --enable-openssl \
                 --enable-nonfree"
                 # to be added once I get it to work: --enable-libaacplus \
 else
-  USE_PATENTED=" "
+  USE_NONFREE="--enable-gnutls"
 fi
 
 cd $TMP/tmp-$PRGNAM/ffmpeg-${VERSION}
@@ -1564,6 +1569,9 @@ else
   ARCHOPTS=""
 fi
 
+# Fix SDL header location:
+sed -e '/#include/ s,<SDL,<SDL/SDL,' -i ffplay.c
+
 # Or else orc's library will not be used in the static linking (orc is listed
 # as a private lib for schroedinger):
 sed -i -e "s/pkg_config --libs/pkg_config --static --libs/" \
@@ -1573,8 +1581,9 @@ sed -i -e "s/pkg_config --libs/pkg_config --static --libs/" \
 [ -f version.sh ] && sed -i -e "s/UNKNOWN/$VERSION/" version.sh
 
 TMPDIR="$TMP" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \
+CPPFLAGS="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL" \
+CXXFLAGS="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL $SLKCFLAGS" \
 LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lpng -lXext" \
 PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
@@ -1584,7 +1593,6 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   --shlibdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/${PRGNAM}-${VERSION} \
   --mandir=/usr/man \
-  ${USE_PATENTED} \
   --enable-gpl \
   --enable-version3 \
   --enable-avfilter \
@@ -1617,8 +1625,9 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   --enable-shared \
   --enable-static \
   --disable-debug \
+  ${USE_NONFREE} \
   $ARCHOPTS \
-  --extra-cflags="-I$FFMPEGDEPSDIR/usr/include -DRUNTIME_CPUDETECT" \
+  --extra-cflags="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL -DRUNTIME_CPUDETECT" \
   --extra-ldflags="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} -ldl -lssl -lcrypto -lz -lusb" \
   --pkg-config-flags="--static" \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
@@ -1638,7 +1647,7 @@ cd $OLDDIR
 #if [ 'xy' != 'xy' ]; then # use this block if you want to skip a lot
 
 # Needed before ffmpeg:
-# Based on the value of $USE_PATENTS enable or disable patented code:
+# Based on the value of $USE_PATENTS enable or disable non-free code:
 if [ "${USE_PATENTS}" = "YES" ]; then
   make_lame
   make_faac