diff options
| author | Heinz Wiesinger <pprkut@liwjatan.at> | 2010-11-04 03:32:14 +0000 |
|---|---|---|
| committer | Heinz Wiesinger <pprkut@slackbuilds.org> | 2010-11-22 19:44:57 +0100 |
| commit | 10b228b68abec28941936c375bef58885d061010 (patch) | |
| tree | c481f8606200f5da71f044da8af6f239486f3c55 /multimedia/ffmpeg | |
| parent | ca8d5429cd195da54f5464b24c867563d6afd9c1 (diff) | |
multimedia/ffmpeg: Updated for version 0.6.1.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/README | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 23 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.info | 8 |
3 files changed, 12 insertions, 23 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README index 7e500358351d3..279b834360279 100644 --- a/multimedia/ffmpeg/README +++ b/multimedia/ffmpeg/README @@ -19,10 +19,6 @@ VPX=yes|no (default: no), requires libvpx 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. - Make sure to run this script in a real root shell ("su -") and that you have either tetex or texlive installed. diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index fd6d2a64a60a8..8164687adb0ed 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.6} +VERSION=${VERSION:-0.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,6 +38,11 @@ else LIBDIRSUFFIX="" fi +# --enable-runtime-cpu is meant for libswscale only and +# has no influence on the other parts of ffmpeg so there's +# not really a point in bothering +PKGARCH=custom + # 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 :/ @@ -128,14 +133,6 @@ 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 @@ -182,8 +179,7 @@ CXXFLAGS="$SLKCFLAGS" \ $libgsm \ $libvpx \ $librtmp \ - $opencore_amr \ - $doruntime + $opencore_amr make make install DESTDIR=$PKG @@ -191,10 +187,7 @@ 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/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a Changelog* COPYING* CREDITS* INSTALL* MAINTAINERS* \ diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index 7fd345a6bb713..bb5ada4129617 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,10 +1,10 @@ PRGNAM="ffmpeg" -VERSION="0.6" +VERSION="0.6.1" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.6.tar.bz2" -MD5SUM="d6142a9a5821d6a6262a6edb903faa24" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.6.1.tar.bz2" +MD5SUM="4f5d732d25eedfb072251b5314ba2093" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="rworkman" +APPROVED="Michiel van Wessem" |