diff options
| author | David Backeus | 2010-11-18 12:13:05 +0100 |
|---|---|---|
| committer | Adam Vandenberg | 2010-11-18 20:37:30 -0800 |
| commit | bc21a8adb34c0e12b008fef4761d922d6cce838b (patch) | |
| tree | 2e533988dfe8b5fd10ea65bd6b32af2c2b66557d /Library | |
| parent | 85ceebc6b78ee7fd09e5cd9e0ea8e9286a88a86b (diff) | |
| download | homebrew-bc21a8adb34c0e12b008fef4761d922d6cce838b.tar.bz2 | |
Updated FFMPEG to 0.6.1.
Skip --enable-libfaad flag if installing from head as it is no
longer availible.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/ffmpeg.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index bce81a6c9..102e7b959 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -1,9 +1,9 @@ require 'formula' class Ffmpeg <Formula - url 'http://ffmpeg.org/releases/ffmpeg-0.6.tar.bz2' + url 'http://ffmpeg.org/releases/ffmpeg-0.6.1.tar.bz2' homepage 'http://ffmpeg.org/' - sha1 'c130e3bc368251b9130ce6eafb44fe8c3993ff5c' + sha1 '24ada1d35fc000980090e773101e101ca45f85e5' head 'svn://svn.ffmpeg.org/ffmpeg/trunk' @@ -28,13 +28,16 @@ class Ffmpeg <Formula args << "--enable-libx264" if Formula.factory('x264').installed? args << "--enable-libfaac" if Formula.factory('faac').installed? - args << "--enable-libfaad" if Formula.factory('faad2').installed? args << "--enable-libmp3lame" if Formula.factory('lame').installed? args << "--enable-libtheora" if Formula.factory('theora').installed? args << "--enable-libvorbis" if Formula.factory('libvorbis').installed? args << "--enable-libvpx" if Formula.factory('libvpx').installed? args << "--enable-libxvid" if Formula.factory('xvid').installed? + unless ARGV.build_head? + args << "--enable-libfaad" if Formula.factory('faad2').installed? + end + # For 32-bit compilation under gcc 4.2, see: # http://trac.macports.org/ticket/20938#comment:22 if MACOS_VERSION >= 10.6 and Hardware.is_32_bit? |