From 64f5cc8abd713b5e34858fd49ef78fb4218f02a5 Mon Sep 17 00:00:00 2001
From: Katherine Whitlock
Date: Wed, 21 Aug 2013 03:04:24 -0400
Subject: jack: revert to 0.121.3

Jack 1.9.7, 1.9.8, and 1.9.9 all fail to compile for various reasons
relating to clang. Instead, Jack1 v0.121.3 compiles successfully, and
provides the same API.

Closes #22043.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/jack.rb | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/jack.rb b/Library/Formula/jack.rb
index b6ab4cf22..62b35968d 100644
--- a/Library/Formula/jack.rb
+++ b/Library/Formula/jack.rb
@@ -1,27 +1,42 @@
 require 'formula'
 
+# This now builds a version of JACKv1 which matches the current API
+# for JACKv2. JACKv2 is not buildable on a number of Mac OS X
+# distributions, and the JACK team instead suggests installation of
+# JACKOSX, a pre-built binary form for which the source is not available.
+# If you require JACKv2, you should use that. Otherwise, this formula should
+# operate fine.
+# Please see https://github.com/mxcl/homebrew/pull/22043 for more info
 class Jack < Formula
   homepage 'http://jackaudio.org'
-  url 'http://pkgs.fedoraproject.org/repo/pkgs/jack-audio-connection-kit/jack-1.9.7.tar.bz2/9759670feecbd43eeccf1c0f743ec199/jack-1.9.7.tar.bz2'
-  sha1 '0a344fd962666f7c95969da0576ac0228e71b30d'
+  url 'http://jackaudio.org/downloads/jack-audio-connection-kit-0.121.3.tar.gz'
+  sha1 '7d6e2219660222d1512ee704dd88a534b3e3089e'
 
   depends_on 'celt'
+  depends_on 'libsndfile'
   depends_on 'libsamplerate'
 
-  # default build assumes ppc+i386, changed to i386+x86_64
   def patches
-    "https://gist.github.com/raw/636194/a8f5326ea27faed38da6c188045dd166b1eb6af6/jack-1.9.6_homebrew.patch"
-  end
-
-  fails_with :clang do
-    build 425
-    cause 'waf fails to find g++ when compiling with clang'
-  end
+    #Change pThread header include from CarbonCore
+    { :p0 => DATA }
+  end if MacOS.version >= :mountain_lion
 
   def install
     ENV['LINKFLAGS'] = ENV.ldflags
-    system "./waf","configure", "--prefix=#{prefix}"
-    system "./waf","build"
-    system "./waf","install"
+    system "./configure", "--prefix=#{prefix}"
+    system "make","install"
   end
 end
+
+__END__
+--- config/os/macosx/pThreadUtilities.h
++++ config/os/macosx/pThreadUtilities.h
+@@ -66,7 +66,7 @@
+ #define __PTHREADUTILITIES_H__
+ 
+ #import "pthread.h"
+-#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
++#import <MacTypes.h>
+ 
+ #define THREAD_SET_PRIORITY      0
+ #define THREAD_SCHEDULED_PRIORITY    1
-- 
cgit v1.2.3