diff options
-rw-r--r-- | audio/jack/distinfo | 4 | ||||
-rw-r--r-- | audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/audio/jack/distinfo b/audio/jack/distinfo index d52b0a82870..a162cc9d81e 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2014/08/16 21:01:38 gls Exp $ +$NetBSD: distinfo,v 1.13 2015/01/14 12:10:13 jperkin Exp $ SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705 @@ -15,7 +15,7 @@ SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859 SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916 SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77 -SHA1 (patch-config_os_macosx_pThreadUtilities.h) = ec92c3ad876d4f5ab75ed5497649b14671d972c1 +SHA1 (patch-config_os_macosx_pThreadUtilities.h) = 53187940f17d92f691cb5fed81ed4c6ddd9b01ae SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02 SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1 diff --git a/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h b/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h index fcb778e34fa..e32ebb1ea37 100644 --- a/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h +++ b/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h @@ -1,15 +1,19 @@ -$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.1 2014/08/16 21:01:38 gls Exp $ +$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.2 2015/01/14 12:10:13 jperkin Exp $ -Fix build on Mac OS X +Fix build on Mac OS X. "1070" isn't necessarily the correct version to test +against, but at least this fixes 1068. --- config/os/macosx/pThreadUtilities.h.orig 2008-05-29 12:26:05.000000000 +0000 +++ config/os/macosx/pThreadUtilities.h -@@ -66,7 +66,7 @@ +@@ -66,7 +66,11 @@ #define __PTHREADUTILITIES_H__ #import "pthread.h" --#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> ++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070 + #import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> ++#else +#import <MacTypes.h> ++#endif #define THREAD_SET_PRIORITY 0 #define THREAD_SCHEDULED_PRIORITY 1 |