jack-1.9.7_no_forced_use_of_ncurses.patch

--- a/example-clients/transport.c
+++ b/example-clients/transport.c
@@ -300,11 +300,11 @@
      
 	/* Isolate the command word. */
 	i = 0;
-	while (line[i] && whitespace(line[i]))
+	while (line[i] && isspace(line[i]))
 		i++;
 	word = line + i;
      
-	while (line[i] && !whitespace(line[i]))
+	while (line[i] && !isspace(line[i]))
 		i++;
      
 	if (line[i])
@@ -319,7 +319,7 @@
 	}
      
 	/* Get argument to command, if any. */
-	while (whitespace(line[i]))
+	while (isspace(line[i]))
 		i++;
      
 	word = line + i;
@@ -335,14 +335,14 @@
 	register char *s, *t;
 
 	s = string;
-	while (whitespace(*s))
+	while (isspace(*s))
 		s++;
 
 	if (*s == '\0')
 		return s;
      
 	t = s + strlen (s) - 1;
-	while (t > s && whitespace(*t))
+	while (t > s && isspace(*t))
 		t--;
 	*++t = '\0';
      

jack-1.9.7_no_x86.patch

--- a/common/wscript
+++ b/common/wscript
@@ -30,8 +30,7 @@
     if bld.env['IS_LINUX']:
         process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
     if bld.env['IS_MACOSX']:
-        process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-        #process.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+        process.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
         process.env.append_value("CPPFLAGS", "-fvisibility=hidden")
     process.install_path = '${ADDON_DIR}/'
     process.uselib_local = uselib.name
@@ -165,8 +164,7 @@
 
     if bld.env['IS_MACOSX']:
         serverlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
-        serverlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-        #serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc")
+        serverlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
         serverlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework CoreFoundation -framework vecLib -single_module")
         serverlib.env.append_value("LINKFLAGS", "-compatibility_version 1 -current_version 1")
 
@@ -214,8 +212,7 @@
     
     if bld.env['IS_MACOSX']:
         clientlib.env.append_value("CPPFLAGS", "-fvisibility=hidden")
-        clientlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-        #clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module -arch i386 -arch ppc"
+        clientlib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
         clientlib.env.append_value("LINKFLAGS", "-framework CoreAudio -framework vecLib -single_module")
         clientlib.env.append_value("LINKFLAGS", "-compatibility_version 1 -current_version 1")
 
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -76,8 +76,7 @@
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = example_program_source
         if bld.env['IS_MACOSX']:
-            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-            #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
             prog.env.append_value("LINKFLAGS", "")
         if bld.env['IS_LINUX']:
             prog.uselib = 'RT'
@@ -94,8 +93,7 @@
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = 'transport.c'
         if bld.env['IS_MACOSX']:
-            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-            #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
             prog.env.append_value("LINKFLAGS", "")
         if bld.env['IS_LINUX']:
             prog.uselib = 'RT READLINE NCURSES'
@@ -109,8 +107,7 @@
         prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = 'capture_client.c'
         if bld.env['IS_MACOSX']:
-            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-            #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
             prog.env.append_value("LINKFLAGS", "")
             prog.uselib = 'SNDFILE'
         if bld.env['IS_LINUX']:
@@ -153,8 +150,7 @@
         lib.target = example_lib
         lib.source = example_lib_source
         if bld.env['IS_MACOSX']:
-            lib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-            #lib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+            lib.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
             lib.env.append_value("LINKFLAGS", "")
         if bld.env['IS_SUN']:
 	        lib.env.append_value("LINKFLAGS", "-lm")
--- a/tests/wscript
+++ b/tests/wscript
@@ -27,8 +27,7 @@
         if bld.env['IS_LINUX']:
             prog.uselib = 'RT'
         if bld.env['IS_MACOSX']:
-            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
-            #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
+            prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch ppc")
 	    prog.env.append_value("LINKFLAGS", "")
         prog.uselib_local = 'clientlib'
         prog.target = test_program