aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2012-08-19 13:15:52 +0200
committerHeinz Wiesinger <pprkut@slackbuilds.org>2012-08-20 11:17:35 +0200
commit0df7171d9cfca4ffa8a26875915c0e7d1979959a (patch)
tree02adac396a43f8f1745274907175198ac057f623 /multimedia
parentfa6b6880cd0b27773d7fecc62a1c8ab14050c90d (diff)
multimedia/ffmpeg: Updated for version 0.11.1
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/README4
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild24
-rw-r--r--multimedia/ffmpeg/ffmpeg.info8
3 files changed, 24 insertions, 12 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index 082e3c9f4a491..26d6b5dd6ba09 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -4,6 +4,8 @@ library.
You can enable a lot of optional (not-autodetected) features by
passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild):
+ASS=yes|no (default: no), requires libass
+BLURAY=yes|no (default: no), requires libbluray
CELT=yes|no (default: no), requires celt
DC1394=yes|no (default: no), requires libdc1394
DIRAC=yes|no (default: no), requires dirac
@@ -12,7 +14,7 @@ FREI0R=yes|no (default: no), requires frei0r
GSM=yes|no (default: no), requires gsm
JP2=yes|no (default: no), requires openjpeg
LAME=yes|no (default: yes), requires lame
-OPENCV=yes|no (default: no), requires opencv
+OPENAL=yes|no (default: no), requires OpenAL
OPENCORE=yes|no (default: no), requires opencore-amr
RTMP=yes|no (default: no), requires rtmpdump
SCHROEDINGER=yes|no (default: no), requires schroedinger
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index b67c5422c02b3..f64058375f375 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
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
index 15c44f1230469..7e1ff4ced591f 100644
--- a/multimedia/ffmpeg/ffmpeg.info
+++ b/multimedia/ffmpeg/ffmpeg.info
@@ -1,10 +1,10 @@
PRGNAM="ffmpeg"
-VERSION="0.8.7"
+VERSION="0.11.1"
HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.8.7.tar.bz2"
-MD5SUM="31da4d5610d7138761e23fab8fe3a84d"
+DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.11.1.tar.bz2"
+MD5SUM="ff8cb914f657e164dd60ea1008b555a8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="celt dirac faac frei0r gsm lame libdc1394 libvpx opencore-amr opencv openjpeg rtmpdump schroedinger speex x264 xvidcore"
+REQUIRES="lame x264"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"