ffmpeg: updated to 3.1.1. Updated internal libraries: opus, orc, v4l, vaapi, vpx, x264, x265. Support for libvo-aacenc was dropped from ffmpeg.

1 files changed, 59 insertions, 94 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 6cddf785..7dc64e69 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  Eric Hameleers, Eindhoven, NL
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -143,6 +143,10 @@
 #             * Update. Enabled SSL support (openssl in the non-free package,
 #               gnutls in the patent-free package).
 #               Updated internal libraries: libvpx, x264.
+# 3.1.1-1:    06/jul/2016 by Eric Hameleers <alien@slackware.com>
+#             * Update. Updated internal libraries: opus, orc, v4l, vaapi,
+#               vpx, x264, x265.
+#               Support for libvo-aacenc was dropped from ffmpeg.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -167,14 +171,13 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
 
 DOCS="COPYING* CREDITS Changelog MAINTAINERS README* \
       doc/TODO doc/*.txt doc/*.html"
-DOCS_AACENC="AUTHORS COPYING* ChangeLog NEWS NOTICE README"
 DOCS_AACPLUS="AUTHORS COPYING* ChangeLog NEWS README TODO"
 DOCS_AMR="AUTHORS COPYING ChangeLog LICENSE NEWS README"
 DOCS_AMRWBENC="AUTHORS COPYING ChangeLog LICENSE NEWS NOTICE README"
@@ -202,7 +205,6 @@ DOCS_X264="AUTHORS COPYING"
 DOCS_X265="AUTHORS COPYING"
 
 # Support libraries:
-AACENC=0.1.3
 AACPLUS=2.0.2
 AMRWBENC=0.1.3
 AMR=0.1.3
@@ -215,19 +217,19 @@ FDKAAC=0.1.4
 FRIBIDI=0.19.6
 GSM=1.0.13
 LAME=3.99.5
-LIBVA=1.5.1
+LIBVA=1.6.2
 LIBZVBI=0.2.35
-OPUS=1.1
-ORC=0.4.18
+OPUS=1.1.2
+ORC=0.4.25
 RAW1394=2.0.5
 RTMP=2.3
 SCHROEDINGER=1.0.11
 SPEEX=1.2rc2
-V4L=1.6.0
+V4L=1.10.1
 VDPAU=1.1.1
-VPX=1.4.0
-X264=20150923-2245
-X265=1.7
+VPX=1.5.0
+X264=20160706-2245
+X265=1.9
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -278,8 +280,8 @@ SOURCE[0]="$SRCDIR/ffmpeg-${SRCVER}.tar.bz2"
 SRCPAT[0]="NO"
 
 # Orc (oil runtime compiler) is a dependency for schroedinger
-SOURCE[1]="$SRCDIR/orc-${ORC}.tar.gz"
-SRCURL[1]="http://code.entropywave.com/download/orc/orc-${ORC}.tar.gz"
+SOURCE[1]="$SRCDIR/orc-${ORC}.tar.xz"
+SRCURL[1]="https://gstreamer.freedesktop.org/src/orc/orc-${ORC}.tar.xz"
 SRCPAT[1]="NO"
 
 # Dirac video codec support by schroedinger:
@@ -326,80 +328,75 @@ SOURCE[10]="$SRCDIR/libdc1394-${DC1394}.tar.gz"
 SRCURL[10]="http://downloads.sourceforge.net/libdc1394/libdc1394-${DC1394}.tar.gz"
 SRCPAT[10]="NO"
 
-# VisualOn AAC encoding library, for AAC (MP4 audio) encoding
-SOURCE[11]="$SRCDIR/vo-aacenc-$AACENC.tar.gz"
-SRCURL[11]="http://downloads.sourceforge.net/opencore-amr/vo-aacenc-$AACENC.tar.gz"
-SRCPAT[11]="YES"
-
 # librtmp library, supporting RTMP streams
-SOURCE[12]="$SRCDIR/rtmpdump-${RTMP}.tgz"
-SRCURL[12]="http://rtmpdump.mplayerhq.hu/download/rtmpdump-${RTMP}.tgz"
-SRCPAT[12]="NO"
+SOURCE[11]="$SRCDIR/rtmpdump-${RTMP}.tgz"
+SRCURL[11]="http://rtmpdump.mplayerhq.hu/download/rtmpdump-${RTMP}.tgz"
+SRCPAT[11]="NO"
 
 # libvpx library, containing the VP8 codec
-SOURCE[13]="$SRCDIR/libvpx-${VPX}.tar.bz2"
-SRCURL[13]="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX}.tar.bz2"
-SRCPAT[13]="NO"
+SOURCE[12]="$SRCDIR/libvpx-${VPX}.tar.bz2"
+SRCURL[12]="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX}.tar.bz2"
+SRCPAT[12]="NO"
 
 # Library supporting VAAPI (GPU-accelerated video playback interface)
