Update to 0.9.8.

15 files changed, 150 insertions, 345 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 82fd02d..25cc1eb 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.6
-PORTREVISION=	4
+PORTVERSION=	0.9.8
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -43,6 +42,10 @@ OPTIONS=	JACK "JACK audio support" Off \
 PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
+MAN1=		esdcompat.1 pabrowse.1 pacat.1 pacmd.1 pactl.1 padsp.1 \
+		paplay.1 pasuspender.1 pax11publish.1 pulseaudio.1
+MAN5=		default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_JACK)
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index dae2a4c..d9a15d3 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.6.tar.gz) = 669d52a70fb9a7a83c2507005bfa2a6f
-SHA256 (pulseaudio-0.9.6.tar.gz) = b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64
-SIZE (pulseaudio-0.9.6.tar.gz) = 1157647
+MD5 (pulseaudio-0.9.8.tar.gz) = 184a41d5947e583d395f0a2541525fc2
+SHA256 (pulseaudio-0.9.8.tar.gz) = 359891878e19d33b15f6a97eaec9b2f7d85dab7c1e1d6723537b80d36aa36858
+SIZE (pulseaudio-0.9.8.tar.gz) = 1089681
diff --git a/audio/pulseaudio/files/patch-libpulse-browse.pc.in b/audio/pulseaudio/files/patch-libpulse-browse.pc.in
deleted file mode 100644
index 96299a0..0000000
--- a/audio/pulseaudio/files/patch-libpulse-browse.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpulse-browse.pc.in.orig	Sun Apr 29 19:26:35 2007
-+++ libpulse-browse.pc.in	Sun Apr 29 19:26:54 2007
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: libpulse-browse
- Description: PulseAudio Network Browsing API
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lpulse-browse
--Cflags: -D_REENTRANT -I${includedir}
-+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-browse
-+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
- Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in b/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
deleted file mode 100644
index 8b99e2d..0000000
--- a/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpulse-mainloop-glib.pc.in.orig	Sun Apr 29 19:27:05 2007
-+++ libpulse-mainloop-glib.pc.in	Sun Apr 29 19:27:20 2007
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: libpulse-mainloop-glib
- Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lpulse-mainloop-glib
--Cflags: -D_REENTRANT -I${includedir}
-+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-mainloop-glib
-+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
- Requires: libpulse glib-2.0
diff --git a/audio/pulseaudio/files/patch-libpulse-simple.pc.in b/audio/pulseaudio/files/patch-libpulse-simple.pc.in
deleted file mode 100644
index 623dbf7..0000000
--- a/audio/pulseaudio/files/patch-libpulse-simple.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpulse-simple.pc.in.orig	Sun Apr 29 19:26:00 2007
-+++ libpulse-simple.pc.in	Sun Apr 29 19:26:18 2007
-@@ -6,6 +6,6 @@ includedir=${prefix}/include
- Name: libpulse-simple
- Description: Simplified Synchronous Client Interface to PulseAudio
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lpulse-simple
--Cflags: -D_REENTRANT -I${includedir}
-+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-simple
-+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
- Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse.pc.in b/audio/pulseaudio/files/patch-libpulse.pc.in
deleted file mode 100644
index 85fea12..0000000
--- a/audio/pulseaudio/files/patch-libpulse.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libpulse.pc.in.orig	Sat Sep  2 10:57:19 2006
-+++ libpulse.pc.in	Sun Jul  8 17:40:02 2007
-@@ -7,5 +7,5 @@ Name: libpulse
- Description: Client Interface to PulseAudio
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -lpulse @PTHREAD_LIBS@
--Cflags: -D_REENTRANT -I${includedir}
-+Cflags: -D_REENTRANT -I${includedir} @PTHREAD_CFLAGS@
- Requires:
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
index 3d6c892..7abc210 100644
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -1,11 +1,17 @@
---- src/daemon/default.pa.in.orig	Sat Jul 22 11:58:50 2006
-+++ src/daemon/default.pa.in	Sat Jul 22 12:22:20 2006
-@@ -60,7 +60,7 @@
+--- src/daemon/default.pa.in.orig	2007-10-28 13:18:27.000000000 -0400
++++ src/daemon/default.pa.in	2008-01-01 15:59:59.000000000 -0500
+@@ -19,10 +19,10 @@
  .nofail
  
