Update to jack-0.111.5. Mostly improvements to the jack_net client.

Also, some code cleanup/improvements to the sun driver; with a fix to
audio.c that I'm hopefully going to commit very soon, the sun driver works
quite well.

7 files changed, 14 insertions, 118 deletions

diff --git a/audio/jack-devel/Makefile b/audio/jack-devel/Makefile
index ce0c23fc669..b8ca3a0e535 100644
--- a/audio/jack-devel/Makefile
+++ b/audio/jack-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/04/25 11:16:25 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2008/05/04 01:02:07 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.110.0
+JACK_VERSION=	0.111.5
 
 MAINTAINER=	bjs@NetBSD.org
 HOMEPAGE=	http://www.jackaudio.org/
diff --git a/audio/jack-devel/PLIST b/audio/jack-devel/PLIST
index 5fc00223e00..9713e67b1b8 100644
--- a/audio/jack-devel/PLIST
+++ b/audio/jack-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/05/04 01:02:07 bjs Exp $
 bin/jack_alias
 bin/jack_connect
 bin/jack_disconnect
@@ -11,6 +11,7 @@ bin/jack_metro
 bin/jack_midiseq
 bin/jack_midisine
 bin/jack_monitor_client
+bin/jack_netsource
 bin/jack_showtime
 bin/jack_simple_client
 bin/jack_transport
@@ -32,7 +33,6 @@ lib/jack/jack_dummy.la
 lib/jack/jack_net.la
 ${PLIST.oss}lib/jack/jack_oss.la
 ${PLIST.sunaudio}lib/jack/jack_sun.la
-lib/jack/netsource.la
 lib/libjack.la
 lib/libjackserver.la
 lib/pkgconfig/jack.pc
diff --git a/audio/jack-devel/distinfo b/audio/jack-devel/distinfo
index bfb61578de2..d08d81d8cec 100644
--- a/audio/jack-devel/distinfo
+++ b/audio/jack-devel/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/05/04 01:02:07 bjs Exp $
 
-SHA1 (jack-audio-connection-kit-0.110.0.tar.bz2) = 2eaefe6af7fa35aec4d84c0ca8690b6c2c4c9c8d
-RMD160 (jack-audio-connection-kit-0.110.0.tar.bz2) = 5905e7199f45fec4559d98bef21940c57096e3c2
-Size (jack-audio-connection-kit-0.110.0.tar.bz2) = 504535 bytes
+SHA1 (jack-audio-connection-kit-0.111.5.tar.bz2) = b6efab7e206762a60e092d8dbe70001bd996d44f
+RMD160 (jack-audio-connection-kit-0.111.5.tar.bz2) = 3af9409582da307b98317add7ebfe60d8204dd44
+Size (jack-audio-connection-kit-0.111.5.tar.bz2) = 508591 bytes
 SHA1 (patch-aa) = 169403b0eacff27b6f77f714b07eab571c0e6455
-SHA1 (patch-ab) = 8ccffe0f6ebe73710cb3ba535c6e1bb19a191a6a
-SHA1 (patch-ac) = 05e9e8fcdf9f562616f1b32036d7e4f654ddac3f
+SHA1 (patch-ab) = b201a2a4db7c7d1565049e5d3534cee9a0ccbd20
+SHA1 (patch-ac) = 7bde8dcf5bf4b6f946c3eb6a568f7d66c1c69c35
 SHA1 (patch-ad) = 9632ad3a03015688f02bc4b715d74e21ae293c8f
 SHA1 (patch-ae) = 7fb1deae5473cc9df556176c878610805baf66dc
 SHA1 (patch-af) = 446bbcb0a835279c7821bcebfd6eec04a0fd7870
@@ -14,8 +14,6 @@ SHA1 (patch-ah) = d5dd0c8718b6f07277444d0cce02340eb849e092
 SHA1 (patch-ai) = 89817ae9c013d0da37307f9bc673bf370784e869
 SHA1 (patch-aj) = 478c44fc5a82b2ffa108e985baae49765c793828
 SHA1 (patch-ak) = 334e03bc426034c0c231af40b48ee43717c1bed8
-SHA1 (patch-al) = 53985ecc7471045d7c7ef5cb91382ac627c17ba1
 SHA1 (patch-am) = c4d1d5562dace10971ef7fba37ddfcf07ad2fdb5
-SHA1 (patch-an) = c43d7877fb223965f5e45ba32be8565366fe2fd7
 SHA1 (patch-ao) = 88f0e4bf223db31375c7b3b2f0ef152d5cadf374
 SHA1 (patch-ap) = 1e15592658714da73ebceb695000cd636ea9b871
diff --git a/audio/jack-devel/patches/patch-ab b/audio/jack-devel/patches/patch-ab
index 04ea90ee93a..816b7ee63ac 100644
--- a/audio/jack-devel/patches/patch-ab
+++ b/audio/jack-devel/patches/patch-ab
@@ -1,35 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ab,v 1.4 2008/05/04 01:02:07 bjs Exp $
 
 The default watchdog timeout is 10 seconds, which is too much for
 usleep().  Let's nanosleep if it's available.
 
 --- jackd/engine.c.orig	2008-03-17 18:26:49.000000000 -0400
 +++ jackd/engine.c
