[Lunar-commits] <moonbase> ffmpeg-svn: tweak BUILD, fix depends, add options

[Zachary McGrew]

commit 5b230e4043b12386ccea4d1b914d790c2e1fd51b
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Thu Oct 16 17:41:55 2008 -0700

    ffmpeg-svn: tweak BUILD, fix depends, add options
    
    Now correctly compiles (some configure options changed)
    
    Removed optional depends as liba52 support has been dropped in favor of their own decoder, which has more features
    
    Added new option to enable non free code (for reverse engineered formats), which makes it much more fun. =)
---
 zbeta/ffmpeg-svn/BUILD     |   17 ++++++-----------
 zbeta/ffmpeg-svn/CONFIGURE |    1 +
 zbeta/ffmpeg-svn/DEPENDS   |    1 -
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/zbeta/ffmpeg-svn/BUILD b/zbeta/ffmpeg-svn/BUILD
index f6bb778..342e833 100644
--- a/zbeta/ffmpeg-svn/BUILD
+++ b/zbeta/ffmpeg-svn/BUILD
@@ -1,15 +1,10 @@
 (
 
-# This fixes build break on my machine
-CFLAGS="${CFLAGS//-fforce-addr/}"
-  ./configure --prefix=/usr      \
-              --enable-gpl       \
-              --enable-shared    \
-              --enable-swscaler  \
-              --enable-pp        \
-              --enable-pthreads  \
-              $OPTS              &&
-
-  default_make
+  OPTS+=" --enable-gpl --enable-shared --enable-pthreads \
+          --enable-postproc --enable-swscale"
+
+  [ -n $CPU ] && OPTS+="$OPTS --cpu=$CPU"
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/ffmpeg-svn/CONFIGURE b/zbeta/ffmpeg-svn/CONFIGURE
new file mode 100644
index 0000000..ea3b8b1
--- /dev/null
+++ b/zbeta/ffmpeg-svn/CONFIGURE
@@ -0,0 +1 @@
+mquery NONFREE "Compile non-free codecs?" y --enable-nonfree --disable-nonfree
diff --git a/zbeta/ffmpeg-svn/DEPENDS b/zbeta/ffmpeg-svn/DEPENDS
index 5aa70b9..c74eb74 100644
--- a/zbeta/ffmpeg-svn/DEPENDS
+++ b/zbeta/ffmpeg-svn/DEPENDS
@@ -3,7 +3,6 @@ optional_depends libtheora  "--enable-libtheora"  ""  "for theora support"
 optional_depends faad       "--enable-libfaad"    ""  "for faad support"
 optional_depends faac       "--enable-libfaac"    ""  "for faac support"
 optional_depends lame       "--enable-libmp3lame" ""  "for mp3 support"
-optional_depends a52dec     "--enable-liba52"     ""  "for a52 support"
 optional_depends xvidcore   "--enable-libxvid"    ""  "for xvid support"
 optional_depends libdc1394  "--enable-libdc1394"  ""  "for firewire support"
 optional_depends x264-git   "--enable-libx264"    ""  "for H264 support"