- ### Load something to the sample cache
--load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
-+load-sample x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav
- #load-sample-dir-lazy /usr/share/sounds/*.wav
+ ### Load something into the sample cache
+-#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
+-load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
+-#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
+-#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
++#load-sample-lazy x11-bell %%LOCALBASE%%/sounds/gtk-events/activate.wav
++load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/startup3.wav
++#load-sample-lazy pulse-coldplug %%LOCALBASE%%/sounds/startup3.wav
++#load-sample-lazy pulse-access %%LOCALBASE%%/sounds/generic.wav
+ 
+ .fail
  
- ### Load X11 bell module
diff --git a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
index 314cb67..72a0965 100644
--- a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
+++ b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
@@ -1,14 +1,12 @@
---- 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>
+--- src/pulse/thread-mainloop.c.orig	2008-01-01 17:23:28.000000000 -0500
++++ src/pulse/thread-mainloop.c	2008-01-01 17:25:00.000000000 -0500
+@@ -27,6 +27,9 @@
+ #endif
  
-+#ifdef HAVE_PTHREAD
+ #include <signal.h>
++#ifndef OS_IS_WIN32
 +#include <pthread.h>
-+#include <signal.h>
 +#endif
-+
- #ifdef HAVE_SYS_POLL_H
- #include <sys/poll.h>
- #else
+ #include <stdio.h>
+ 
+ #ifdef HAVE_POLL_H
diff --git a/audio/pulseaudio/files/patch-src_pulse_util.c b/audio/pulseaudio/files/patch-src_pulse_util.c
new file mode 100644
index 0000000..2fa4de0
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulse_util.c
@@ -0,0 +1,20 @@
+--- src/pulse/util.c.orig	2008-01-01 17:29:31.000000000 -0500
++++ src/pulse/util.c	2008-01-01 17:29:00.000000000 -0500
+@@ -184,6 +184,17 @@ char *pa_get_binary_name(char *s, size_t
+     }
+ 
+ #endif
++#ifdef __FreeBSD__
++    {
++        char *rp;
++
++	if ((rp = pa_readlink("/proc/curproc/file"))) {
++	    pa_strlcpy(s, pa_path_get_filename(rp), l);
++	    pa_xfree(rp);
++	    return s;
++	}
++    }
++#endif
+ 
+ #if defined(HAVE_SYS_PRCTL_H) && defined(PR_GET_NAME)
+     {
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
index 086d5fe..8ba13da 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
+++ b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
@@ -1,98 +1,91 @@
---- src/pulsecore/atomic.h.orig	Sun May 27 16:38:18 2007
-+++ src/pulsecore/atomic.h	Sun Jul  8 20:29:53 2007
-@@ -24,7 +24,9 @@
-   USA.
- ***/
+--- src/pulsecore/atomic.h.orig	2007-10-28 15:13:53.000000000 -0400
++++ src/pulsecore/atomic.h	2008-01-01 17:20:19.000000000 -0500
+@@ -106,6 +106,88 @@ static inline int pa_atomic_ptr_cmpxchg(
+     return __sync_bool_compare_and_swap(&a->value, (long) old_p, (long) new_p);
+ }
  
--#include <atomic_ops.h>
++#elif defined(__FreeBSD__)
++
 +#include <sys/cdefs.h>
 +#include <sys/types.h>
 +#include <machine/atomic.h>
- 
- /* atomic_ops guarantees us that sizeof(AO_t) == sizeof(void*).
-  *
-@@ -32,7 +34,7 @@
-  * however very likely. */
- 
- typedef struct pa_atomic_int {
--    volatile AO_t value;
-+    volatile unsigned long value;
- } pa_atomic_int_t;
- 
- #define PA_ATOMIC_INIT(v) { .value = (v) }
-@@ -42,47 +44,64 @@ typedef struct pa_atomic_int {
-  * suffixes to the function names */
- 
- static inline int pa_atomic_load(const pa_atomic_int_t *a) {
--    return (int) AO_load_full((AO_t*) &a->value);
-+    return (int) atomic_load_acq_int((unsigned int *) &a->value);
- }
- 
- static inline void pa_atomic_store(pa_atomic_int_t *a, int i) {
--    AO_store_full(&a->value, (AO_t) i);
-+    atomic_store_rel_int((unsigned int *) &a->value, i);
- }
- 
- static inline int pa_atomic_add(pa_atomic_int_t *a, int i) {
--    return AO_fetch_and_add_full(&a->value, (AO_t) i);
-+    atomic_add_int((unsigned int *) &a->value, i);
-+    return (int) a->value;
- }
- 
- static inline int pa_atomic_sub(pa_atomic_int_t *a, int i) {
--    return AO_fetch_and_add_full(&a->value, (AO_t) -i);
-+    atomic_subtract_int((unsigned int *) &a->value, i);
-+    return (int) a->value;
- }
- 
- static inline int pa_atomic_inc(pa_atomic_int_t *a) {
--    return AO_fetch_and_add1_full(&a->value);
-+    atomic_add_int((unsigned int *) &a->value, 1);
-+    return (int) a->value;
- }
- 
- static inline int pa_atomic_dec(pa_atomic_int_t *a) {
--    return AO_fetch_and_sub1_full(&a->value);
-+    atomic_subtract_int((unsigned int *) &a->value, 1);
-+    return (int) a->value;
- }
- 
- static inline int pa_atomic_cmpxchg(pa_atomic_int_t *a, int old_i, int new_i) {
--    return AO_compare_and_swap_full(&a->value, old_i, new_i);
-+    atomic_cmpset_int((unsigned int *) &a->value, old_i, new_i);
-+    return (int) a->value;
- }
- 
- typedef struct pa_atomic_ptr {
--    volatile AO_t value;
-+    volatile unsigned long value;
- } pa_atomic_ptr_t;
- 
- static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
--    return (void*) AO_load_full((AO_t*) &a->value);
++
++typedef struct pa_atomic {
++	volatile unsigned long value;
++} pa_atomic_t;
++
++#define PA_ATOMIC_INIT(v) { .value = (v) }
++
++static inline int pa_atomic_load(const pa_atomic_t *a) {
++	return (int) atomic_load_acq_int((unsigned int *) &a->value);
++}
++
++static inline void pa_atomic_store(pa_atomic_t *a, int i) {
++	atomic_store_rel_int((unsigned int *) &a->value, i);
++}
++
++static inline int pa_atomic_add(pa_atomic_t *a, int i) {
++	int r;
++	r = pa_atomic_load(a);
++	atomic_add_int((unsigned int *) &a->value, i);
++	return r;
++}
++
++static inline int pa_atomic_sub(pa_atomic_t *a, int i) {
++	int r;
++	r = pa_atomic_load(a);
++	atomic_subtract_int((unsigned int *) &a->value, i);
++	return r;
++}
++
++static inline int pa_atomic_inc(pa_atomic_t *a) {
++	int r;
++	r = pa_atomic_load(a);
++	atomic_add_int((unsigned int *) &a->value, 1);
++	return r;
++}
++
++static inline int pa_atomic_dec(pa_atomic_t *a) {
++	int r;
++	r = pa_atomic_load(a);
++	atomic_subtract_int((unsigned int *) &a->value, 1);
++	return r;
++}
++
++static inline int pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i) {
++	return atomic_cmpset_int((unsigned int *) &a->value, old_i, new_i);
++}
++
++typedef struct pa_atomic_ptr {
++	volatile unsigned long value;
++} pa_atomic_ptr_t;
++
++#define PA_ATOMIC_PTR_INIT(v) { .value = (unsigned long) (v) }
++
++static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
 +#ifdef atomic_load_acq_64
-+    return (void*) atomic_load_acq_ptr((unsigned long *) &a->value);
++	return (void*) atomic_load_acq_ptr((unsigned long *) &a->value);
 +#else
-+    return (void*) atomic_load_acq_ptr((unsigned int *) &a->value);
++	return (void*) atomic_load_acq_ptr((unsigned int *) &a->value);
 +#endif
- }
- 
- static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
--    AO_store_full(&a->value, (AO_t) p);
++}
++
++static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void *p) {
 +#ifdef atomic_load_acq_64
-+    atomic_store_rel_ptr(&a->value, (unsigned long) p);
++	atomic_store_rel_ptr(&a->value, (unsigned long) p);
 +#else
-+    atomic_store_rel_ptr((unsigned int *) &a->value, (unsigned int) p);
++	atomic_store_rel_ptr((unsigned int *) &a->value, (unsigned int) p);
 +#endif
- }
- 
- static inline int pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* new_p) {
--    return AO_compare_and_swap_full(&a->value, (AO_t) old_p, (AO_t) new_p);
++}
++
++static inline int pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, void* new_p) {
 +#ifdef atomic_load_acq_64
-+    return atomic_cmpset_ptr(&a->value, (unsigned long) old_p, (unsigned long) new_p);
++	return atomic_cmpset_ptr(&a->value, (unsigned long) old_p, (unsigned long) new_p);
 +#else
-+    return atomic_cmpset_ptr((unsigned int *) &a->value, (unsigned int) old_p, (unsigned int) new_p);
++	return atomic_cmpset_ptr((unsigned int *) &a->value, (unsigned int) old_p, (unsigned int) new_p);
 +#endif
- }
++}
++
+ #elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
  