-SOURCE[14]="$SRCDIR/libva-${LIBVA}.tar.bz2"
-SRCURL[14]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
-SRCPAT[14]="NO"
+SOURCE[13]="$SRCDIR/libva-${LIBVA}.tar.bz2"
+SRCURL[13]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
+SRCPAT[13]="NO"
 
 # AMR-WB encoder libraries used to encode 3GPP audio
-SOURCE[15]="$SRCDIR/vo-amrwbenc-${AMRWBENC}.tar.gz"
-SRCURL[15]="http://downloads.sourceforge.net/opencore-amr/vo-amrwbenc-${AMRWBENC}.tar.gz"
-SRCPAT[15]="NO"
+SOURCE[14]="$SRCDIR/vo-amrwbenc-${AMRWBENC}.tar.gz"
+SRCURL[14]="http://downloads.sourceforge.net/opencore-amr/vo-amrwbenc-${AMRWBENC}.tar.gz"
+SRCPAT[14]="NO"
 
 # AMR-NB de/encoder and WB decoder libraries used to de/encode 3GPP audio
-SOURCE[16]="$SRCDIR/opencore-amr-${AMR}.tar.gz"
-SRCURL[16]="http://downloads.sourceforge.net/opencore-amr/opencore-amr-${AMR}.tar.gz"
-SRCPAT[16]="NO"
+SOURCE[15]="$SRCDIR/opencore-amr-${AMR}.tar.gz"
+SRCURL[15]="http://downloads.sourceforge.net/opencore-amr/opencore-amr-${AMR}.tar.gz"
+SRCPAT[15]="NO"
 
 # FAAC library, for AAC (MP4 audio) encoding
-SOURCE[17]="$SRCDIR/faac-$FAAC.tar.gz"
-SRCURL[17]="http://downloads.sourceforge.net/faac/faac-$FAAC.tar.gz"
-SRCPAT[17]="YES"
+SOURCE[16]="$SRCDIR/faac-$FAAC.tar.gz"
+SRCURL[16]="http://downloads.sourceforge.net/faac/faac-$FAAC.tar.gz"
+SRCPAT[16]="YES"
 
 # Unicode BiDirectional algorithm library, requirement for libass.
-SOURCE[18]="$SRCDIR/fribidi-${FRIBIDI}.tar.bz2"
-SRCURL[18]="http://fribidi.org/download/fribidi-${FRIBIDI}.tar.bz2"
-SRCPAT[18]="NO"
+SOURCE[17]="$SRCDIR/fribidi-${FRIBIDI}.tar.bz2"
+SRCURL[17]="http://fribidi.org/download/fribidi-${FRIBIDI}.tar.bz2"
+SRCPAT[17]="NO"
 
 # Libass - portable library for SSA/ASS subtitles rendering
-SOURCE[19]="$SRCDIR/libass-$ASS.tar.xz"
-SRCURL[19]="https://github.com/libass/libass/releases/download/${ASS}/libass-$ASS.tar.xz"
-SRCPAT[19]="NO"
+SOURCE[18]="$SRCDIR/libass-$ASS.tar.xz"
+SRCURL[18]="https://github.com/libass/libass/releases/download/${ASS}/libass-$ASS.tar.xz"
+SRCPAT[18]="NO"
 
 # Collection of video4linux support libraries
-SOURCE[20]="$SRCDIR/v4l-utils-${V4L}.tar.bz2"
-SRCURL[20]="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${V4L}.tar.bz2"
-SRCPAT[20]="NO"
+SOURCE[19]="$SRCDIR/v4l-utils-${V4L}.tar.bz2"
+SRCURL[19]="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${V4L}.tar.bz2"
+SRCPAT[19]="NO"
 
 # opus codec:
-SOURCE[21]="$SRCDIR/opus-${OPUS}.tar.gz"
-SRCURL[21]="http://downloads.xiph.org/releases/opus/opus-${OPUS}.tar.gz"
-SRCPAT[21]="NO"
+SOURCE[20]="$SRCDIR/opus-${OPUS}.tar.gz"
+SRCURL[20]="http://downloads.xiph.org/releases/opus/opus-${OPUS}.tar.gz"
+SRCPAT[20]="NO"
 
 # VDPAU for video hardware acceleration:
-SOURCE[22]="$SRCDIR/libvdpau-${VDPAU}.tar.gz"
-SRCURL[22]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar.gz"
-SRCPAT[22]="NO"
+SOURCE[21]="$SRCDIR/libvdpau-${VDPAU}.tar.gz"
+SRCURL[21]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar.gz"
+SRCPAT[21]="NO"
 
 # libzvbi for teletext subtitle processing:
