summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/jack/Makefile55
-rw-r--r--audio/jack/PLIST3
-rw-r--r--audio/jack/buildlink3.mk5
-rw-r--r--audio/jack/distinfo41
-rw-r--r--audio/jack/patches/patch-aa4
-rw-r--r--audio/jack/patches/patch-ab8
-rw-r--r--audio/jack/patches/patch-ac31
-rw-r--r--audio/jack/patches/patch-ad4
-rw-r--r--audio/jack/patches/patch-ae65
-rw-r--r--audio/jack/patches/patch-af4
-rw-r--r--audio/jack/patches/patch-ag4
-rw-r--r--audio/jack/patches/patch-ah4
-rw-r--r--audio/jack/patches/patch-ai4
-rw-r--r--audio/jack/patches/patch-ak17
-rw-r--r--audio/jack/patches/patch-am4
-rw-r--r--audio/jack/patches/patch-ao4
-rw-r--r--audio/jack/patches/patch-ap4
-rw-r--r--audio/jack/patches/patch-aq4
-rw-r--r--audio/jack/patches/patch-ar4
-rw-r--r--audio/jack/patches/patch-as4
20 files changed, 169 insertions, 104 deletions
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 15441d36bcf..09b77cb7316 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/07/31 03:58:05 bjs Exp $
+# $NetBSD: Makefile,v 1.12 2008/11/16 11:22:55 bjs Exp $
#
DISTNAME= jack-audio-connection-kit-${JACK_VERSION}
@@ -7,7 +7,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
-JACK_VERSION= 0.112.1
+JACK_VERSION= 0.115.1
MAINTAINER= bjs@NetBSD.org
HOMEPAGE= http://www.jackaudio.org/
@@ -15,6 +15,9 @@ COMMENT= JACK audio connection kit
PKG_DESTDIR_SUPPORT= user-destdir
+BUILD_DEFS+= JACKD_DEFAULT_TMPDIR
+BUILD_DEFS+= JACKD_PROCFS_PATH
+
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
@@ -36,12 +39,20 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE
CONFIGURE_ENV+= ac_cv_header_readline_chardefs_h=yes
JACKD_DEFAULT_TMPDIR?= /tmp
-JACKD_PROCFS_PATH?= /proc
.include "../../mk/bsd.prefs.mk"
-.if "${OPSYS:M*BSD}" != "" || ${OPSYS} == "Darwin"
-CFLAGS+= -DJACK_HOST_HAS_BSD_POLL
+.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
+CFLAGS+= -DHOST_HAS_BSD_POLL
+.endif
+###
+### XXX Is there a way to properly use the emulation framework
+### for this?
+###
+.if exists(${PREFIX}/emul/linux/proc) && ${OPSYS} != "Linux"
+JACKD_PROCFS_PATH?= ${PREFIX}/emul/linux/proc
+.else
+JACKD_PROCFS_PATH?= /proc
.endif
.if exists(/dev/shm) && ${OPSYS} == "Linux"
@@ -50,8 +61,15 @@ CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm
CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
.endif
-PLIST_VARS= oss sunaudio
-
+PLIST_VARS= coreaudio oss sunaudio
+###
+### XXX This is untested. Please file a PR and/or commit a fix should
+### any problems arise.
+###
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --enable-coreaudio
+PLIST.coreaudio= yes
+.endif
###
### XXX The sun driver is buggy on NetBSD right now. I hope to remedy
### this shortly.
@@ -74,18 +92,29 @@ CFLAGS+= -DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
CONFIGURE_ARGS+= --disable-oss
.endif
-
-SUBST_CLASSES+= jacksrc
+SUBST_CLASSES+= jacksrc
SUBST_FILES.jacksrc= libjack/unlock.c
SUBST_MESSAGE.jacksrc= Peforming substitutions in JACK sources.
SUBST_STAGE.jacksrc= pre-build
SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+PKG_OPTIONS_VAR= PKG_OPTIONS.jack
+PKG_SUPPORTED_OPTIONS= simd
+PKG_SUGGESTED_OPTIONS= simd
+
+. include "../../mk/bsd.options.mk"
+
+. if !empty(PKG_OPTIONS:Msimd)
+CONFIGURE_ARGS+= --enable-simd
+. else
+CONFIGURE_ARGS+= --disable-simd
+. endif
+.endif
+
post-extract:
- ${RUN} \
- ${MKDIR} ${WRKSRC}/config/os/netbsd && \
- ${CP} ${FILESDIR}/atomicity.h \
- ${WRKSRC}/config/os/netbsd
+ ${RUN} ${MKDIR} ${WRKSRC}/config/os/netbsd && \
+ ${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/audio/jack/PLIST b/audio/jack/PLIST
index 52d60445a33..b1d9e510cd7 100644
--- a/audio/jack/PLIST
+++ b/audio/jack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/07/31 03:58:05 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/11/16 11:22:55 bjs Exp $
bin/jack_alias
bin/jack_connect
bin/jack_disconnect
@@ -31,6 +31,7 @@ lib/jack/inprocess.la
lib/jack/intime.la
lib/jack/jack_dummy.la
lib/jack/jack_net.la
+${PLIST.coreaudio}lib/jack/jack_coreaudio.la
${PLIST.oss}lib/jack/jack_oss.la
${PLIST.sunaudio}lib/jack/jack_sun.la
lib/libjack.la
diff --git a/audio/jack/buildlink3.mk b/audio/jack/buildlink3.mk
index b2d21d14629..b54cdb5ffa0 100644
--- a/audio/jack/buildlink3.mk
+++ b/audio/jack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/07/31 03:58:05 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2008/11/16 11:22:55 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JACK_BUILDLINK3_MK:= ${JACK_BUILDLINK3_MK}+
@@ -14,10 +14,11 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jack
.if ${JACK_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.jack+= jack>=0.110.0
BUILDLINK_PKGSRCDIR.jack?= ../../audio/jack
-DLOPEN_REQUIRE_PTHREADS= yes
.endif # JACK_BUILDLINK3_MK
.include "../../audio/libsamplerate/buildlink3.mk"
+# for DLOPEN_REQUIRE_PTHREADS
.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 390ef2ca873..72cfeecdcff 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.5 2008/08/09 10:33:16 bjs Exp $
+$NetBSD: distinfo,v 1.6 2008/11/16 11:22:55 bjs Exp $
-SHA1 (jack-audio-connection-kit-0.112.1.tar.bz2) = 9b0d5e33098873d92dcfac82bdf5cc4ec9821c91
-RMD160 (jack-audio-connection-kit-0.112.1.tar.bz2) = b7fe0d94314a298031dbb57ceefbbfc917ef4a13
-Size (jack-audio-connection-kit-0.112.1.tar.bz2) = 603111 bytes
-SHA1 (patch-aa) = 56b3efc83cd989670bdbdcaa45c72ed3b92ea731
-SHA1 (patch-ab) = 7733bbf2c406f7fd327de96368ed6c6af4f919ea
-SHA1 (patch-ac) = f4e5a43544f07118acb26aac3f402566ab6193ee
-SHA1 (patch-ad) = 7323270fdf527836bd5ceda4da7f6a4997b52fc5
-SHA1 (patch-ae) = ca18877262357a3e0d503b171fe42708b59ecec6
-SHA1 (patch-af) = 37d0895a253caed41332f4fb17e90677dfe8055f
-SHA1 (patch-ag) = 04d4ad14874c11dbd3d7c0cb2cf488c5bd6da583
-SHA1 (patch-ah) = ef3f960cb95ac13f3227d918be0b80acd5f90d48
-SHA1 (patch-ai) = 49a2d37005252714cad85609765cb1a57c8f23de
-SHA1 (patch-aj) = 2e3c4255c0400bf3999ee67ef116cf10beb8931e
-SHA1 (patch-ak) = 2309246e48a6d616a481f3bc2dda8e4644ca4adc
-SHA1 (patch-am) = 3626473f43d8169be5014b64071dc8c9c3f213c9
-SHA1 (patch-ao) = 8073ed54210ff5a75696e6b677e2eb3e48078d3d
-SHA1 (patch-ap) = 0d84a4237948573635ceb02bf70ca1568ffb423d
-SHA1 (patch-aq) = a352510f40f1fdec31af3fab3d4c034b5f115a4a
-SHA1 (patch-ar) = 128c12fcd98decd7fc626e5bf24e6ab6f4e55c38
-SHA1 (patch-as) = 1a5f7ca7cc8488a8eefaa306bd60efb2c415cce8
+SHA1 (jack-audio-connection-kit-0.115.1.tar.bz2) = 13c07dd4c9bc53475084f8e7a9c5bd9791f76838
+RMD160 (jack-audio-connection-kit-0.115.1.tar.bz2) = fa4e0eace1a21cdfb29b2fe32b38a0c12b98434a
+Size (jack-audio-connection-kit-0.115.1.tar.bz2) = 606162 bytes
+SHA1 (patch-aa) = f2346262d7590491f005af1c450f4436ec60c58e
+SHA1 (patch-ab) = 8531e1af0c3781a238d3793bdd58577ed598b67a
+SHA1 (patch-ac) = b7d6a3bdb890afa99a1849a4db694df509c9e19a
+SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
+SHA1 (patch-ae) = 6e7cad554c6db5b39f14170246f29cc4a2923e3a
+SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
+SHA1 (patch-ag) = 2d64e9b454ed813308b58f888045f955d8df9d58
+SHA1 (patch-ah) = cbc69bad1548f4dc67a4fa4d81e2b6448964321a
+SHA1 (patch-ai) = 54dcc152ecf202e99eba71cad394a9a8c431d9e4
+SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
+SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356
+SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
+SHA1 (patch-ap) = 60738eae086bdab7aa1986889da95621353f7aa6
+SHA1 (patch-aq) = 212441bb56a4cf33a213bb299f42e7dbcbc33274
+SHA1 (patch-ar) = 892dcd268eef033a9dcb2251560fc48662b54916
+SHA1 (patch-as) = 46c609026d53fdebf1d46263d8f196cd8ecbac77
diff --git a/audio/jack/patches/patch-aa b/audio/jack/patches/patch-aa
index 521e57f24b2..e3e1d1aa8a0 100644
--- a/audio/jack/patches/patch-aa
+++ b/audio/jack/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-aa,v 1.3 2008/11/16 11:22:55 bjs Exp $
---- config/sysdeps/atomicity.h.orig 2008-07-27 08:50:27.000000000 -0400
+--- config/sysdeps/atomicity.h.orig 2008-11-11 17:36:35.000000000 -0500
+++ config/sysdeps/atomicity.h
@@ -1,7 +1,11 @@
#ifndef _jack_sysdep_atomicity_h_
diff --git a/audio/jack/patches/patch-ab b/audio/jack/patches/patch-ab
index e79f550e620..e307bae44b3 100644
--- a/audio/jack/patches/patch-ab
+++ b/audio/jack/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2008/08/09 10:33:17 bjs Exp $
+$NetBSD: patch-ab,v 1.4 2008/11/16 11:22:55 bjs Exp $
BSD poll returns POLLIN, not POLLHUP, when the socket is closed,
as does Darwin.
---- jackd/engine.c.orig 2008-07-27 08:50:30.000000000 -0400
+--- jackd/engine.c.orig 2008-11-11 17:36:40.000000000 -0500
+++ jackd/engine.c
-@@ -1383,7 +1383,7 @@ handle_external_client_request (jack_eng
+@@ -1385,7 +1385,7 @@ handle_external_client_request (jack_eng
if ((r = read (client->request_fd, &req, sizeof (req)))
< (ssize_t) sizeof (req)) {
if (r == 0) {
@@ -14,7 +14,7 @@ as does Darwin.
/* poll is implemented using
select (see the macosx/fakepoll
code). When the socket is closed
-@@ -1396,7 +1396,7 @@ handle_external_client_request (jack_eng
+@@ -1398,7 +1398,7 @@ handle_external_client_request (jack_eng
and remove the client.
*/
jack_mark_client_socket_error (engine, fd);
diff --git a/audio/jack/patches/patch-ac b/audio/jack/patches/patch-ac
index 999e5990982..3780464202f 100644
--- a/audio/jack/patches/patch-ac
+++ b/audio/jack/patches/patch-ac
@@ -1,19 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- tools/netsource.c.orig 2008-07-27 22:17:58.000000000 -0400
-+++ tools/netsource.c
-@@ -31,10 +31,14 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- #include <stdlib.h>
- #include <string.h>
-
-+#include <sys/socket.h>
-+
- #include <netinet/in.h>
- #include <netdb.h>
-
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
-
- #include <jack/jack.h>
+--- libjack/simd.c.orig 2008-11-11 17:36:29.000000000 -0500
++++ libjack/simd.c
+@@ -332,9 +332,9 @@ sse_nonalign:
+ void x86_sse_f2i (int *dest, const float *src, int length, float scale)
+ {
+ int i;
+- float max[4] __attribute__((aligned(16))) =
++ static const float max[4] __attribute__((aligned(16))) =
+ { -1.0F, -1.0F, -1.0F, -1.0F };
+- float min[4] __attribute__((aligned(16))) =
++ static const float min[4] __attribute__((aligned(16))) =
+ { 1.0F, 1.0F, 1.0F, 1.0F };
+ float s[4] __attribute__((aligned(16)));
diff --git a/audio/jack/patches/patch-ad b/audio/jack/patches/patch-ad
index f2a5ff28d72..51aebaa2740 100644
--- a/audio/jack/patches/patch-ad
+++ b/audio/jack/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ad,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- drivers/oss/oss_driver.h.orig 2008-07-27 08:50:33.000000000 -0400
+--- drivers/oss/oss_driver.h.orig 2008-11-11 17:36:43.000000000 -0500
+++ drivers/oss/oss_driver.h
@@ -34,7 +34,11 @@
#include <jack/jack.h>
diff --git a/audio/jack/patches/patch-ae b/audio/jack/patches/patch-ae
index 69e4c127c13..923a9d33745 100644
--- a/audio/jack/patches/patch-ae
+++ b/audio/jack/patches/patch-ae
@@ -1,17 +1,52 @@
-$NetBSD: patch-ae,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ae,v 1.2 2008/11/16 11:22:55 bjs Exp $
-I'm not quite sure what's going on here, but I don't think res
-should be a pointer (quells a warning, has no ill effects that
-I can detect).
+This is currently untested. Please file a PR if there are any problems.
---- libjack/intclient.c.orig 2008-07-27 08:50:23.000000000 -0400
-+++ libjack/intclient.c
-@@ -167,7 +167,7 @@ jack_internal_client_load (jack_client_t
- {
- va_list ap;
- va_start(ap, status);
-- jack_intclient_t* res = jack_internal_client_load_aux(client, client_name, options, status, ap);
-+ jack_intclient_t res = jack_internal_client_load_aux(client, client_name, options, status, ap);
- va_end(ap);
- return res;
- }
+--- tools/netsource.c.orig 2008-11-11 17:36:30.000000000 -0500
++++ tools/netsource.c
+@@ -215,10 +215,11 @@ process (jack_nframes_t nframes, void *a
+
+ /* ---------- Receive ---------- */
+ if (reply_port)
+- size = netjack_recv (insockfd, (char *) packet_buf, rx_bufsize, MSG_DONTWAIT, mtu);
++ size = netjack_recv (insockfd, (char *) packet_buf, rx_bufsize, NULL, mtu);
+ else
+- size = netjack_recv (outsockfd, (char *) packet_buf, rx_bufsize, MSG_DONTWAIT, mtu);
++ size = netjack_recv (outsockfd, (char *) packet_buf, rx_bufsize, NULL, mtu);
+ packet_header_ntoh (pkthdr);
++
+ /* Loop till we get the right packet at the right momment */
+ while (size == rx_bufsize && (framecnt - pkthdr->framecnt) > latency)
+ {
+@@ -226,9 +227,9 @@ process (jack_nframes_t nframes, void *a
+ //printf ("Frame %d \tLate packet received with a latency of %d frames\n", framecnt, framecnt - pkthdr->framecnt);
+
+ if (reply_port)
+- size = netjack_recv (insockfd, (char *) packet_buf, rx_bufsize, MSG_DONTWAIT, mtu);
++ size = netjack_recv (insockfd, (char *) packet_buf, rx_bufsize, NULL, mtu);
+ else
+- size = netjack_recv (outsockfd, (char *) packet_buf, rx_bufsize, MSG_DONTWAIT, mtu);
++ size = netjack_recv (outsockfd, (char *) packet_buf, rx_bufsize, NULL, mtu);
+ packet_header_ntoh (pkthdr);
+ }
+
+@@ -376,6 +377,7 @@ main (int argc, char *argv[])
+ int peer_port = 3000;
+ jack_options_t options = JackNullOption;
+ jack_status_t status;
++ int ff;
+
+ /* Torben's famous state variables, aka "the reporting API" ! */
+ int statecopy_connected, statecopy_latency, statecopy_netxruns;
+@@ -481,6 +483,11 @@ main (int argc, char *argv[])
+ return 1;
+ }
+
++ fcntl(outsockfd, F_GETFL, &ff);
++ fcntl(outsockfd, F_SETFL, ff | O_NONBLOCK);
++ fcntl(insockfd, F_GETFL, &ff);
++ fcntl(insockfd, F_SETFL, ff | O_NONBLOCK);
++
+ /* Set up jack callbacks */
+ jack_set_process_callback (client, process, 0);
+ jack_set_sync_callback (client, sync_cb, 0);
diff --git a/audio/jack/patches/patch-af b/audio/jack/patches/patch-af
index bb3b6c4a83b..e200f9110f4 100644
--- a/audio/jack/patches/patch-af
+++ b/audio/jack/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-af,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- tools/transport.c.orig 2008-07-27 08:50:24.000000000 -0400
+--- tools/transport.c.orig 2008-11-11 17:36:30.000000000 -0500
+++ tools/transport.c
@@ -29,6 +29,10 @@
#include <jack/jack.h>
diff --git a/audio/jack/patches/patch-ag b/audio/jack/patches/patch-ag
index 4d8833920b0..3e0643d3f1a 100644
--- a/audio/jack/patches/patch-ag
+++ b/audio/jack/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ag,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- jack.pc.in.orig 2008-07-27 08:50:34.000000000 -0400
+--- jack.pc.in.orig 2008-11-11 17:36:46.000000000 -0500
+++ jack.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: jack
diff --git a/audio/jack/patches/patch-ah b/audio/jack/patches/patch-ah
index 66a6281d9a7..943ce6aa1e5 100644
--- a/audio/jack/patches/patch-ah
+++ b/audio/jack/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ah,v 1.2 2008/11/16 11:22:55 bjs Exp $
Allow overriding the watchdog timeout.
---- jack/engine.h.orig 2008-07-27 08:50:29.000000000 -0400
+--- jack/engine.h.orig 2008-11-11 17:36:38.000000000 -0500
+++ jack/engine.h
@@ -51,8 +51,12 @@ typedef struct _jack_port_buffer_list {
jack_port_buffer_info_t *info; /* jack_buffer_info_t array */
diff --git a/audio/jack/patches/patch-ai b/audio/jack/patches/patch-ai
index 6b4525ae817..61cf9e4d8c6 100644
--- a/audio/jack/patches/patch-ai
+++ b/audio/jack/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ai,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- libjack/client.c.orig 2008-07-27 08:50:23.000000000 -0400
+--- libjack/client.c.orig 2008-11-11 17:36:29.000000000 -0500
+++ libjack/client.c
@@ -969,10 +969,7 @@ jack_client_open_aux (const char *client
}
diff --git a/audio/jack/patches/patch-ak b/audio/jack/patches/patch-ak
index 0b1aec7534d..80e2aa6dfb2 100644
--- a/audio/jack/patches/patch-ak
+++ b/audio/jack/patches/patch-ak
@@ -1,19 +1,22 @@
-$NetBSD: patch-ak,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ak,v 1.2 2008/11/16 11:22:55 bjs Exp $
Yuck. At least let's attempt to make this somewhat sane.
When I have the time and figure out the Right Thing(tm)
to do, perhaps I'll rewrite some of the shm code.
---- libjack/unlock.c.orig 2008-07-27 08:50:23.000000000 -0400
+--- libjack/unlock.c.orig 2008-11-11 17:36:29.000000000 -0500
+++ libjack/unlock.c
-@@ -48,6 +48,7 @@ static char* library_roots[] = {
- "/usr/X11R6/lib",
+@@ -44,8 +44,9 @@ static char* whitelist[] = {
+ static char* library_roots[] = {
+ "/lib",
+ "/usr/lib",
++ "@PREFIX@", /* pkgsrc prefix */
++ "@X11PREFIX@/lib",
+ "/usr/local/lib",
+- "/usr/X11R6/lib",
"/opt/lib", /* solaris-y */
"/opt/local/lib", /* common on OS X */
-+ "@PREFIX@", /* pkgsrc prefix */
NULL
- };
-
@@ -63,7 +64,7 @@ cleanup_mlock ()
int whoknows;
int looks_like_library;
diff --git a/audio/jack/patches/patch-am b/audio/jack/patches/patch-am
index fabb6439a41..dfd54c18f93 100644
--- a/audio/jack/patches/patch-am
+++ b/audio/jack/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-am,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- drivers/oss/Makefile.in.orig 2008-07-27 09:01:08.000000000 -0400
+--- drivers/oss/Makefile.in.orig 2008-11-11 17:43:11.000000000 -0500
+++ drivers/oss/Makefile.in
@@ -54,7 +54,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
am__installdirs = "$(DESTDIR)$(plugindir)"
diff --git a/audio/jack/patches/patch-ao b/audio/jack/patches/patch-ao
index ec4ca49ae3f..191e2864be7 100644
--- a/audio/jack/patches/patch-ao
+++ b/audio/jack/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ao,v 1.2 2008/11/16 11:22:55 bjs Exp $
We want to make sure there's no garbage in the output buffer, otherwise
untoward stuff can happen.
---- drivers/oss/oss_driver.c.orig 2008-07-27 08:50:33.000000000 -0400
+--- drivers/oss/oss_driver.c.orig 2008-11-11 17:36:43.000000000 -0500
+++ drivers/oss/oss_driver.c
@@ -1042,6 +1042,7 @@ static void *io_thread (void *param)
pthread_mutex_lock(&driver->mutex_out);
diff --git a/audio/jack/patches/patch-ap b/audio/jack/patches/patch-ap
index c1c4129aa1f..a11773be4e8 100644
--- a/audio/jack/patches/patch-ap
+++ b/audio/jack/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ap,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- jack/types.h.orig 2008-07-27 08:50:29.000000000 -0400
+--- jack/types.h.orig 2008-11-11 17:36:38.000000000 -0500
+++ jack/types.h
@@ -23,7 +23,7 @@
diff --git a/audio/jack/patches/patch-aq b/audio/jack/patches/patch-aq
index 14484feca01..61d80306da5 100644
--- a/audio/jack/patches/patch-aq
+++ b/audio/jack/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-aq,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- Makefile.in.orig 2008-07-27 09:01:05.000000000 -0400
+--- Makefile.in.orig 2008-11-11 17:43:08.000000000 -0500
+++ Makefile.in
@@ -233,7 +233,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
stamp-h.in config.log config.cache config.status
diff --git a/audio/jack/patches/patch-ar b/audio/jack/patches/patch-ar
index 7a7f23f0956..f704a812456 100644
--- a/audio/jack/patches/patch-ar
+++ b/audio/jack/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-ar,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- config/sysdeps/cycles.h.orig 2008-07-27 08:50:27.000000000 -0400
+--- config/sysdeps/cycles.h.orig 2008-11-11 17:36:35.000000000 -0500
+++ config/sysdeps/cycles.h
@@ -1,7 +1,11 @@
#ifndef _jack_sysdep_cycles_h_
diff --git a/audio/jack/patches/patch-as b/audio/jack/patches/patch-as
index f5b5edccd82..e841806491b 100644
--- a/audio/jack/patches/patch-as
+++ b/audio/jack/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-as,v 1.2 2008/11/16 11:22:55 bjs Exp $
---- drivers/dummy/dummy_driver.c.orig 2008-07-27 08:50:34.000000000 -0400
+--- drivers/dummy/dummy_driver.c.orig 2008-11-11 17:36:45.000000000 -0500
+++ drivers/dummy/dummy_driver.c
@@ -109,6 +109,7 @@ dummy_driver_wait (dummy_driver_t *drive
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 02:44:46 +0000