- #endif
+ #error "The native atomic operations implementation for AMD64 has not been tested. libatomic_ops is known to not work properly on AMD64 and your gcc version is too old for the gcc-builtin atomic ops support. You have three options now: make the native atomic operations implementation for AMD64 work, fix libatomic_ops, or upgrade your GCC."
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c
deleted file mode 100644
index 96b6ff6..0000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/pulsecore/mutex-posix.c.orig	2007-05-12 19:21:39.000000000 -0400
-+++ src/pulsecore/mutex-posix.c	2007-07-09 01:28:06.000000000 -0400
-@@ -28,7 +28,9 @@
- #include <assert.h>
- #include <pthread.h>
- 
--#include <atomic_ops.h>
-+#include <sys/types.h>
-+#include <sys/cdefs.h>
-+#include <machine/atomic.h>
- 
- #include <pulse/xmalloc.h>
- 
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
index e3036c3..b242e2e 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
@@ -1,6 +1,6 @@
---- 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) 
+--- src/pulsecore/pstream.c.orig	2007-10-28 15:13:53.000000000 -0400
++++ src/pulsecore/pstream.c	2008-01-01 16:14:18.000000000 -0500
+@@ -183,14 +183,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)) {
@@ -20,23 +20,4 @@
 +	}
      }
  
