diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/README | 13 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 63 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.info | 8 |
3 files changed, 43 insertions, 41 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README index ffeb38e25834b..7e500358351d3 100644 --- a/multimedia/ffmpeg/README +++ b/multimedia/ffmpeg/README @@ -4,18 +4,18 @@ library. You can enable a lot of optional (not-autodetected) features by passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild): -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 (creates non-redistributable binary) -FAAD=yes|no (default: yes), requires faad2 +FAAC=yes|no (default: no), requires faac (creates non-redistributable binary) +FAAD=yes|no (default: no), requires faad2 +GSM=yes|no (default: no), requires gsm JP2=yes|no (default: no), requires openjpeg LAME=yes|no (default: yes), requires lame OPENCORE=yes|no (default: no), requires opencore-amr +RTMP=yes|no (default: no), requires rtmpdump SCHROEDINGER=yes|no (default: no), requires schroedinger SPEEX=yes|no (default: no), requires speex -VDPAU=yes|no (default: no), requires libvdpau and vdpau capable gpu +VPX=yes|no (default: no), requires libvpx X264=yes|no (default: yes), requires x264 XVID=yes|no (default: no), requires xvidcore @@ -23,4 +23,7 @@ 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. + All of the mentioned requirements are available from SlackBuilds.org diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index df43bc8c32941..fd6d2a64a60a8 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.2} +VERSION=${VERSION:-0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,26 +42,6 @@ fi # 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="" -else - non_free="--enable-nonfree" - amr_nb="--enable-libamr-nb" -fi - -if [ "${AMRWB:-no}" = "no" ]; then - amr_wb="" -else - non_free="--enable-nonfree" - 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 @@ -74,17 +54,23 @@ else dirac_slow="--enable-libdirac" fi -if [ "${FAAC:-yes}" = "yes" ]; then +if [ "${FAAC:-no}" = "no" ]; then + libfaac="" +else libfaac="--enable-libfaac" non_free="--enable-nonfree" -else - libfaac="" fi -if [ "${FAAD:-yes}" = "yes" ]; then +if [ "${FAAD:-no}" = "no" ]; then + libfaad="" +else libfaad="--enable-libfaad" +fi + +if [ "${GSM:-no}" = "no" ]; then + libgsm="" else - libfaad="" + libgsm="--enable-libgsm" fi if [ "${LAME:-yes}" = "yes" ]; then @@ -100,6 +86,18 @@ else SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg" fi +if [ "${OPENCORE:-no}" = "no" ]; then + opencore_amr="" +else + opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb" +fi + +if [ "${RTMP:-no}" = "no" ]; then + librtmp="" +else + librtmp="--enable-librtmp" +fi + if [ "${SCHROEDINGER:-no}" = "no" ]; then dirac_fast="" else @@ -112,10 +110,10 @@ else libspeex="--enable-libspeex" fi -if [ "${VDPAU:-no}" = "no" ]; then - vdpau_opt="--disable-vdpau" +if [ "${VPX:-no}" = "no" ]; then + libvpx="" else - vdpau_opt="--enable-vdpau" + libvpx="--enable-libvpx" fi if [ "${X264:-yes}" = "yes" ]; then @@ -161,6 +159,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-pthreads \ --enable-libtheora \ + --enable-libvorbis \ --enable-gpl \ --enable-version3 \ --enable-postproc \ @@ -179,10 +178,10 @@ CXXFLAGS="$SLKCFLAGS" \ $libspeex \ $dirac_slow \ $dirac_fast \ - $vdpau_opt \ $non_free \ - $amr_nb \ - $amr_wb \ + $libgsm \ + $libvpx \ + $librtmp \ $opencore_amr \ $doruntime diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index 2be05aecbbb26..7fd345a6bb713 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,10 +1,10 @@ PRGNAM="ffmpeg" -VERSION="0.5.2" +VERSION="0.6" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.5.2.tar.bz2" -MD5SUM="451eb428ca97a72c00555d50944cdb24" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.6.tar.bz2" +MD5SUM="d6142a9a5821d6a6262a6edb903faa24" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="Erik Hanson" +APPROVED="rworkman" |