head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.12
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.10
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.8
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.6
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.4
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.2
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.1.0.4
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.2
	cube-native-xorg-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2008.11.16.11.41.28;	author bjs;	state dead;
branches;
next	1.2;

1.2
date	2008.11.16.11.22.55;	author bjs;	state Exp;
branches;
next	1.1;

1.1
date	2008.07.31.03.58.05;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Revert netjack fix--it's not what I wanted.
@
text
@$NetBSD: patch-ae,v 1.2 2008/11/16 11:22:55 bjs Exp $

This is currently untested.  Please file a PR if there are any problems.

--- 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);
@


1.2
log
@Update to jack-0.115.1 (from SVN).  Changes: pulled in a patch
to [hopefully] correct errant behavior wrt: non-blocking I/O and sockets.
This is presently untested, however.  Also, with this snapshot
we at least have the hope that the network facility works.  Includes
other miscellaneous bug fixes, also.

While here, explicitly enable coreaudio on Darwin and add a PLIST
entry for its driver module.  This is also untested, but at least
installation on Darwin will not fail due to an incorrect PLIST.  Also,
include ../../mk/dlopen.buildlink3.mk in our bl3.mk in order
to heed DLOPEN_REQUIRE_PTHREADS.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Move audio/jack-devel to audio/jack: jack 0.100.0 was broken on many
platforms and a hideous anachronism.  On NetBSD-current/i386 and amd64,
at least, I can say that this package works very well.  If you have issues
with the audio skipping and are running NetBSD 4.99.x, try updating to
rev. 1.241 of sys/dev/audio.c; the changes to audio_poll() and the pause
attribute handling (in large part thanks to help from jakemsr@@openbsd.org)
are important for proper functioning of jack (though you may find it
works regardless, depending upon your audio driver, how demanding your
"workload" is, etc.).  I will submit a pullup request for this change
for NetBSD 4 as well.

JACK now supports both our native audio API and OSS--I recommend
trying both.
@
text
@d1 1
a1 1
$NetBSD: patch-ae,v 1.2 2008/04/08 01:44:47 bjs Exp $
d3 1
a3 3
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).
d5 48
a52 11
--- 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;
 }
@