-SOURCE[23]="$SRCDIR/zvbi-${LIBZVBI}.tar.bz2"
-SRCURL[23]="http://downloads.sourceforge.net/zapping/zvbi-${LIBZVBI}.tar.bz2"
-SRCPAT[23]="NO"
+SOURCE[22]="$SRCDIR/zvbi-${LIBZVBI}.tar.bz2"
+SRCURL[22]="http://downloads.sourceforge.net/zapping/zvbi-${LIBZVBI}.tar.bz2"
+SRCPAT[22]="NO"
 
 # fdk-aac en/decoder from the Android Open Source Project (opencore-amr):
-SOURCE[24]="$SRCDIR/fdk-aac-${FDKAAC}.tar.gz"
-SRCURL[24]="http://downloads.sourceforge.net/opencore-amr/fdk-aac-${FDKAAC}.tar.gz"
-SRCPAT[24]="YES"
+SOURCE[23]="$SRCDIR/fdk-aac-${FDKAAC}.tar.gz"
+SRCURL[23]="http://downloads.sourceforge.net/opencore-amr/fdk-aac-${FDKAAC}.tar.gz"
+SRCPAT[23]="YES"
 
 # Videolan's HEVC (x265) codec:
-SOURCE[25]="$SRCDIR/x265-${X265}.tar.gz"
-SRCURL[25]="http://github.com/videolan/x265/archive/${X265}.tar.gz"
-SRCPAT[25]="NO"
+SOURCE[24]="$SRCDIR/x265-${X265}.tar.gz"
+SRCURL[24]="http://github.com/videolan/x265/archive/${X265}.tar.gz"
+SRCPAT[24]="NO"
 
 ## HE-AAC+ v2 shared library:
 #SOURCE[XX]="$SRCDIR/libaacplus-$AACPLUS.tar.gz"
@@ -552,7 +549,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
       [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
       if ! [ "x${SRCURL[$i]}" == "x" ]; then
         echo "Will download file to $(dirname $SOURCE[$i])"
-        if ! $(wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}"); then
+        if ! $(wget --no-check-certificate -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}"); then
           echo "Downloading '$(basename ${SOURCE[$i]})' failed.. aborting the build."
           mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
           exit 1
@@ -705,36 +702,6 @@ cp -a $DOCS_AMRWBENC $FFMPEGDEPSDIR/doc/amrwbenc || true
 cd -
 }
 
-# -----------------------------------------------------------------------------
-# Compile aacenc library
-# The ffmpeg will use these
-# -----------------------------------------------------------------------------
-make_aacenc()
-{
-echo -e "**\n**  aacenc ...\n**"
-cd $TMP/tmp-$PRGNAM/vo-aacenc-${AACENC}
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-static \
-  --disable-shared \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$TARGET \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}_aacenc.log
-make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_aacenc.log
-# Install aacenc into a temp location so ffmpeg can pickup the library
-make install DESTDIR=$FFMPEGDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_aacenc.log
-# Add DOCS to the ffmpegdeps to have it added to ffmpeg package later:
-mkdir -p $FFMPEGDEPSDIR/doc/aacenc
-cp -a $DOCS_AACENC $FFMPEGDEPSDIR/doc/aacenc || true
-cd -
-}
 
 # -----------------------------------------------------------------------------
 # Compile fdk-aac library
@@ -1560,7 +1527,6 @@ fi
 if [ "${USE_PATENTS}" == "YES" ]; then
   USE_NONFREE="--enable-libmp3lame \
                 --enable-libfaac \
-                --enable-libvo-aacenc \
                 --enable-libfdk-aac \
                 --enable-openssl \
                 --enable-nonfree"
@@ -1660,7 +1626,6 @@ if [ "${USE_PATENTS}" = "YES" ]; then
   make_lame
   make_faac
   #make_aacplus
-  make_aacenc
   make_fdkaac
 fi
 
@@ -1708,7 +1673,7 @@ for PCFILE in $(ls $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc) ; do
          -e 's/-lspeex//g' -e 's/-lgsm//g' -e 's/-lrtmp//g' \
          -e 's/-lopencore-amrnb//g' -e 's/-lopencore-amrwb//g' \
          -e 's/-lfaac//g' -e 's/-lfaad//g' \
-         -e 's/-lvo-amrwbenc//g' -e 's/-lvo-aacenc//g' -e 's/-lfdk-aac//g'  \
+         -e 's/-lvo-amrwbenc//g' -e 's/-lfdk-aac//g'  \
          -e 's/-lmp3lame//g' \
          -e 's/-lopus//g' \
          -e 's/-lschroedinger-[^ ]*//g' -e 's/-lorc-[^ ]*//g' \