multimedia/ffmpeg: Updated for version 2.1.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

3 files changed, 52 insertions, 10 deletions

diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index 4e3bc7b644..77d3e3b923 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -11,14 +11,21 @@ DC1394=yes|no (default: no), requires libdc1394
 FAAC=yes|no (default: no), requires faac (creates non-redistributable binary)
 FREI0R=yes|no (default: no), requires frei0r
 GSM=yes|no (default: no), requires gsm
+IEC61883=yes|no (default: no), requires libiec61883 and libavc1394
+ILBC=yes|no (default: no), requires libilbc
 JP2=yes|no (default: no), requires openjpeg
+LADSPA=yes|no (default: no), requires ladspa_sdk
 LAME=yes|no (default: yes), requires lame
+MODPLUG=yes|no (default: no), requires libmodplug
 OPENAL=yes|no (default: no), requires OpenAL
+OPENCL=yes|no (default: no), requires opencl-headers
 OPENCORE=yes|no (default: no), requires opencore-amr
 OPENSSL=yes|no (default: no), creates non-redistributable binary
+OPUS=yes|no (default: no), requires opus
 RTMP=yes|no (default: no), requires rtmpdump
 SCHROEDINGER=yes|no (default: no), requires schroedinger
 SPEEX=yes|no (default: no), requires speex
+TWOLAME=yes|no (default: no), requires twolame
 VPX=yes|no (default: no), requires libvpx
 X264=yes|no (default: yes), requires x264
 XVID=yes|no (default: no), requires xvidcore
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index b5772c52ef..1814858dfe 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -2,13 +2,32 @@
 
 # Slackware build script for ffmpeg
 
-# Written by core (eroc@linuxmail.org)
+# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Originally written by core (eroc@linuxmail.org)
 # Modified by Robby Workman <rworkman@slackbuilds.org>
-# Modified by Heinz Wiesinger <pprkut@liwjatan.org>
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-0.11.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,6 +87,13 @@ libxvid=""    ; [ "${XVID:-no}" != "no" ]         && libxvid="--enable-libxvid"
 libbluray=""  ; [ "${BLURAY:-no}" != "no" ]       && libbluray="--enable-libbluray"
 libass=""     ; [ "${ASS:-no}" != "no" ]          && libass="--enable-libass"
 libopenal=""  ; [ "${OPENAL:-no}" != "no" ]       && libopenal="--enable-openal"
+libiec61883=""; [ "${IEC61883:-no}" != "no" ]     && libiec61883="--enable-libiec61883"
+libilbc="";     [ "${ILBC:-no}" != "no" ]         && libilbc="--enable-libilbc"
+libmodplug="";  [ "${MODPLUG:-no}" != "no" ]      && libmodplug="--enable-libmodplug"
+libopus="";     [ "${OPUS:-no}" != "no" ]         && libopus="--enable-libopus"
+libtwolame="";  [ "${TWOLAME:-no}" != "no" ]      && libtwolame="--enable-libtwolame"
+ladspa="";      [ "${LADSPA:-no}" != "no" ]       && ladspa="--enable-ladspa"
+opencl="";      [ "${OPENCL:-no}" != "no" ]       && opencl="--enable-opencl"
 
 opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
   opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
@@ -102,6 +128,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --shlibdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/html \
   --mandir=/usr/man \
   --disable-debug \
   --enable-shared \
@@ -117,6 +144,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-avfilter \
   --enable-gnutls \
   --enable-libcdio \
+  --enable-libssh \
   --arch=$ARCH \
   $openjpeg \
   $libdc1394 \
@@ -136,6 +164,13 @@ CXXFLAGS="$SLKCFLAGS" \
   $libbluray \
   $libass \
   $libopenal \
+  $libiec61883 \
+  $libilbc \
+  $libmodplug \
+  $libopus \
+  $libtwolame \
+  $ladspa \
+  $opencl \
   $ssl
 
 make
@@ -147,10 +182,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/txt
 cp -a Changelog COPYING* CREDITS INSTALL LICENSE MAINTAINERS README RELEASE \
-  VERSION doc/RELEASE_NOTES doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION
+  VERSION doc/RELEASE_NOTES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/txt/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
index fde12524b0..016ccbfe64 100644
--- a/multimedia/ffmpeg/ffmpeg.info
+++ b/multimedia/ffmpeg/ffmpeg.info
@@ -1,8 +1,8 @@
 PRGNAM="ffmpeg"
-VERSION="0.11.1"
+VERSION="2.1"
 HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.11.1.tar.bz2"
-MD5SUM="ff8cb914f657e164dd60ea1008b555a8"
+DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.1.tar.bz2"
+MD5SUM="4ec1cedd4c7753512462f70b347c338a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% lame x264"