From cbf3bddd99dbe1b68dc66cb5e8f777905ed465bf Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Sat, 14 Aug 2010 10:05:39 -0700
Subject: ffmpeg won't compile when jack is installed

---
 Library/Formula/ffmpeg.rb | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 2e0089e7f..bc038c7ce 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -20,21 +20,20 @@ class Ffmpeg <Formula
   depends_on 'libogg' => :optional
 
   def install
-    configure_flags = [
-      "--prefix=#{prefix}",
-      "--disable-debug",
-      "--enable-shared",
-      "--enable-pthreads",
-      "--enable-nonfree",
-      "--enable-gpl"
-    ]
-
-    configure_flags << "--enable-libx264" if Formula.factory('x264').installed?
-    configure_flags << "--enable-libfaac" if Formula.factory('faac').installed?
-    configure_flags << "--enable-libfaad" if Formula.factory('faad2').installed?
-    configure_flags << "--enable-libmp3lame" if Formula.factory('lame').installed?
-    configure_flags << "--enable-libtheora" if Formula.factory('theora').installed?
-    configure_flags << "--enable-libvorbis" if Formula.factory('libvorbis').installed?
+    args = ["--disable-debug",
+            "--prefix=#{prefix}",
+            "--enable-shared",
+            "--enable-pthreads",
+            "--enable-nonfree",
+            "--enable-gpl",
+            "--disable-indev=jack" ]
+
+    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?
 
     # For 32-bit compilation under gcc 4.2, see:
     # http://trac.macports.org/ticket/20938#comment:22
@@ -42,7 +41,7 @@ class Ffmpeg <Formula
       ENV.append_to_cflags "-mdynamic-no-pic"
     end
 
-    system "./configure", *configure_flags
+    system "./configure", *args
 
     inreplace 'config.mak' do |s|
       if MACOS_VERSION >= 10.6 and Hardware.is_64_bit?
-- 
cgit v1.2.3