summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@liwjatan.at>2010-04-18 10:36:44 -0500
committerErik Hanson <erik@slackbuilds.org>2010-05-15 10:38:24 +0200
commita34d866caefe789a75804e432a41947670c49857 (patch)
tree2f2a9dad01c94182f1dd6521990023958647fec6
parent36e9952075e96f9bd717e07ad3add09767ba4469 (diff)
downloadslackbuilds-a34d866caefe789a75804e432a41947670c49857.tar.gz
multimedia/ffmpeg: Updated for version 0.5.1.
-rw-r--r--multimedia/ffmpeg/README11
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild35
-rw-r--r--multimedia/ffmpeg/ffmpeg.info10
3 files changed, 39 insertions, 17 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index 7ad186aaa1..ffeb38e258 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -8,14 +8,19 @@ AMRNB=yes|no (default: no), requires amrnb (creates non-redistributable binary)
AMRWB=yes|no (default: no), requires amrwb (creates non-redistributable binary)
DC1394=yes|no (default: no), requires libdc1394
DIRAC=yes|no (default: no), requires dirac
-FAAC=yes|no (default: yes), requires faac
+FAAC=yes|no (default: yes), requires faac (creates non-redistributable binary)
FAAD=yes|no (default: yes), requires faad2
-LAME=yes|no (default: yes), requires lame
JP2=yes|no (default: no), requires openjpeg
+LAME=yes|no (default: yes), requires lame
+OPENCORE=yes|no (default: no), requires opencore-amr
SCHROEDINGER=yes|no (default: no), requires schroedinger
SPEEX=yes|no (default: no), requires speex
-VDPAU=yes|no (default: no), requires nvidia-driver and vdpau capable gpu
+VDPAU=yes|no (default: no), requires libvdpau and vdpau capable gpu
X264=yes|no (default: yes), requires x264
XVID=yes|no (default: no), requires xvidcore
+ffmpeg is built with runtime cpu detection by default, which might
+have a quite big impact on performance. You can turn it off by passing
+RUNTIME=no to the script, but this creates a non-portable binary.
+
All of the mentioned requirements are available from SlackBuilds.org
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 9970c5b7f7..a2b5ea7d7d 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.5}
+VERSION=${VERSION:-0.5.1}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -29,6 +29,8 @@ elif [ "$ARCH" = "x86_64" ]; then
fi
# Configure ffmpeg features not autodetected by default
+# Unfortunately ffmpeg's configure doesn't support --enable-feature=yes
+# syntax, so we have to do it the complicated way :/
if [ "${AMRNB:-no}" = "no" ]; then
amr_nb=""
@@ -44,6 +46,12 @@ else
amr_wb="--enable-libamr-wb"
fi
+if [ "${OPENCORE:-no}" = "no" ]; then
+ opencore_amr=""
+else
+ opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
+fi
+
if [ "${DC1394:-no}" = "no" ]; then
libdc1394=""
else
@@ -58,6 +66,7 @@ fi
if [ "${FAAC:-yes}" = "yes" ]; then
libfaac="--enable-libfaac"
+ non_free="--enable-nonfree"
else
libfaac=""
fi
@@ -111,6 +120,14 @@ else
libxvid="--enable-libxvid"
fi
+if [ "${RUNTIME:-yes}" = "yes" ]; then
+ doruntime="--enable-runtime-cpudetect"
+ PKGARCH=$ARCH
+else
+ doruntime=""
+ PKGARCH="custom"
+fi
+
set -e
rm -rf $PKG
@@ -135,11 +152,13 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-pthreads \
--enable-libtheora \
--enable-gpl \
+ --enable-version3 \
--enable-postproc \
--enable-swscale \
--enable-x11grab \
--enable-avfilter \
--enable-avfilter-lavf \
+ --arch=$ARCH \
$openjpeg \
$libdc1394 \
$mp3lame \
@@ -153,17 +172,15 @@ CXXFLAGS="$SLKCFLAGS" \
$vdpau_opt \
$non_free \
$amr_nb \
- $amr_wb
+ $amr_wb \
+ $opencore_amr \
+ $doruntime
make
make install DESTDIR=$PKG
-( 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
-)
+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/usr/man
find . -type f -exec gzip -9 {} \;
@@ -179,4 +196,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info
index 85f64f81da..9959a8a4e5 100644
--- a/multimedia/ffmpeg/ffmpeg.info
+++ b/multimedia/ffmpeg/ffmpeg.info
@@ -1,10 +1,10 @@
PRGNAM="ffmpeg"
-VERSION="0.5"
+VERSION="0.5.1"
HOMEPAGE="http://www.ffmpeg.org"
-DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.5.tar.bz2"
+DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.5.1.tar.bz2"
+MD5SUM="c7b0e1729f7aafb10496d79bb963bb26"
DOWNLOAD_x86_64=""
-MD5SUM="be8503f15c3b81ba00eb8379ca8dcf33"
MD5SUM_x86_64=""
-MAINTAINER="pprkut"
+MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"