Fix some crashes and some build warnings. This should get pulse working as an

ESD replacement once again.

Reported by:	lofi

5 files changed, 78 insertions, 1 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index bf4ea75365fc..2347487b4769 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c
new file mode 100644
index 000000000000..1b96327a872d
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_daemon_main.c
@@ -0,0 +1,10 @@
+--- src/daemon/main.c.orig	Thu Jul 12 00:04:22 2007
++++ src/daemon/main.c	Thu Jul 12 00:04:40 2007
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ #include <locale.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #include <liboil/liboil.h>
+ 
diff --git a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
new file mode 100644
index 000000000000..314cb6778bcc
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
@@ -0,0 +1,14 @@
+--- src/pulse/thread-mainloop.c.orig	Thu Jul 12 00:01:48 2007
++++ src/pulse/thread-mainloop.c	Thu Jul 12 00:03:32 2007
+@@ -30,6 +30,11 @@
+ #include <signal.h>
+ #include <stdio.h>
+ 
++#ifdef HAVE_PTHREAD
++#include <pthread.h>
++#include <signal.h>
++#endif
++
+ #ifdef HAVE_SYS_POLL_H
+ #include <sys/poll.h>
+ #else
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
new file mode 100644
index 000000000000..e3036c3ee4e2
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
@@ -0,0 +1,42 @@
+--- src/pulsecore/pstream.c.orig	Wed Jul 11 23:57:46 2007
++++ src/pulsecore/pstream.c	Wed Jul 11 23:57:49 2007
+@@ -178,14 +178,17 @@ static void do_something(pa_pstream *p) 
+     p->mainloop->defer_enable(p->defer_event, 0);
+ 
+     if (!p->dead && pa_iochannel_is_readable(p->io)) {
+-        if (do_read(p) < 0)
++        if (do_read(p) < 0) {
+             goto fail;
+-    } else if (!p->dead && pa_iochannel_is_hungup(p->io))
++	}
++    } else if (!p->dead && pa_iochannel_is_hungup(p->io)) {
+         goto fail;
++    }
+ 
+     if (!p->dead && pa_iochannel_is_writable(p->io)) {
+-        if (do_write(p) < 0)
++        if (do_write(p) < 0) {
+             goto fail;
++	}
+     }
+ 
+     pa_mutex_unlock(p->mutex);
+@@ -197,12 +200,13 @@ fail:
+ 
+     p->dead = 1;
+ 
+-    if (p->die_callback)
++    if (p->die_callback) {
++        pa_mutex_unlock(p->mutex);
+         p->die_callback(p, p->die_callback_userdata);
+-
+-    pa_mutex_unlock(p->mutex);
+-
+-    pa_pstream_unref(p);
++    } else {
++        pa_mutex_unlock(p->mutex);
++        pa_pstream_unref(p);
++    }
+ }
+ 
+ static void io_callback(pa_iochannel*io, void *userdata) {
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h b/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
new file mode 100644
index 000000000000..c44c4c0e1189
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
@@ -0,0 +1,11 @@
+--- src/pulsecore/refcnt.h.orig	Wed Jul 11 23:44:24 2007
++++ src/pulsecore/refcnt.h	Wed Jul 11 23:49:59 2007
+@@ -36,7 +36,7 @@
+   pa_atomic_inc(&p->_ref)
+ 
+ #define PA_REFCNT_DEC(p) \
+-  (pa_atomic_dec(&p->_ref)-1)
++  pa_atomic_dec(&p->_ref)
+ 
+ #define PA_REFCNT_VALUE(p) \
+   pa_atomic_load(&p->_ref)