diff options
author | bjs <bjs@pkgsrc.org> | 2008-11-16 11:55:19 +0000 |
---|---|---|
committer | bjs <bjs@pkgsrc.org> | 2008-11-16 11:55:19 +0000 |
commit | 2ec5b983c57ab52fe3a7955c2ae58249b5d67aa7 (patch) | |
tree | 0a281b27c899f9a981c9ca9cbb564ac51b2bad4b /audio/jack | |
parent | 0466af2903f8cd6fd21a4f269b8038950773f8d7 (diff) | |
download | pkgsrc-2ec5b983c57ab52fe3a7955c2ae58249b5d67aa7.tar.gz |
If we're using dynamic SIMD detection, we _do not_ want to build
with -msse et. al.
s/HOST_HAS_BSD_POLL/JACK_&/
Diffstat (limited to 'audio/jack')
-rw-r--r-- | audio/jack/Makefile | 4 | ||||
-rw-r--r-- | audio/jack/distinfo | 6 | ||||
-rw-r--r-- | audio/jack/patches/patch-ai | 12 | ||||
-rw-r--r-- | audio/jack/patches/patch-aj | 17 |
4 files changed, 19 insertions, 20 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 09b77cb7316..e44503e785e 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/11/16 11:22:55 bjs Exp $ +# $NetBSD: Makefile,v 1.13 2008/11/16 11:55:19 bjs Exp $ # DISTNAME= jack-audio-connection-kit-${JACK_VERSION} @@ -43,7 +43,7 @@ JACKD_DEFAULT_TMPDIR?= /tmp .include "../../mk/bsd.prefs.mk" .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" -CFLAGS+= -DHOST_HAS_BSD_POLL +CFLAGS+= -DJACK_HOST_HAS_BSD_POLL .endif ### ### XXX Is there a way to properly use the emulation framework diff --git a/audio/jack/distinfo b/audio/jack/distinfo index 526b5c24dae..68d60ce4a0e 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2008/11/16 11:41:28 bjs Exp $ +$NetBSD: distinfo,v 1.8 2008/11/16 11:55:19 bjs Exp $ SHA1 (jack-audio-connection-kit-0.115.1.tar.bz2) = 13c07dd4c9bc53475084f8e7a9c5bd9791f76838 RMD160 (jack-audio-connection-kit-0.115.1.tar.bz2) = fa4e0eace1a21cdfb29b2fe32b38a0c12b98434a @@ -10,8 +10,8 @@ SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20 SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e SHA1 (patch-ag) = 2d64e9b454ed813308b58f888045f955d8df9d58 SHA1 (patch-ah) = cbc69bad1548f4dc67a4fa4d81e2b6448964321a -SHA1 (patch-ai) = 54dcc152ecf202e99eba71cad394a9a8c431d9e4 -SHA1 (patch-aj) = f0c1fb6681b04f56566b56846fa2c381cbd1d4e1 +SHA1 (patch-ai) = 6ba07c9c4a3997bc7b121f60d79a997d0b9fe646 +SHA1 (patch-aj) = 9fc6492b6aa28d9b61b7abeced22af9ad90850dc SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63 SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356 SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b diff --git a/audio/jack/patches/patch-ai b/audio/jack/patches/patch-ai index 61cf9e4d8c6..34364c1b017 100644 --- a/audio/jack/patches/patch-ai +++ b/audio/jack/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.2 2008/11/16 11:22:55 bjs Exp $ +$NetBSD: patch-ai,v 1.3 2008/11/16 11:55:19 bjs Exp $ --- libjack/client.c.orig 2008-11-11 17:36:29.000000000 -0500 +++ libjack/client.c @@ -27,13 +27,3 @@ $NetBSD: patch-ai,v 1.2 2008/11/16 11:22:55 bjs Exp $ } char * -@@ -1529,7 +1528,9 @@ jack_wake_next_client (jack_client_t* cl - jack_error ("cannot continue execution of the " - "processing graph (%s)", - strerror(errno)); -+#ifndef JACK_HOST_HAS_BSD_POLL - return -1; -+#endif - } - - DEBUG ("client sent message to next stage by %" PRIu64 "", diff --git a/audio/jack/patches/patch-aj b/audio/jack/patches/patch-aj index a3fe4909dd6..fd72f4d032e 100644 --- a/audio/jack/patches/patch-aj +++ b/audio/jack/patches/patch-aj @@ -1,11 +1,11 @@ -$NetBSD: patch-aj,v 1.2 2008/11/16 11:41:28 bjs Exp $ +$NetBSD: patch-aj,v 1.3 2008/11/16 11:55:19 bjs Exp $ Kill all of the overzealous optimization; if the user wants this, there is devel/cpuflags and mk.conf. ---- configure.orig 2008-07-27 09:01:02.000000000 -0400 +--- configure.orig 2008-11-11 17:43:06.000000000 -0500 +++ configure -@@ -23713,7 +23713,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -23714,7 +23714,7 @@ cat >>confdefs.h <<\_ACEOF #define x86 1 _ACEOF @@ -14,7 +14,16 @@ there is devel/cpuflags and mk.conf. if test x$with_cpu_target != x ; then JACK_OPT_CFLAGS="-march=$with_cpu_target" -@@ -26081,7 +26081,7 @@ else +@@ -23748,7 +23748,7 @@ cat >>confdefs.h <<\_ACEOF + #define USE_DYNSIMD 1 + _ACEOF + +- SIMD_CFLAGS="-msse -msse2 -m3dnow" ++ SIMD_CFLAGS="" + + fi + +@@ -26082,7 +26082,7 @@ else fi |