From 7470a0bf8b40fbb090d87eac618977c252f107c9 Mon Sep 17 00:00:00 2001 From: dbj Date: Tue, 27 Jan 2015 04:37:53 +0000 Subject: avoid hard coding paths to header files on Darwin use Carbon/Carbon.h instead of MacTypes.h, which has problems on older systems --- audio/jack/Makefile | 16 +--------------- audio/jack/distinfo | 4 +++- .../patches/patch-config_os_macosx_pThreadUtilities.h | 15 +++++++++++++++ audio/jack/patches/patch-drivers_coreaudio_Makefile.in | 15 +++++++++++++++ 4 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h create mode 100644 audio/jack/patches/patch-drivers_coreaudio_Makefile.in (limited to 'audio') diff --git a/audio/jack/Makefile b/audio/jack/Makefile index b447955c63f..9dd820e6c72 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2015/01/26 11:08:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.30 2015/01/27 04:37:53 dbj Exp $ # DISTNAME= jack-audio-connection-kit-${JACK_VERSION} @@ -64,20 +64,6 @@ CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q} .endif -# -# Older Darwin releases do not ship /usr/include/MacTypes.h, newer ones do -# not ship a copy in the SDK, we somehow need to handle both. This package -# explicitly passes -mmacosx-version-min=10.4 meaning we cannot test the -# __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro. So for now we perform -# a direct substitution - cleaner fixes welcome. -# -.if ${OPSYS} == "Darwin" && exists(/usr/include/MacTypes.h) -SUBST_CLASSES+= mactypes -SUBST_FILES.mactypes= config/os/macosx/pThreadUtilities.h -SUBST_STAGE.mactypes= pre-configure -SUBST_SED.mactypes= -e 's,CoreServices.*Headers/,,' -.endif - PLIST_VARS= coreaudio oss sunaudio ### ### XXX This is untested. Please file a PR and/or commit a fix should diff --git a/audio/jack/distinfo b/audio/jack/distinfo index 937227293a8..f65fb1a82c7 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2015/01/26 11:08:52 jperkin Exp $ +$NetBSD: distinfo,v 1.15 2015/01/27 04:37:53 dbj Exp $ SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705 @@ -15,6 +15,8 @@ SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859 SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916 SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77 +SHA1 (patch-config_os_macosx_pThreadUtilities.h) = 7df929e00bac3612ceb5685d297dd998155b9dd1 +SHA1 (patch-drivers_coreaudio_Makefile.in) = 13f5e5914ae0304c93dca54518fecb19f5ecdec5 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 new file mode 100644 index 00000000000..0da12220530 --- /dev/null +++ b/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h @@ -0,0 +1,15 @@ +$NetBSD: patch-config_os_macosx_pThreadUtilities.h,v 1.4 2015/01/27 04:37:53 dbj Exp $ + +Fix build on Mac OS X + +--- config/os/macosx/pThreadUtilities.h.orig 2008-05-29 12:26:05.000000000 +0000 ++++ config/os/macosx/pThreadUtilities.h +@@ -66,7 +66,7 @@ + #define __PTHREADUTILITIES_H__ + + #import "pthread.h" +-#import ++#import // Really only need , but that has problems on 10.6 + + #define THREAD_SET_PRIORITY 0 + #define THREAD_SCHEDULED_PRIORITY 1 diff --git a/audio/jack/patches/patch-drivers_coreaudio_Makefile.in b/audio/jack/patches/patch-drivers_coreaudio_Makefile.in new file mode 100644 index 00000000000..aab4817d757 --- /dev/null +++ b/audio/jack/patches/patch-drivers_coreaudio_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-drivers_coreaudio_Makefile.in,v 1.1 2015/01/27 04:37:53 dbj Exp $ + +Avoid hard coding header path on Darwin + +--- drivers/coreaudio/Makefile.in.orig 2011-09-28 13:10:12.000000000 +0000 ++++ drivers/coreaudio/Makefile.in +@@ -249,7 +249,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + MAINTAINERCLEANFILES = Makefile.in +-AM_CFLAGS = $(JACK_CFLAGS) -include /System/Library/Frameworks/Carbon.framework/Headers/Carbon.h ++AM_CFLAGS = $(JACK_CFLAGS) -framework Carbon -include Carbon/Carbon.h + plugindir = $(ADDON_DIR) + plugin_LTLIBRARIES = jack_coreaudio.la + jack_coreaudio_la_LDFLAGS = -module -avoid-version @OS_LDFLAGS@ -- cgit v1.2.3