-     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) {
+     pa_pstream_unref(p);
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h b/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
deleted file mode 100644
index c44c4c0..0000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
index 9c501dd..549091c 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
@@ -1,10 +1,11 @@
---- src/pulsecore/shm.c.orig	Thu May 17 11:57:56 2007
-+++ src/pulsecore/shm.c	Thu May 17 11:58:10 2007
-@@ -50,7 +50,7 @@
- #define MAX_SHM_SIZE (1024*1024*20)
+--- src/pulsecore/shm.c.orig	2007-10-28 15:13:53.000000000 -0400
++++ src/pulsecore/shm.c	2008-01-01 16:19:19.000000000 -0500
+@@ -80,7 +80,7 @@ struct shm_marker {
+ };
  
  static char *segment_name(char *fn, size_t l, unsigned id) {
--    snprintf(fn, l, "/pulse-shm-%u", id);
-+    snprintf(fn, l, "/tmp/pulse-shm-%u", id);
+-    pa_snprintf(fn, l, "/pulse-shm-%u", id);
++    pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id);
      return fn;
  }
+ 
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 0d2804b..2b0c9e9 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -6,6 +6,7 @@ bin/pactl
 bin/padsp
 bin/paplay
 bin/parec
+bin/pasuspender
 bin/pax11publish
 bin/pulseaudio
 @unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
@@ -14,6 +15,7 @@ etc/pulse/client.conf-dist
 etc/pulse/daemon.conf-dist
 @unexec if cmp -s %D/etc/pulse/default.pa %D/etc/pulse/default.pa-dist; then rm -f %D/etc/pulse/default.pa; fi
 etc/pulse/default.pa-dist
+etc/xdg/autostart/pulseaudio-module-xsmp.desktop
 %%AVAHI%%include/pulse/browser.h
 include/pulse/cdecl.h
 include/pulse/channelmap.h
@@ -39,81 +41,6 @@ include/pulse/util.h
 include/pulse/version.h
 include/pulse/volume.h
 include/pulse/xmalloc.h
