Sun Nov 16 11:55:19 2008 UTC ()
If we're using dynamic SIMD detection, we _do not_ want to build
with -msse et. al.

s/HOST_HAS_BSD_POLL/JACK_&/


(bjs)
diff -r1.12 -r1.13 pkgsrc/audio/jack/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/jack/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-ai
diff -r1.2 -r1.3 pkgsrc/audio/jack/patches/patch-aj
cvs diff -r1.12 -r1.13 pkgsrc/audio/jack/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/jack/Makefile 2008/11/16 11:22:55 1.12
+++ pkgsrc/audio/jack/Makefile 2008/11/16 11:55:19 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2008/11/16 11:22:55 bjs Exp $ 1# $NetBSD: Makefile,v 1.13 2008/11/16 11:55:19 bjs 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}
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10JACK_VERSION= 0.115.1 10JACK_VERSION= 0.115.1
11 11
12MAINTAINER= bjs@NetBSD.org 12MAINTAINER= bjs@NetBSD.org
13HOMEPAGE= http://www.jackaudio.org/ 13HOMEPAGE= http://www.jackaudio.org/
14COMMENT= JACK audio connection kit 14COMMENT= JACK audio connection kit
@@ -33,27 +33,27 @@ CONFIGURE_ARGS+= --disable-firewire @@ -33,27 +33,27 @@ CONFIGURE_ARGS+= --disable-firewire
33CONFIGURE_ARGS+= --disable-optimize 33CONFIGURE_ARGS+= --disable-optimize
34CONFIGURE_ARGS+= --enable-resize 34CONFIGURE_ARGS+= --enable-resize
35CONFIGURE_ARGS+= --enable-timestamps 35CONFIGURE_ARGS+= --enable-timestamps
36 36
37CFLAGS.NetBSD+= -D_NETBSD_SOURCE 37CFLAGS.NetBSD+= -D_NETBSD_SOURCE
38 38
39CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes 39CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes
40 40
41JACKD_DEFAULT_TMPDIR?= /tmp 41JACKD_DEFAULT_TMPDIR?= /tmp
42 42
43.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
44 44
45.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" 45.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
46CFLAGS+= -DHOST_HAS_BSD_POLL 46CFLAGS+= -DJACK_HOST_HAS_BSD_POLL
47.endif 47.endif
48### 48###
49### XXX Is there a way to properly use the emulation framework 49### XXX Is there a way to properly use the emulation framework
50### for this? 50### for this?
51### 51###
52.if exists(${PREFIX}/emul/linux/proc) && ${OPSYS} != "Linux" 52.if exists(${PREFIX}/emul/linux/proc) && ${OPSYS} != "Linux"
53JACKD_PROCFS_PATH?= ${PREFIX}/emul/linux/proc 53JACKD_PROCFS_PATH?= ${PREFIX}/emul/linux/proc
54.else 54.else
55JACKD_PROCFS_PATH?= /proc 55JACKD_PROCFS_PATH?= /proc
56.endif 56.endif
57 57
58.if exists(/dev/shm) && ${OPSYS} == "Linux" 58.if exists(/dev/shm) && ${OPSYS} == "Linux"
59CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm 59CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm
cvs diff -r1.7 -r1.8 pkgsrc/audio/jack/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/jack/distinfo 2008/11/16 11:41:28 1.7
+++ pkgsrc/audio/jack/distinfo 2008/11/16 11:55:19 1.8
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.7 2008/11/16 11:41:28 bjs Exp $ 1$NetBSD: distinfo,v 1.8 2008/11/16 11:55:19 bjs Exp $
2 2
3SHA1 (jack-audio-connection-kit-0.115.1.tar.bz2) = 13c07dd4c9bc53475084f8e7a9c5bd9791f76838 3SHA1 (jack-audio-connection-kit-0.115.1.tar.bz2) = 13c07dd4c9bc53475084f8e7a9c5bd9791f76838
4RMD160 (jack-audio-connection-kit-0.115.1.tar.bz2) = fa4e0eace1a21cdfb29b2fe32b38a0c12b98434a 4RMD160 (jack-audio-connection-kit-0.115.1.tar.bz2) = fa4e0eace1a21cdfb29b2fe32b38a0c12b98434a
5Size (jack-audio-connection-kit-0.115.1.tar.bz2) = 606162 bytes 5Size (jack-audio-connection-kit-0.115.1.tar.bz2) = 606162 bytes
6SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e 6SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e
7SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a 7SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a
8SHA1 (patch-ac) = b7d6a3bdb890afa99a1849a4db694df509c9e19a 8SHA1 (patch-ac) = b7d6a3bdb890afa99a1849a4db694df509c9e19a
9SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20 9SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
10SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e 10SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
11SHA1 (patch-ag) = 2d64e9b454ed813308b58f888045f955d8df9d58 11SHA1 (patch-ag) = 2d64e9b454ed813308b58f888045f955d8df9d58
12SHA1 (patch-ah) = cbc69bad1548f4dc67a4fa4d81e2b6448964321a 12SHA1 (patch-ah) = cbc69bad1548f4dc67a4fa4d81e2b6448964321a
13SHA1 (patch-ai) = 54dcc152ecf202e99eba71cad394a9a8c431d9e4 13SHA1 (patch-ai) = 6ba07c9c4a3997bc7b121f60d79a997d0b9fe646
14SHA1 (patch-aj) = f0c1fb6681b04f56566b56846fa2c381cbd1d4e1 14SHA1 (patch-aj) = 9fc6492b6aa28d9b61b7abeced22af9ad90850dc
15SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63 15SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
16SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356 16SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356
17SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b 17SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
18SHA1 (patch-ap) = 60738eae086bdab7aa1986889da95621353f7aa6 18SHA1 (patch-ap) = 60738eae086bdab7aa1986889da95621353f7aa6
19SHA1 (patch-aq) = 212441bb56a4cf33a213bb299f42e7dbcbc33274 19SHA1 (patch-aq) = 212441bb56a4cf33a213bb299f42e7dbcbc33274
20SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916 20SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
21SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77 21SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
cvs diff -r1.2 -r1.3 pkgsrc/audio/jack/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/Attic/patch-ai 2008/11/16 11:22:55 1.2
+++ pkgsrc/audio/jack/patches/Attic/patch-ai 2008/11/16 11:55:19 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ai,v 1.2 2008/11/16 11:22:55 bjs Exp $ 1$NetBSD: patch-ai,v 1.3 2008/11/16 11:55:19 bjs Exp $
2 2
3--- libjack/client.c.orig 2008-11-11 17:36:29.000000000 -0500 3--- libjack/client.c.orig 2008-11-11 17:36:29.000000000 -0500
4+++ libjack/client.c 4+++ libjack/client.c
5@@ -969,10 +969,7 @@ jack_client_open_aux (const char *client 5@@ -969,10 +969,7 @@ jack_client_open_aux (const char *client
6 } 6 }
7  7
8 /* parse variable arguments */ 8 /* parse variable arguments */
9- if (ap) 9- if (ap)
10 jack_varargs_parse(options, ap, &va); 10 jack_varargs_parse(options, ap, &va);
11- else 11- else
12- jack_varargs_init(&va); 12- jack_varargs_init(&va);
13  13
14 /* External clients need to know where the tmpdir used for 14 /* External clients need to know where the tmpdir used for
@@ -17,23 +17,13 @@ $NetBSD: patch-ai,v 1.2 2008/11/16 11:22 @@ -17,23 +17,13 @@ $NetBSD: patch-ai,v 1.2 2008/11/16 11:22
17 jack_client_t * 17 jack_client_t *
18 jack_client_new (const char *client_name) 18 jack_client_new (const char *client_name)
19 { 19 {
20+ va_list ap; 20+ va_list ap;
21+ 21+
22 jack_options_t options = JackUseExactName; 22 jack_options_t options = JackUseExactName;
23 if (getenv("JACK_START_SERVER") == NULL) 23 if (getenv("JACK_START_SERVER") == NULL)
24 options |= JackNoStartServer; 24 options |= JackNoStartServer;
25- return jack_client_open_aux (client_name, options, NULL, NULL); 25- return jack_client_open_aux (client_name, options, NULL, NULL);
26+ return jack_client_open_aux (client_name, options, NULL, ap); 26+ return jack_client_open_aux (client_name, options, NULL, ap);
27 } 27 }
28  28
29 char * 29 char *
30@@ -1529,7 +1528,9 @@ jack_wake_next_client (jack_client_t* cl 
31 jack_error ("cannot continue execution of the " 
32 "processing graph (%s)", 
33 strerror(errno)); 
34+#ifndef JACK_HOST_HAS_BSD_POLL 
35 return -1; 
36+#endif 
37 } 
38  
39 DEBUG ("client sent message to next stage by %" PRIu64 "", 
cvs diff -r1.2 -r1.3 pkgsrc/audio/jack/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/audio/jack/patches/Attic/patch-aj 2008/11/16 11:41:28 1.2
+++ pkgsrc/audio/jack/patches/Attic/patch-aj 2008/11/16 11:55:19 1.3
@@ -1,25 +1,34 @@ @@ -1,25 +1,34 @@
1$NetBSD: patch-aj,v 1.2 2008/11/16 11:41:28 bjs Exp $ 1$NetBSD: patch-aj,v 1.3 2008/11/16 11:55:19 bjs Exp $
2 2
3Kill all of the overzealous optimization; if the user wants this, 3Kill all of the overzealous optimization; if the user wants this,
4there is devel/cpuflags and mk.conf. 4there is devel/cpuflags and mk.conf.
5 5
6--- configure.orig 2008-07-27 09:01:02.000000000 -0400 6--- configure.orig 2008-11-11 17:43:06.000000000 -0500
7+++ configure 7+++ configure
8@@ -23713,7 +23713,7 @@ cat >>confdefs.h <<\_ACEOF 8@@ -23714,7 +23714,7 @@ cat >>confdefs.h <<\_ACEOF
9 #define x86 1 9 #define x86 1
10 _ACEOF 10 _ACEOF
11  11
12- COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops" 12- COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
13+ COMMON_X86_OPT_FLAGS="-D_REENTRANT -fomit-frame-pointer" 13+ COMMON_X86_OPT_FLAGS="-D_REENTRANT -fomit-frame-pointer"
14  14
15 if test x$with_cpu_target != x ; then 15 if test x$with_cpu_target != x ; then
16 JACK_OPT_CFLAGS="-march=$with_cpu_target" 16 JACK_OPT_CFLAGS="-march=$with_cpu_target"
17@@ -26081,7 +26081,7 @@ else 17@@ -23748,7 +23748,7 @@ cat >>confdefs.h <<\_ACEOF
 18 #define USE_DYNSIMD 1
 19 _ACEOF
 20
 21- SIMD_CFLAGS="-msse -msse2 -m3dnow"
 22+ SIMD_CFLAGS=""
 23
 24 fi
 25
 26@@ -26082,7 +26082,7 @@ else
18 fi 27 fi
19  28
20  29
21-ac_config_files="$ac_config_files Makefile config/Makefile config/cpu/Makefile config/cpu/alpha/Makefile config/cpu/cris/Makefile config/cpu/generic/Makefile config/cpu/i386/Makefile config/cpu/i486/Makefile config/cpu/ia64/Makefile config/cpu/m68k/Makefile config/cpu/mips/Makefile config/cpu/powerpc/Makefile config/cpu/s390/Makefile config/os/Makefile config/os/generic/Makefile config/os/gnu-linux/Makefile config/os/macosx/Makefile config/sysdeps/Makefile doc/Makefile doc/reference.doxygen drivers/Makefile drivers/alsa/Makefile drivers/alsa-midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile drivers/firewire/Makefile drivers/netjack/Makefile example-clients/Makefile tools/Makefile jack.pc jack.spec jack/Makefile jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile" 30-ac_config_files="$ac_config_files Makefile config/Makefile config/cpu/Makefile config/cpu/alpha/Makefile config/cpu/cris/Makefile config/cpu/generic/Makefile config/cpu/i386/Makefile config/cpu/i486/Makefile config/cpu/ia64/Makefile config/cpu/m68k/Makefile config/cpu/mips/Makefile config/cpu/powerpc/Makefile config/cpu/s390/Makefile config/os/Makefile config/os/generic/Makefile config/os/gnu-linux/Makefile config/os/macosx/Makefile config/sysdeps/Makefile doc/Makefile doc/reference.doxygen drivers/Makefile drivers/alsa/Makefile drivers/alsa-midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile drivers/firewire/Makefile drivers/netjack/Makefile example-clients/Makefile tools/Makefile jack.pc jack.spec jack/Makefile jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile"
22+ac_config_files="$ac_config_files Makefile config/Makefile config/cpu/Makefile config/cpu/alpha/Makefile config/cpu/cris/Makefile config/cpu/generic/Makefile config/cpu/i386/Makefile config/cpu/i486/Makefile config/cpu/ia64/Makefile config/cpu/m68k/Makefile config/cpu/mips/Makefile config/cpu/powerpc/Makefile config/cpu/s390/Makefile config/os/Makefile config/os/generic/Makefile config/os/gnu-linux/Makefile config/os/macosx/Makefile config/sysdeps/Makefile drivers/Makefile drivers/alsa/Makefile drivers/alsa-midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile drivers/firewire/Makefile drivers/netjack/Makefile example-clients/Makefile tools/Makefile jack.pc jack.spec jack/Makefile jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile" 31+ac_config_files="$ac_config_files Makefile config/Makefile config/cpu/Makefile config/cpu/alpha/Makefile config/cpu/cris/Makefile config/cpu/generic/Makefile config/cpu/i386/Makefile config/cpu/i486/Makefile config/cpu/ia64/Makefile config/cpu/m68k/Makefile config/cpu/mips/Makefile config/cpu/powerpc/Makefile config/cpu/s390/Makefile config/os/Makefile config/os/generic/Makefile config/os/gnu-linux/Makefile config/os/macosx/Makefile config/sysdeps/Makefile drivers/Makefile drivers/alsa/Makefile drivers/alsa-midi/Makefile drivers/dummy/Makefile drivers/oss/Makefile drivers/sun/Makefile drivers/portaudio/Makefile drivers/coreaudio/Makefile drivers/freebob/Makefile drivers/firewire/Makefile drivers/netjack/Makefile example-clients/Makefile tools/Makefile jack.pc jack.spec jack/Makefile jack/version.h jackd/Makefile jackd/jackd.1 libjack/Makefile"
23  32
24 cat >confcache <<\_ACEOF 33 cat >confcache <<\_ACEOF
25 # This file is a shell script that caches the results of configure 34 # This file is a shell script that caches the results of configure