Revert netjack fix--it's not what I wanted.

3 files changed, 4 insertions, 56 deletions

diff --git a/audio/jack/distinfo b/audio/jack/distinfo
index 72cfeecdcff..526b5c24dae 100644
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: distinfo,v 1.7 2008/11/16 11:41:28 bjs Exp $
 
 SHA1 (jack-audio-connection-kit-0.115.1.tar.bz2) = 13c07dd4c9bc53475084f8e7a9c5bd9791f76838
 RMD160 (jack-audio-connection-kit-0.115.1.tar.bz2) = fa4e0eace1a21cdfb29b2fe32b38a0c12b98434a
@@ -7,11 +7,11 @@ 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-aj) = f0c1fb6681b04f56566b56846fa2c381cbd1d4e1
 SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
 SHA1 (patch-am) = 1453ff3a3e49359e281fcad9a4dbd4096a0b2356
 SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
diff --git a/audio/jack/patches/patch-ae b/audio/jack/patches/patch-ae
deleted file mode 100644
index 923a9d33745..00000000000
--- a/audio/jack/patches/patch-ae
+++ /dev/null
@@ -1,52 +0,0 @@
-$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);
diff --git a/audio/jack/patches/patch-aj b/audio/jack/patches/patch-aj
index d4dc59ebafd..a3fe4909dd6 100644
--- a/audio/jack/patches/patch-aj
+++ b/audio/jack/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2008/07/31 03:58:05 bjs Exp $
+$NetBSD: patch-aj,v 1.2 2008/11/16 11:41:28 bjs Exp $
 
 Kill all of the overzealous optimization; if the user wants this,
 there is devel/cpuflags and mk.conf.
@@ -10,7 +10,7 @@ there is devel/cpuflags and mk.conf.
  _ACEOF
  
 -    COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
-+    COMMON_X86_OPT_FLAGS="-fomit-frame-pointer -ffast-math -funroll-loops"
++    COMMON_X86_OPT_FLAGS="-D_REENTRANT -fomit-frame-pointer"
  
      if test x$with_cpu_target != x ; then
          JACK_OPT_CFLAGS="-march=$with_cpu_target"