From 0df7171d9cfca4ffa8a26875915c0e7d1979959a Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@slackbuilds.org>
Date: Sun, 19 Aug 2012 13:15:52 +0200
Subject: multimedia/ffmpeg: Updated for version 0.11.1

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 multimedia/ffmpeg/ffmpeg.SlackBuild | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'multimedia/ffmpeg/ffmpeg.SlackBuild')

diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index b67c5422c0..f64058375f 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -7,7 +7,7 @@
 # Modified by Heinz Wiesinger <pprkut@liwjatan.org>
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-0.8.7}
+VERSION=${VERSION:-0.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,12 +61,14 @@ libdc1394=""  ; [ "${DC1394:-no}" != "no" ]       && libdc1394="--enable-libdc13
 dirac_slow="" ; [ "${DIRAC:-no}" != "no" ]        && dirac_slow="--enable-libdirac"
 libfrei0r=""  ; [ "${FREI0R:-no}" != "no" ]       && libfrei0r="--enable-frei0r"
 libgsm=""     ; [ "${GSM:-no}" != "no" ]          && libgsm="--enable-libgsm"
-libopencv=""  ; [ "${OPENCV:-no}" != "no" ]       && libopencv="--enable-libopencv"
 librtmp=""    ; [ "${RTMP:-no}" != "no" ]         && librtmp="--enable-librtmp"
 dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger"
 libspeex=""   ; [ "${SPEEX:-no}" != "no" ]        && libspeex="--enable-libspeex"
 libvpx=""     ; [ "${VPX:-no}" != "no" ]          && libvpx="--enable-libvpx"
 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"
 
 opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
   opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
@@ -74,11 +76,14 @@ libfaac=""      ; [ "${FAAC:-no}" != "no" ]     && \
   { libfaac="--enable-libfaac" ; non_free="--enable-nonfree" ; }
 openjpeg=""     ; [ "${JP2:-no}" != "no" ]      && \
   { openjpeg="--enable-libopenjpeg" ; \
-    SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.4" ; }
+    SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.5" ; }
 
 mp3lame="--enable-libmp3lame" ; [ "${LAME:-yes}" != "yes" ] && mp3lame=""
 libx264="--enable-libx264"    ; [ "${X264:-yes}" != "yes" ] && libx264=""
 
+# opencv support is currently broken: http://code.opencv.org/issues/1925
+#libopencv=""  ; [ "${OPENCV:-no}" != "no" ]       && libopencv="--enable-libopencv"
+
 set -e
 
 rm -rf $PKG
@@ -109,6 +114,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-swscale \
   --enable-x11grab \
   --enable-avfilter \
+  --enable-gnutls \
+  --enable-openssl \
+  --enable-libcdio \
   --arch=$ARCH \
   $openjpeg \
   $libdc1394 \
@@ -124,9 +132,11 @@ CXXFLAGS="$SLKCFLAGS" \
   $libvpx \
   $librtmp \
   $opencore_amr \
-  $libopencv \
   $libfrei0r \
-  $libcelt
+  $libcelt \
+  $libbluray \
+  $libass \
+  $libopenal
 
 make
 make install DESTDIR=$PKG
@@ -138,8 +148,8 @@ 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
-cp -a COPYING* CREDITS INSTALL LICENSE MAINTAINERS README RELEASE \
-  VERSION doc/TODO* doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
+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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-- 
cgit v1.2.3