1 files changed, 10 insertions, 27 deletions
diff --git a/audio/pulseaudio/patches/patch-ae b/audio/pulseaudio/patches/patch-ae
index bc75140bc43..e326cb794e4 100644
--- a/audio/pulseaudio/patches/patch-ae
+++ b/audio/pulseaudio/patches/patch-ae
@@ -1,30 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/12/18 14:42:56 jmcneill Exp $
+$NetBSD: patch-ae,v 1.2 2010/02/01 15:00:20 jmcneill Exp $
 
---- src/pulsecore/socket-util.c.orig	2008-12-18 00:53:11.000000000 -0500
-+++ src/pulsecore/socket-util.c
-@@ -202,9 +202,11 @@ void pa_make_udp_socket_low_delay(int fd
- }
+--- src/pulse/context.c.orig	2010-02-01 14:16:41.000000000 +0000
++++ src/pulse/context.c
+@@ -718,7 +718,7 @@ static int context_autospawn(pa_context 
  
- int pa_socket_set_rcvbuf(int fd, size_t l) {
-+    int bufsz = (int)l;
-+
-     pa_assert(fd >= 0);
+         /* Setup argv */
+         argv[n++] = c->conf->daemon_binary;
+-        argv[n++] = "--start";
++        argv[n++] = "-D";
  
--    if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void*)&l, sizeof(l)) < 0) {
-+    if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void*)&bufsz, sizeof(bufsz)) < 0) {
-         pa_log_warn("SO_RCVBUF: %s", pa_cstrerror(errno));
-         return -1;
-     }
-@@ -213,9 +215,11 @@ int pa_socket_set_rcvbuf(int fd, size_t 
- }
- 
- int pa_socket_set_sndbuf(int fd, size_t l) {
-+    int bufsz = (int)l;
-+
-     pa_assert(fd >= 0);
- 
--    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void*)&l, sizeof(l)) < 0) {
-+    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void*)&bufsz, sizeof(bufsz)) < 0) {
-         pa_log("SO_SNDBUF: %s", pa_cstrerror(errno));
-         return -1;
-     }
+         while (n < PA_ELEMENTSOF(argv)-1) {
+             char *a;