-@@ -907,12 +907,24 @@ jack_engine_post_process (jack_engine_t 
- static void *
- jack_watchdog_thread (void *arg)
- {
-+#ifdef nanosleep
-+	struct timespec ts;
-+#endif
- 	jack_engine_t *engine = (jack_engine_t *) arg;
- 
- 	engine->watchdog_check = 0;
-+#ifdef nanosleep
-+	ts.tv_sec = JACKD_WATCHDOG_TIMEOUT / 1000;
-+	ts.tv_nsec = (JACKD_WATCHDOG_TIMEOUT - (ts.tv_sec * 1000)) * 1000;
-+#endif
-+
- 
- 	while (1) {
-+#ifdef nanosleep
-+		nanosleep(&ts, NULL);
-+#else
- 		usleep (1000 * JACKD_WATCHDOG_TIMEOUT);
-+#endif
- 		if (!engine->freewheeling && engine->watchdog_check == 0) {
- 
- 			jack_error ("jackd watchdog: timeout - killing jackd");
 @@ -1468,7 +1480,7 @@ jack_server_thread (void *arg)
  				    (engine, pfd[i].fd)) {
  					jack_error ("could not handle external"
diff --git a/audio/jack-devel/patches/patch-ac b/audio/jack-devel/patches/patch-ac
index 94fb2d9fe8f..997bc7fe83a 100644
--- a/audio/jack-devel/patches/patch-ac
+++ b/audio/jack-devel/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2008/04/08 01:44:47 bjs Exp $
+$NetBSD: patch-ac,v 1.3 2008/05/04 01:02:07 bjs Exp $
 
---- drivers/netjack/net_source.c.orig	2008-03-17 10:06:55.000000000 -0400
-+++ drivers/netjack/net_source.c
+--- tools/netsource.c.orig	2008-03-17 10:06:55.000000000 -0400
++++ tools/netsource.c
 @@ -8,10 +8,14 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/audio/jack-devel/patches/patch-al b/audio/jack-devel/patches/patch-al
deleted file mode 100644
index 941910c1946..00000000000
--- a/audio/jack-devel/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.2 2008/04/08 01:44:47 bjs Exp $
-
-Quell a warning about uninitialized use of these variables.
-
---- drivers/netjack/net_driver.c.orig	2008-03-06 05:03:06.000000000 -0500
-+++ drivers/netjack/net_driver.c
-@@ -132,8 +132,12 @@ net_driver_run_cycle (net_driver_t *driv
-     int wait_status;
-     float delayed_usecs;
- 
--    jack_nframes_t nframes = net_driver_wait (driver, -1, &wait_status,
--                             &delayed_usecs);
-+    jack_nframes_t nframes; 
-+
-+    wait_status = 0;
-+    delayed_usecs = 0;
-+
-+    nframes = net_driver_wait (driver, -1, &wait_status, &delayed_usecs);
- 
-     // currently there is no xrun detection.
-     // so nframes will always be period_size.
diff --git a/audio/jack-devel/patches/patch-an b/audio/jack-devel/patches/patch-an
deleted file mode 100644
index 2a0b89741d5..00000000000
--- a/audio/jack-devel/patches/patch-an
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-an,v 1.2 2008/04/08 01:44:47 bjs Exp $
-
-This driver is buggy on NetBSD right now.  This is likely [in part] due to
-problems with our audio driver, but there could very well be problems
-here, too.  I welcome guidance/suggestions/comments on how to improve
-this driver, which was written by <jakemsr@openbsd.org>.  For NetBSD
-questions, though, it's probably best if you contact the maintainer of
-this package and/or another NetBSD developer.
-
---- drivers/sun/sun_driver.c.orig	2008-03-27 17:29:08.000000000 -0400
-+++ drivers/sun/sun_driver.c
-@@ -26,13 +26,6 @@
- 
- #include <config.h>
- 
--#ifndef _REENTRANT
--#define _REENTRANT
--#endif
--#ifndef _THREAD_SAFE
--#define _THREAD_SAFE
--#endif
--
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -59,6 +52,12 @@
- 
- #include "sun_driver.h"
- 
-+#ifdef __NetBSD__
-+#define AUMODE_PLAY_FLAGS	(AUMODE_PLAY | AUMODE_PLAY_ALL)
-+#else
-+#define AUMODE_PLAY_FLAGS	AUMODE_PLAY
-+#endif
-+
- 
- #define SUN_DRIVER_N_PARAMS	11
- const static jack_driver_param_desc_t sun_params[SUN_DRIVER_N_PARAMS] = {
-@@ -736,7 +735,7 @@ sun_driver_set_parameters (sun_driver_t 
- 
- 	if (infd == outfd)
- 	{
--		audio_if_in.mode = AUMODE_PLAY | AUMODE_RECORD;
-+		audio_if_in.mode = AUMODE_PLAY_FLAGS | AUMODE_RECORD;
- 	}
- 	else
- 	{
-@@ -744,7 +743,7 @@ sun_driver_set_parameters (sun_driver_t 
- 			audio_if_in.mode = AUMODE_RECORD;
- 
- 		if (outfd > 0)
--			audio_if_out.mode = AUMODE_PLAY;
-+			audio_if_out.mode = AUMODE_PLAY_FLAGS;
- 	}
- 
- 	if (infd > 0)