diff options
| author |   Heinz Wiesinger <pprkut@liwjatan.at> | 2010-06-28 19:42:39 -0500 |
|---|---|---|
| committer |   Erik Hanson <erik@slackbuilds.org> | 2010-06-29 00:36:36 -0500 |
| commit | 788d7634a9476ab3b05fda8115f6be969221c3fa (patch) | |
| tree | ddca4aafd4581eb21b4705adbf0f2358855c9050 /multimedia/ffmpeg/ffmpeg.SlackBuild | |
| parent | f8c9f19cb27bb41ef8c0003a08cd2321a561b9c0 (diff) | |
| download | slackbuilds-788d7634a9476ab3b05fda8115f6be969221c3fa.tar.gz slackbuilds-788d7634a9476ab3b05fda8115f6be969221c3fa.tar.xz | |
multimedia/ffmpeg: Updated for version 0.6.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia/ffmpeg/ffmpeg.SlackBuild')
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index df43bc8c32..fd6d2a64a6 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 |