libdc1394 2.2.0

Upgrade libdc1394 to version 2.2.0.
Add a dep on x11 so that it links against XQuartz if present.
Disable the examples and sdltest.  They cause build errors trying
to find OpenGl.
Move the `def patches` block to before `def install`.
Tested on Lion with clang and llvm from XCode-4.3.3.

Closes #13406.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>

1 files changed, 11 insertions, 8 deletions

diff --git a/Library/Formula/libdc1394.rb b/Library/Formula/libdc1394.rb
index cecf80524..0776f40dc 100644
--- a/Library/Formula/libdc1394.rb
+++ b/Library/Formula/libdc1394.rb
@@ -1,18 +1,13 @@
 require 'formula'
 
 class Libdc1394 < Formula
-  url 'http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/2.1.4/libdc1394-2.1.4.tar.gz'
   homepage 'http://damien.douxchamps.net/ieee1394/libdc1394/'
-  md5 'a9c5306dfc17917872513355f87e8412'
+  url 'http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/2.2.0/libdc1394-2.2.0.tar.gz'
+  sha1 '7e831258a65e7e111a9d52d8062aec6d28a1e4c4'
 
   depends_on 'pkg-config' => :build
   depends_on 'libusb'
-
-  def install
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
-    system "make install"
-  end
+  depends_on :x11
 
   def patches
     # fix issue due to bug in OSX Firewire stack
@@ -20,6 +15,14 @@ class Libdc1394 < Formula
     # http://permalink.gmane.org/gmane.comp.multimedia.libdc1394.devel/517
     DATA
   end
+
+  def install
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-examples",
+                          "--disable-sdltest"
+    system "make install"
+  end
 end