-include/pulsecore/atomic.h
-include/pulsecore/authkey-prop.h
-include/pulsecore/authkey.h
-include/pulsecore/autoload.h
-%%AVAHI%%include/pulsecore/avahi-wrap.h
-include/pulsecore/cli-command.h
-include/pulsecore/cli-text.h
-include/pulsecore/cli.h
-include/pulsecore/client.h
-include/pulsecore/conf-parser.h
-include/pulsecore/core-def.h
-include/pulsecore/core-scache.h
-include/pulsecore/core-subscribe.h
-include/pulsecore/core-util.h
-include/pulsecore/core.h
-include/pulsecore/creds.h
-include/pulsecore/dynarray.h
-include/pulsecore/esound.h
-include/pulsecore/g711.h
-include/pulsecore/hashmap.h
-include/pulsecore/idxset.h
-include/pulsecore/iochannel.h
-include/pulsecore/ioline.h
-include/pulsecore/ipacl.h
-include/pulsecore/llist.h
-include/pulsecore/log.h
-include/pulsecore/mcalign.h
-include/pulsecore/memblock.h
-include/pulsecore/memblockq.h
-include/pulsecore/memchunk.h
-include/pulsecore/modargs.h
-include/pulsecore/modinfo.h
-include/pulsecore/module.h
-include/pulsecore/mutex.h
-include/pulsecore/namereg.h
-include/pulsecore/native-common.h
-include/pulsecore/once.h
-include/pulsecore/packet.h
-include/pulsecore/parseaddr.h
-include/pulsecore/pdispatch.h
-include/pulsecore/pid.h
-include/pulsecore/play-memblockq.h
-include/pulsecore/play-memchunk.h
-include/pulsecore/props.h
-include/pulsecore/protocol-cli.h
-include/pulsecore/protocol-esound.h
-include/pulsecore/protocol-http.h
-include/pulsecore/protocol-native.h
-include/pulsecore/protocol-simple.h
-include/pulsecore/pstream-util.h
-include/pulsecore/pstream.h
-include/pulsecore/queue.h
-include/pulsecore/random.h
-include/pulsecore/refcnt.h
-include/pulsecore/resampler.h
-include/pulsecore/sample-util.h
-include/pulsecore/sconv.h
-include/pulsecore/shm.h
-include/pulsecore/sink-input.h
-include/pulsecore/sink.h
-include/pulsecore/sioman.h
-include/pulsecore/socket-client.h
-include/pulsecore/socket-server.h
-include/pulsecore/socket-util.h
-include/pulsecore/sound-file-stream.h
-include/pulsecore/sound-file.h
-include/pulsecore/source-output.h
-include/pulsecore/source.h
-include/pulsecore/strbuf.h
-include/pulsecore/strlist.h
-include/pulsecore/tagstruct.h
-include/pulsecore/thread.h
-include/pulsecore/tokenizer.h
-include/pulsecore/x11prop.h
-include/pulsecore/x11wrap.h
 %%AVAHI%%lib/libpulse-browse.a
 %%AVAHI%%lib/libpulse-browse.la
 %%AVAHI%%lib/libpulse-browse.so
@@ -133,135 +60,76 @@ lib/libpulse.so.0
 lib/libpulsecore.a
 lib/libpulsecore.la
 lib/libpulsecore.so
-lib/libpulsecore.so.3
+lib/libpulsecore.so.5
 lib/libpulsedsp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.la
 lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.so
-lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.la
 lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.la
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
-lib/pulse-%%PULSE_VERSION%%/modules/libcli.la
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.la
 %%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.la
 lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.so
-lib/pulse-%%PULSE_VERSION%%/modules/libioline.la
 lib/pulse-%%PULSE_VERSION%%/modules/libioline.so
-lib/pulse-%%PULSE_VERSION%%/modules/libipacl.la
 lib/pulse-%%PULSE_VERSION%%/modules/libipacl.so
-lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.la
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpacket.la
 lib/pulse-%%PULSE_VERSION%%/modules/libpacket.so
-lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.la
 lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.la
 lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.la
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.la
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.la
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.la
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.la
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.la
 lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libpstream.la
 lib/pulse-%%PULSE_VERSION%%/modules/libpstream.so
-lib/pulse-%%PULSE_VERSION%%/modules/librtp.la
 lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.la
 lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.la
 lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.so
-lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.la
 lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.la
 lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.so
-lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.la
 lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.so
-lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.la
 lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.so
-lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.la
 lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-detect.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
-%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.la
 %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.la
 %%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.la
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.la
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-match.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss-mmap.la
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss-mmap.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.la
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.la
+lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
+%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
 %%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
 libdata/pkgconfig/libpulse-mainloop-glib.pc
@@ -271,6 +139,7 @@ libdata/pkgconfig/libpulse.pc
 %%GCONF%%@dirrm libexec/pulse
 @dirrm lib/pulse-%%PULSE_VERSION%%/modules
 @dirrm lib/pulse-%%PULSE_VERSION%%
-@dirrm include/pulsecore
 @dirrm include/pulse
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
 @dirrm etc/pulse