Mon Jan 26 11:08:52 2015 UTC ()
Re-work how we handle MacTypes.h.  Older Darwin releases do not ship a copy in
/usr/include, whilst newer Xcode do not ship a copy in the SDK, and 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
as we would normally.  So for now we perform a direct substitution based on
whether /usr/include/MacTypes.h exists.  Cleaner solutions welcome.


(jperkin)
diff -r1.28 -r1.29 pkgsrc/audio/jack/Makefile
diff -r1.13 -r1.14 pkgsrc/audio/jack/distinfo
diff -r1.2 -r0 pkgsrc/audio/jack/patches/patch-config_os_macosx_pThreadUtilities.h
cvs diff -r1.28 -r1.29 pkgsrc/audio/jack/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/jack/Makefile 2014/08/16 21:01:38 1.28
+++ pkgsrc/audio/jack/Makefile 2015/01/26 11:08:52 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2014/08/16 21:01:38 gls Exp $ 1# $NetBSD: Makefile,v 1.29 2015/01/26 11:08:52 jperkin Exp $
2# 2#
3 3
4DISTNAME= jack-audio-connection-kit-${JACK_VERSION} 4DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
5PKGNAME= jack-${JACK_VERSION} 5PKGNAME= jack-${JACK_VERSION}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= audio 7CATEGORIES= audio
8#MASTER_SITES= ${MASTER_SITE_LOCAL} 8#MASTER_SITES= ${MASTER_SITE_LOCAL}
9MASTER_SITES= http://jackaudio.org/downloads/ 9MASTER_SITES= http://jackaudio.org/downloads/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.jackaudio.org/ 12HOMEPAGE= http://www.jackaudio.org/
13COMMENT= JACK audio connection kit 13COMMENT= JACK audio connection kit
14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
@@ -54,26 +54,40 @@ CFLAGS+= -DJACK_HOST_HAS_BSD_POLL @@ -54,26 +54,40 @@ CFLAGS+= -DJACK_HOST_HAS_BSD_POLL
54### 54###
55.if exists(${PREFIX}/emul/linux/proc) && ${OPSYS} != "Linux" 55.if exists(${PREFIX}/emul/linux/proc) && ${OPSYS} != "Linux"
56JACKD_PROCFS_PATH?= ${PREFIX}/emul/linux/proc 56JACKD_PROCFS_PATH?= ${PREFIX}/emul/linux/proc
57.else 57.else
58JACKD_PROCFS_PATH?= /proc 58JACKD_PROCFS_PATH?= /proc
59.endif 59.endif
60 60
61.if exists(/dev/shm) && ${OPSYS} == "Linux" 61.if exists(/dev/shm) && ${OPSYS} == "Linux"
62CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm 62CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm
63.else 63.else
64CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q} 64CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
65.endif 65.endif
66 66
 67#
 68# Older Darwin releases do not ship /usr/include/MacTypes.h, newer ones do
 69# not ship a copy in the SDK, we somehow need to handle both. This package
 70# explicitly passes -mmacosx-version-min=10.4 meaning we cannot test the
 71# __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro. So for now we perform
 72# a direct substitution - cleaner fixes welcome.
 73#
 74.if ${OPSYS} == "Darwin" && exists(/usr/include/MacTypes.h)
 75SUBST_CLASSES+= mactypes
 76SUBST_FILES.mactypes= config/os/macosx/pThreadUtilities.h
 77SUBST_STAGE.mactypes= pre-configure
 78SUBST_SED.mactypes= -e 's,CoreServices.*Headers/,,'
 79.endif
 80
67PLIST_VARS= coreaudio oss sunaudio 81PLIST_VARS= coreaudio oss sunaudio
68### 82###
69### XXX This is untested. Please file a PR and/or commit a fix should 83### XXX This is untested. Please file a PR and/or commit a fix should
70### any problems arise. 84### any problems arise.
71### 85###
72.if ${OPSYS} == "Darwin" 86.if ${OPSYS} == "Darwin"
73CONFIGURE_ARGS+= --enable-coreaudio 87CONFIGURE_ARGS+= --enable-coreaudio
74PLIST.coreaudio= yes 88PLIST.coreaudio= yes
75.endif 89.endif
76### 90###
77### XXX The sun driver is buggy on NetBSD right now. I hope to remedy 91### XXX The sun driver is buggy on NetBSD right now. I hope to remedy
78### this shortly. 92### this shortly.
79### 93###
cvs diff -r1.13 -r1.14 pkgsrc/audio/jack/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/jack/distinfo 2015/01/14 12:10:13 1.13
+++ pkgsrc/audio/jack/distinfo 2015/01/26 11:08:52 1.14
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1$NetBSD: distinfo,v 1.13 2015/01/14 12:10:13 jperkin Exp $ 1$NetBSD: distinfo,v 1.14 2015/01/26 11:08:52 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) = 53187940f17d92f691cb5fed81ed4c6ddd9b01ae 
19SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02 18SHA1 (patch-drivers_netjack_netjack__packet.c) = eb70ec5644e960e0cf0258a15d763be31c11bb02
20SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a 19SHA1 (patch-jack_control.h) = 8d6f07fd226b68cacf170501f557503cd674249a
21SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1 20SHA1 (patch-tools_netsource.c) = 836550efb8c53e7f546c2708f8670496b78daec1
22SHA1 (patch-tools_session__notify.c) = 6ab077be462993a054289803ffc3e8a6654c533e 21SHA1 (patch-tools_session__notify.c) = 6ab077be462993a054289803ffc3e8a6654c533e
File Deleted: pkgsrc/audio/jack/patches/Attic/patch-config_os_macosx_pThreadUtilities.h