libusb

Ditch libusb-0.1.x and replace with lib-1.0.6 along with the
libusb-compat-0.1.3 compatibility wrapper

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

Also update sane-backends to use compat. library.

3 files changed, 26 insertions, 14 deletions

diff --git a/Library/Formula/libusb-compat.rb b/Library/Formula/libusb-compat.rb
new file mode 100644
index 000000000..9a0d56b70
--- /dev/null
+++ b/Library/Formula/libusb-compat.rb
@@ -0,0 +1,15 @@
+require 'formula'
+
+class LibusbCompat <Formula
+  url 'http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-0.1.3/libusb-compat-0.1.3.tar.bz2'
+  homepage 'http://libusb.sourceforge.net'
+  md5 '570ac2ea085b80d1f74ddc7c6a93c0eb'
+
+  depends_on 'pkg-config'
+  depends_on 'libusb'
+
+  def install
+    system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
+    system "make install"
+  end
+end
diff --git a/Library/Formula/libusb.rb b/Library/Formula/libusb.rb
index c147e096d..a9134d0b5 100644
--- a/Library/Formula/libusb.rb
+++ b/Library/Formula/libusb.rb
@@ -1,12 +1,12 @@
 require 'formula'
 
 class Libusb <Formula
-  url 'http://downloads.sourceforge.net/project/libusb/libusb-0.1%20%28LEGACY%29/0.1.12/libusb-0.1.12.tar.gz'
+  url 'http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.6/libusb-1.0.6.tar.bz2'
   homepage 'http://libusb.sourceforge.net'
-  md5 'caf182cbc7565dac0fd72155919672e6'
+  md5 '818c7c02112a53e0c182666ee83f2057'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"
   end
 end
diff --git a/Library/Formula/sane-backends.rb b/Library/Formula/sane-backends.rb
index 438130bdb..573cec2ba 100644
--- a/Library/Formula/sane-backends.rb
+++ b/Library/Formula/sane-backends.rb
@@ -7,19 +7,16 @@ class SaneBackends <Formula
 
   depends_on 'jpeg'
   depends_on 'libtiff'
-  depends_on 'libusb'
+  depends_on 'libusb-compat'
 
   def install
-      configure_args = [
-          "--prefix=#{prefix}",
-          "--disable-debug",
-          "--disable-dependency-tracking",
-          "--without-gphoto2",
-          "--enable-local-backends",
-          "--enable-libusb",
-          "--disable-latex",
-      ]
-    system "./configure", *configure_args
+    system "./configure", "--disable-dependency-tracking",
+                          "--disable-debug",
+                          "--prefix=#{prefix}",
+                          "--without-gphoto2",
+                          "--enable-local-backends",
+                          "--enable-libusb",
+                          "--disable-latex"
     system "make"
     system "make install"
   end