Wed Jan 14 12:10:14 2015 UTC ()
Fix build on Snow Leopard which requires the older header location.


(jperkin)
diff -r1.12 -r1.13 pkgsrc/audio/jack/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h
cvs diff -r1.12 -r1.13 pkgsrc/audio/jack/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/jack/distinfo 2014/08/16 21:01:38 1.12
+++ pkgsrc/audio/jack/distinfo 2015/01/14 12:10:13 1.13
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.12 2014/08/16 21:01:38 gls Exp $ 1$NetBSD: distinfo,v 1.13 2015/01/14 12:10:13 jperkin Exp $
2 2
3SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e 3SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e
4RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705 4RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705
5Size (jack-audio-connection-kit-0.121.3.tar.gz) = 1083545 bytes 5Size (jack-audio-connection-kit-0.121.3.tar.gz) = 1083545 bytes
6SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e 6SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e
7SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a 7SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a
8SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20 8SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
9SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e 9SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
10SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488 10SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488
11SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07 11SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07
12SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63 12SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
13SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b 13SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
14SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f 14SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f
15SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859 15SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859
16SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916 16SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
17SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77 17SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
18SHA1 (patch-config_os_macosx_pThreadUtilities.h) = ec92c3ad876d4f5ab75ed5497649b14671d972c1 18SHA1 (patch-config_os_macosx_pThreadUtilities.h) = 53187940f17d92f691cb5fed81ed4c6ddd9b01ae
19SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02 19SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02
20SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a 20SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a
21SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1 21SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1
22SHA1 (patch-tools_session__notify.c) = 6ab077be462993a054289803ffc3e8a6654c533e 22SHA1 (patch-tools_session__notify.c) = 6ab077be462993a054289803ffc3e8a6654c533e
cvs diff -r1.1 -r1.2 pkgsrc/audio/jack/patches/Attic/patch-config_os_macosx_pThreadUtilities.h (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/Attic/patch-config_os_macosx_pThreadUtilities.h 2014/08/16 21:01:38 1.1
+++ pkgsrc/audio/jack/patches/Attic/patch-config_os_macosx_pThreadUtilities.h 2015/01/14 12:10:13 1.2
@@ -1,15 +1,19 @@ @@ -1,15 +1,19 @@
1$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.1 2014/08/16 21:01:38 gls Exp $ 1$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.2 2015/01/14 12:10:13 jperkin Exp $
2 2
3Fix build on Mac OS X 3Fix build on Mac OS X. "1070" isn't necessarily the correct version to test
 4against, but at least this fixes 1068.
4 5
5--- config/os/macosx/pThreadUtilities.h.orig 2008-05-29 12:26:05.000000000 +0000 6--- config/os/macosx/pThreadUtilities.h.orig 2008-05-29 12:26:05.000000000 +0000
6+++ config/os/macosx/pThreadUtilities.h 7+++ config/os/macosx/pThreadUtilities.h
7@@ -66,7 +66,7 @@ 8@@ -66,7 +66,11 @@
8 #define __PTHREADUTILITIES_H__ 9 #define __PTHREADUTILITIES_H__
9  10
10 #import "pthread.h" 11 #import "pthread.h"
11-#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> 12+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
 13 #import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
 14+#else
12+#import <MacTypes.h> 15+#import <MacTypes.h>
 16+#endif
13  17
14 #define THREAD_SET_PRIORITY 0 18 #define THREAD_SET_PRIORITY 0
15 #define THREAD_SCHEDULED_PRIORITY 1 19 #define THREAD_SCHEDULED_PRIORITY 1