4 files changed, 41 insertions, 56 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index a50df36c4188..a2ae03130c7c 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -2,27 +2,22 @@ FFmpeg is a complete solution to record, convert and stream audio
 and video. It includes libavcodec, the leading audio/video codec
 library.
 
-This script is tested using the svn code from 20071003, and this is
-the tarball hosted on our site.  You may elect to use this source
-code to build the package, or you can pull the latest from their
-subversion repository as indicated below.
-
 If you want to use the latest subversion source when building your
 ffmpeg package, you will need to get it from their svn server.
 To get the source code, you can use the included "ffmpeg-mksrctarball.sh"
 script, which will to download the source code and create a compressed
 tarball of it using the date (date +"%Y%m%d") as its version string.
 
-If you have already ffmpeg's source code as a tarball, for example:
-  ffmpeg-20081104.tar.bz2
-You can tell the build script to use it with the following command:
-  VERSION=20081104 ./ffmpeg.SlackBuild
-Note that this is the version that will be used by default unless you
-specify otherwise.
-
 ffmpeg requires the following, all of which are available at SlackBuilds.org:
- lame, faac, faad2, xvidcore and x264
+ lame, faac, faad2, speex, xvidcore, schroedinger, openjpeg and x264.
 
 If you additionally want support for amrnb and/or amrwb pass AMRNB=yes and/or
 AMRWB=yes to the script. This will create non-redistributable binaries though.
 amrnb and amrwb can also be found on SlackBuilds.org.
+
+Support for the (slower) dirac codec libdirac can be enabled by passing DIRAC=yes
+to the script. The (faster) dirac codec libschroedinger is already enabled by
+default.
+
+Those who have an nvidia graphics card which is capable of hardware video decoding
+can enable VDPAU by passing VDPAU=yes to the script.
diff --git a/multimedia/ffmpeg/ffmpeg-mksrctarball.sh b/multimedia/ffmpeg/ffmpeg-mksrctarball.sh
deleted file mode 100644
index 84d997609a61..000000000000
--- a/multimedia/ffmpeg/ffmpeg-mksrctarball.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# This script helps you to download and compress the
-# sourcecode for ffmpeg from its svn server.
-
-set -e
-
-PRGNAM=ffmpeg
-VERSION=$(date +"%Y%m%d")
-SVNSERVER=svn://svn.mplayerhq.hu
-
-echo "--> Downloading sourcecode from $SVNSERVER"
-svn export $SVNSERVER/$PRGNAM/trunk $PRGNAM-$VERSION 2>&1 | tee svn-$PRGNAM-$VERSION.log
-
-echo "--> Making the sourcecode tarball: $PRGNAM-$VERSION.tar.bz2 "
-tar -c $PRGNAM-$VERSION/ | bzip2 > $PRGNAM-$VERSION.tar.bz2
-
-echo "--> Erasing the sourcecode directory: $PRGNAM-$VERSION/"
-rm -rf $PRGNAM-$VERSION/
-
-echo "--> Sourcecode tarball for $PRGNAM: $PRGNAM-$VERSION.tar.bz2"
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 852bd02cea18..8c22619ac31b 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -6,13 +6,8 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 # Modified by Heinz Wiesinger <pprkut@liwjatan.org>
 
-set -e
-
 PRGNAM=ffmpeg
-VERSION=${VERSION:-20081105}
-# To use today's svn checkout, comment the line above and uncomment
-# the line below.  See the README for more information.
-#VERSION=${VERSION:-$(date +"%Y%m%d")}
+VERSION=${VERSION:-0.5}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -44,6 +39,20 @@ else
   amr_wb="--enable-libamr-wb"
 fi
 
+if [ "${DIRAC:-no}" = "no" ]; then
+  dirac_slow=""
+else
+  dirac_slow="--enable-libdirac"
+fi
+
+if [ "${VDPAU:-no}" = "no" ]; then
+  vdpau_opt="--disable-vdpau"
+else
+  vdpau_opt="--enable-vdpau"
+fi
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -53,8 +62,8 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -I/usr/include/openjpeg" \
+CXXFLAGS="$SLKCFLAGS -I/usr/include/openjpeg" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -75,6 +84,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-libx264 \
   --enable-avfilter \
   --enable-avfilter-lavf \
+  --enable-libschroedinger \
+  --enable-libspeex \
+  --enable-libopenjpeg \
+  $dirac_slow \
+  $vdpau_opt \
   $non_free \
   $amr_nb \
   $amr_wb
@@ -82,8 +96,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -95,14 +113,6 @@ cp -a Changelog* COPYING* CREDITS* INSTALL* MAINTAINERS* \
   README* doc/TODO* doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-if [ -e $CWD/$PRGNAM-mksrctarball.sh ]; then
-  cat $CWD/$PRGNAM-mksrctarball.sh > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-mksrctarball.sh
-fi
-
-if [ -e $CWD/svn-$PRGNAM-$VERSION.log ]; then
-  cat $CWD/svn-$PRGNAM-$VERSION.log > $PKG/usr/doc/$PRGNAM-$VERSION/svn-$PRGNAM-$VERSION.log
-fi
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
index 7c1049729cb1..2156adaf855e 100644
--- a/multimedia/ffmpeg/ffmpeg.info
+++ b/multimedia/ffmpeg/ffmpeg.info
@@ -1,8 +1,8 @@
 PRGNAM="ffmpeg"
-VERSION="20081105"
-HOMEPAGE="http://ffmpeg.mplayerhq.hu"
-DOWNLOAD="http://slackbuilds.org/sources/12.1/ffmpeg-20081105.tar.bz2"
-MD5SUM="6f6e1a752c946f7ce4c923508a4f454e"
+VERSION="0.5"
+HOMEPAGE="http://www.ffmpeg.org"
+DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.5.tar.bz2"
+MD5SUM="be8503f15c3b81ba00eb8379ca8dcf33"
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="dsomero"
+APPROVED="rworkman"