ffmpeg: updated to 3.3.1

1 files changed, 25 insertions, 17 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 857d0cee..481faa11 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -157,6 +157,9 @@
 #               Add SDL2 internal library, required by ffplay.
 # 3.2.4-2:    31/mar/2017 by Eric Hameleers <alien@slackware.com>
 #             * Recompiled against new libcdio-paranoia in -current.
+# 3.3.1-1:    20/may/2017 by Eric Hameleers <alien@slackware.com>
+#             * Update. After expiry of the MP3 patents, this package will now
+#               be able to encode MP3 even in the unrestricted variant.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -165,15 +168,14 @@
 # -----------------------------------------------------------------------------
 
 # -- PATENT ALERT! --
-# FFmpeg can be built with MP3 audio encoder (needed for FLV videos) and AAC
-# audio encoder (used in MP4) but these libraries are 'contaminated'
-# with patents from Fraunhofer, Apple etc.
+# FFmpeg can be built with AAC audio encoder (used in MP4) but this library is
+# 'contaminated' with patents from Apple etc.
 # You can build these patended algorithms into ffmpeg, and if you are an
 # 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 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.
+# with "USE_PATENTS=NO" i.e. without using the aac libs.
 #USE_PATENTS="NO"
 USE_PATENTS=${USE_PATENTS:-"YES"}
 
@@ -187,9 +189,16 @@ else
   USE_PULSE=""
 fi
 
+if pkg-config --exists OpenCL 2>/dev/null ; then
+  # Enable opencl only when present:
+  USE_OPENCL="--enable-opencl"
+else
+  USE_OPENCL=""
+fi
+
 PRGNAM=ffmpeg
-VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.3.1}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
 
@@ -326,7 +335,7 @@ SRCPAT[6]="NO"
 # Lame is used for the audio in FLV videos; will statically link with ffmpeg
 SOURCE[7]="$SRCDIR/lame-$LAME.tar.gz"
 SRCURL[7]="http://downloads.sourceforge.net/lame/lame-$LAME.tar.gz"
-SRCPAT[7]="YES"
+SRCPAT[7]="NO"
 
 # Library to support the AVC (Audio/Video Control) Digital Interface Command Set
 SOURCE[8]="$SRCDIR/libavc1394-${AVC1394}.tar.gz"
@@ -467,7 +476,7 @@ H) \
 if [ "${USE_PATENTS}" == "YES" ]; then
   echo ""
   echo "**"
-  echo "** This build uses patented code (MP3 and AAC encoders)"
+  echo "** This build uses patented code (AAC encoder)"
   echo "** Run the command 'USE_PATENTS=NO $0 $*' to avoid patent issues."
   echo "**"
   echo ""
@@ -491,7 +500,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
@@ -1445,8 +1454,7 @@ fi
 
 # Only use non-free code if we are allowing it:
 if [ "${USE_PATENTS}" == "YES" ]; then
-  USE_NONFREE="--enable-libmp3lame \
-                --enable-libfdk-aac \
+  USE_NONFREE=" --enable-libfdk-aac \
                 --enable-openssl \
                 --enable-nonfree"
 else
@@ -1462,8 +1470,8 @@ else
 fi
 
 # Fix SDL header location:
-sed -e '/#include/ s,<SDL,<SDL2/SDL,' -i ffplay.c
-sed -e '/#include/ s,<SDL,<SDL2/SDL,' -i libavdevice/sdl2.c
+#sed -e '/#include/ s,<SDL,<SDL2/SDL,' -i ffplay.c
+#sed -e '/#include/ s,<SDL,<SDL2/SDL,' -i libavdevice/sdl2.c
 
 # Or else orc's library will not be used in the static linking (orc is listed
 # as a private lib for schroedinger):
@@ -1490,6 +1498,7 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   --enable-version3 \
   --enable-avfilter \
   --enable-avresample \
+  --enable-libmp3lame \
   --enable-libass \
   --enable-libdc1394 \
   --enable-libgsm \
@@ -1511,18 +1520,17 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   --enable-sdl2 \
   --enable-vaapi \
   --enable-vdpau \
-  --enable-memalign-hack \
   --enable-pthreads \
-  --enable-x11grab \
   --enable-bzlib \
   --enable-zlib \
   --enable-shared \
   --enable-static \
   --disable-debug \
+  ${USE_OPENCL} \
   ${USE_PULSE} \
   ${USE_NONFREE} \
   $ARCHOPTS \
-  --extra-cflags="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL -DRUNTIME_CPUDETECT" \
+  --extra-cflags="-I$FFMPEGDEPSDIR/usr/include -I$FFMPEGDEPSDIR/usr/include/SDL2 -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
@@ -1543,10 +1551,10 @@ cd $OLDDIR
 # Needed before ffmpeg:
 # Based on the value of $USE_PATENTS enable or disable non-free code:
 if [ "${USE_PATENTS}" = "YES" ]; then
-  make_lame
   make_fdkaac
 fi
 
+make_lame
 make_amr
 make_amrwbenc
 make_1394