summaryrefslogtreecommitdiffstats
path: root/audio/pulseaudio/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-11-30 04:05:12 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-11-30 04:05:12 +0800
commita3b5135851621cb514e7708d11f9dc82f851ea5c (patch)
treeb2b32cc424aeb8dc4d13263958511bf8ca92bc34 /audio/pulseaudio/files
parent095098375dd5bb1d27d533ffc7dc27305e105c95 (diff)
downloadmarcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.gz
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.bz2
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.lz
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.xz
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.zst
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.zip
Remove these ports now that they are in the ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13266 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/pulseaudio/files')
-rw-r--r--audio/pulseaudio/files/extra-patch-src_daemon_main.c20
-rw-r--r--audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in11
-rw-r--r--audio/pulseaudio/files/extra-patch-src_pulse_context.c11
-rw-r--r--audio/pulseaudio/files/patch-configure32
-rw-r--r--audio/pulseaudio/files/patch-src_Makefile.in23
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_default.pa.in17
-rw-r--r--audio/pulseaudio/files/patch-src_modules_module-cli.c15
-rw-r--r--audio/pulseaudio/files/patch-src_modules_oss_module-oss.c24
-rw-r--r--audio/pulseaudio/files/patch-src_modules_oss_oss-util.c25
-rw-r--r--audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c12
-rw-r--r--audio/pulseaudio/files/patch-src_pulse_introspect.c11
-rw-r--r--audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c12
-rw-r--r--audio/pulseaudio/files/patch-src_pulse_util.c20
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_atomic.h116
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_pstream.c23
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_shm.c20
-rw-r--r--audio/pulseaudio/files/patch-src_tests_rtpoll-test.c18
-rw-r--r--audio/pulseaudio/files/patch-src_tests_rtstutter.c27
18 files changed, 0 insertions, 437 deletions
diff --git a/audio/pulseaudio/files/extra-patch-src_daemon_main.c b/audio/pulseaudio/files/extra-patch-src_daemon_main.c
deleted file mode 100644
index 8c6ae410f..000000000
--- a/audio/pulseaudio/files/extra-patch-src_daemon_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/daemon/main.c.orig 2009-01-12 18:11:38.000000000 -0500
-+++ src/daemon/main.c 2009-03-07 19:56:16.000000000 -0500
-@@ -689,7 +690,7 @@ int main(int argc, char *argv[]) {
- * first take the autospawn lock to make things
- * synchronous. */
-
-- if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
-+ /*if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
- pa_log("Failed to initialize autospawn lock");
- goto finish;
- }
-@@ -699,7 +700,7 @@ int main(int argc, char *argv[]) {
- goto finish;
- }
-
-- autospawn_locked = TRUE;
-+ autospawn_locked = TRUE;*/
- }
-
- if (conf->daemonize) {
diff --git a/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in
deleted file mode 100644
index 65001b572..000000000
--- a/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/daemon/start-pulseaudio-x11.in.orig 2009-03-07 19:48:47.000000000 -0500
-+++ src/daemon/start-pulseaudio-x11.in 2009-03-07 19:48:56.000000000 -0500
-@@ -19,7 +19,7 @@
-
- set -e
-
--@PA_BINARY@ --start "$@"
-+@PA_BINARY@ -D "$@"
-
- if [ x"$DISPLAY" != x ] ; then
-
diff --git a/audio/pulseaudio/files/extra-patch-src_pulse_context.c b/audio/pulseaudio/files/extra-patch-src_pulse_context.c
deleted file mode 100644
index fda93a2a6..000000000
--- a/audio/pulseaudio/files/extra-patch-src_pulse_context.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pulse/context.c.orig 2009-03-08 14:33:36.000000000 -0400
-+++ src/pulse/context.c 2009-03-08 14:33:42.000000000 -0400
-@@ -664,7 +664,7 @@ static int context_autospawn(pa_context
- n = 0;
-
- argv[n++] = c->conf->daemon_binary;
-- argv[n++] = "--start";
-+ argv[n++] = "-D";
-
- while (n < MAX_ARGS) {
- char *a;
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
deleted file mode 100644
index 21a97d912..000000000
--- a/audio/pulseaudio/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig 2009-11-24 16:31:47.000000000 +0100
-+++ configure 2009-11-24 16:32:35.000000000 +0100
-@@ -13586,6 +13586,7 @@
- check_inconsistencies=yes
- case "${host_cpu}-${host_os}" in
- *-darwin*) check_inconsistencies=no ;;
-+ *-freebsd*) check_inconsistencies=no ;;
- esac
- if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -18007,7 +18008,7 @@
-
- else
-
-- as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
-+# as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
-
- fi
-
-@@ -18015,9 +18016,9 @@
-
-
- # Win32 does not need the lib and breaks horribly if we try to include it
-- if test "x$os_is_win32" != "x1" ; then
-- LIBS="$LIBS -latomic_ops"
-- fi
-+# if test "x$os_is_win32" != "x1" ; then
-+# LIBS="$LIBS -latomic_ops"
-+# fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in
deleted file mode 100644
index e77cc9f9a..000000000
--- a/audio/pulseaudio/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.in.orig 2009-09-11 21:23:13.000000000 -0400
-+++ src/Makefile.in 2009-09-11 21:24:41.000000000 -0400
-@@ -2890,7 +2890,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_C
- libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \
- -avoid-version $(am__append_14)
- libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \
-- $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
-+ $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) -lexecinfo \
- $(LIBSNDFILE_LIBS) $(am__append_16) $(am__append_20)
-
- ###################################
-@@ -7745,9 +7745,8 @@ info: info-am
-
- info-am:
-
--install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \
-- install-dbuspolicyDATA install-pulseconfDATA \
-- install-pulseincludeHEADERS install-udevrulesDATA \
-+install-data-am: install-dbuspolicyDATA install-pulseconfDATA \
-+ install-pulseincludeHEADERS \
- install-xdgautostartDATA
-
- install-dvi: install-dvi-am
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
deleted file mode 100644
index 0ca5a64e5..000000000
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/daemon/default.pa.in.orig 2009-07-19 14:58:14.000000000 -0400
-+++ src/daemon/default.pa.in 2009-07-19 14:58:41.000000000 -0400
-@@ -22,10 +22,10 @@
- .nofail
-
- ### 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%%/sounds/startup3.wav
-+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/sounds/startup3.wav
-+#load-sample-lazy pulse-access %%LOCALBASE%%/sounds/generic.wav
-
- .fail
-
diff --git a/audio/pulseaudio/files/patch-src_modules_module-cli.c b/audio/pulseaudio/files/patch-src_modules_module-cli.c
deleted file mode 100644
index 4b0fedcc8..000000000
--- a/audio/pulseaudio/files/patch-src_modules_module-cli.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/modules/module-cli.c.orig 2009-09-19 13:57:53.000000000 -0400
-+++ src/modules/module-cli.c 2009-09-19 14:04:25.000000000 -0400
-@@ -105,7 +105,12 @@ int pa__init(pa_module*m) {
- * of log messages, particularly because if stdout and stderr are
- * dup'ed they share the same O_NDELAY, too. */
-
-+#ifdef O_CLOEXEC
- if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) {
-+#else
-+ if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0 &&
-+ fcntl(fd, F_SETFD, FD_CLOEXEC) != -1) {
-+#endif
- io = pa_iochannel_new(m->core->mainloop, fd, fd);
- pa_log_debug("Managed to open /dev/tty.");
- } else {
diff --git a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
deleted file mode 100644
index a723999af..000000000
--- a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/modules/oss/module-oss.c.orig 2009-04-13 17:11:32.000000000 -0400
-+++ src/modules/oss/module-oss.c 2009-07-19 14:24:25.000000000 -0400
-@@ -1214,10 +1214,12 @@ int pa__init(pa_module*m) {
- use_mmap = FALSE;
- }
-
-+#ifndef __FreeBSD__
- if (use_mmap && mode == O_WRONLY) {
- pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
- use_mmap = FALSE;
- }
-+#endif
-
- if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
- pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1399,7 +1401,7 @@ int pa__init(pa_module*m) {
- if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
- pa_bool_t do_close = TRUE;
-
-- if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
-+ if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
- pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
-
- else {
diff --git a/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c
deleted file mode 100644
index 5fe7ec329..000000000
--- a/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/modules/oss/oss-util.c.orig 2007-11-08 21:45:25.000000000 -0500
-+++ src/modules/oss/oss-util.c 2008-01-09 17:00:45.000000000 -0500
-@@ -44,6 +44,22 @@
-
- #include "oss-util.h"
-
-+#ifndef DSP_CAP_COPROC
-+#define DSP_CAP_COPROC 0x00000800
-+#endif
-+#ifndef DSP_CAP_TRIGGER
-+#define DSP_CAP_TRIGGER 0x00001000
-+#endif
-+#ifndef DSP_CAP_MMAP
-+#define DSP_CAP_MMAP 0x00002000
-+#endif
-+#ifndef DSP_CAP_MULTI
-+#define DSP_CAP_MULTI 0x00004000
-+#endif
-+#ifndef DSP_CAP_BIND
-+#define DSP_CAP_BIND 0x00008000
-+#endif
-+
- int pa_oss_open(const char *device, int *mode, int* pcaps) {
- int fd = -1;
- int caps;
diff --git a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c
deleted file mode 100644
index 2dbcad26a..000000000
--- a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/modules/rtp/rtsp_client.c.orig 2009-07-19 14:38:38.000000000 -0400
-+++ src/modules/rtp/rtsp_client.c 2009-07-19 14:39:46.000000000 -0400
-@@ -23,6 +23,9 @@
- #include <config.h>
- #endif
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/audio/pulseaudio/files/patch-src_pulse_introspect.c b/audio/pulseaudio/files/patch-src_pulse_introspect.c
deleted file mode 100644
index 6681f70ca..000000000
--- a/audio/pulseaudio/files/patch-src_pulse_introspect.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pulse/introspect.c.orig 2008-01-03 20:01:31.000000000 -0500
-+++ src/pulse/introspect.c 2008-01-03 20:01:39.000000000 -0500
-@@ -26,6 +26,8 @@
- #include <config.h>
- #endif
-
-+#include <string.h>
-+
- #include <pulse/context.h>
-
- #include <pulsecore/gccmacro.h>
diff --git a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
deleted file mode 100644
index 72a0965dd..000000000
--- a/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
-
- #include <signal.h>
-+#ifndef OS_IS_WIN32
-+#include <pthread.h>
-+#endif
- #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
deleted file mode 100644
index 2fa4de0bc..000000000
--- a/audio/pulseaudio/files/patch-src_pulse_util.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 06515b9f9..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/pulsecore/atomic.h.orig 2008-01-23 19:44:20.000000000 -0500
-+++ src/pulsecore/atomic.h 2008-03-15 14:48:41.000000000 -0400
-@@ -106,6 +106,113 @@ static inline int pa_atomic_ptr_cmpxchg(
- return __sync_bool_compare_and_swap(&a->value, (long) old_p, (long) new_p);
- }
-
-+#elif defined(__FreeBSD__)
-+
-+#include <sys/cdefs.h>
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <machine/atomic.h>
-+
-+#if __FreeBSD_version < 600000
-+#if defined(__i386__) || defined(__amd64__)
-+#if defined(__amd64__)
-+#define atomic_load_acq_64 atomic_load_acq_long
-+#endif
-+static inline u_int
-+atomic_fetchadd_int(volatile u_int *p, u_int v)
-+{
-+ __asm __volatile(
-+ " " __XSTRING(MPLOCKED) " "
-+ " xaddl %0, %1 ; "
-+ "# atomic_fetchadd_int"
-+ : "+r" (v),
-+ "=m" (*p)
-+ : "m" (*p));
-+
-+ return (v);
-+}
-+#elif defined(__sparc64__)
-+#define atomic_load_acq_64 atomic_load_acq_long
-+#define atomic_fetchadd_int atomic_add_int
-+#elif defined(__ia64__)
-+#define atomic_load_acq_64 atomic_load_acq_long
-+static inline uint32_t
-+atomic_fetchadd_int(volatile uint32_t *p, uint32_t v)
-+{
-+ uint32_t value;
-+
-+ do {
-+ value = *p;
-+ } while (!atomic_cmpset_32(p, value, value + v));
-+ return (value);
-+}
-+#endif
-+#endif
-+
-+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) {
-+ return atomic_fetchadd_int((unsigned int *) &a->value, i);
-+}
-+
-+static inline int pa_atomic_sub(pa_atomic_t *a, int i) {
-+ return atomic_fetchadd_int((unsigned int *) &a->value, -(i));
-+}
-+
-+static inline int pa_atomic_inc(pa_atomic_t *a) {
-+ return atomic_fetchadd_int((unsigned int *) &a->value, 1);
-+}
-+
-+static inline int pa_atomic_dec(pa_atomic_t *a) {
-+ return atomic_fetchadd_int((unsigned int *) &a->value, -1);
-+}
-+
-+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);
-+#else
-+ 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) {
-+#ifdef atomic_load_acq_64
-+ atomic_store_rel_ptr(&a->value, (unsigned long) p);
-+#else
-+ 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) {
-+#ifdef atomic_load_acq_64
-+ 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);
-+#endif
-+}
-+
- #elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
-
- #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_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
deleted file mode 100644
index b242e2e41..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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)) {
-- 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_pstream_unref(p);
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
deleted file mode 100644
index 4dfa3a3a9..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pulsecore/shm.c.orig 2009-08-19 10:17:06.000000000 +0800
-+++ src/pulsecore/shm.c 2009-11-11 21:25:03.000000000 +0800
-@@ -91,7 +91,7 @@
- #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
-
- static char *segment_name(char *fn, size_t l, unsigned id) {
-- pa_snprintf(fn, l, "/pulse-shm-%u", id);
-+ pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id);
- return fn;
- }
-
-@@ -142,7 +142,7 @@
- pa_random(&m->id, sizeof(m->id));
- segment_name(fn, sizeof(fn), m->id);
-
-- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
-+ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) {
- pa_log("shm_open() failed: %s", pa_cstrerror(errno));
- goto fail;
- }
diff --git a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c b/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c
deleted file mode 100644
index 365ca8d2b..000000000
--- a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/tests/rtpoll-test.c.orig 2008-01-03 20:03:03.000000000 -0500
-+++ src/tests/rtpoll-test.c 2008-01-03 20:03:25.000000000 -0500
-@@ -45,6 +45,7 @@ static int worker(pa_rtpoll_item *w) {
- }
-
- int main(int argc, char *argv[]) {
-+#ifdef SIGRTMIN
- pa_rtpoll *p;
- pa_rtpoll_item *i, *w;
- struct pollfd *pollfd;
-@@ -86,6 +87,7 @@ int main(int argc, char *argv[]) {
- pa_rtpoll_item_free(w);
-
- pa_rtpoll_free(p);
-+#endif
-
- return 0;
- }
diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
deleted file mode 100644
index c80737b19..000000000
--- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/tests/rtstutter.c.orig 2009-07-23 15:40:47.000000000 +0200
-+++ src/tests/rtstutter.c 2009-11-24 16:26:36.000000000 +0100
-@@ -31,6 +31,11 @@
- #include <string.h>
- #include <pthread.h>
-
-+#ifdef HAVE_PTHREAD_SETAFFINITY_NP
-+#include <sys/param.h>
-+#include <sys/cpuset.h>
-+#endif
-+
- #include <pulse/timeval.h>
- #include <pulse/gccmacro.h>
-
-@@ -44,8 +49,12 @@
-
- static void* work(void *p) {
- #ifdef HAVE_PTHREAD_SETAFFINITY_NP
-+#ifdef __FreeBSD__
-+ cpuset_t mask;
-+#else
- cpu_set_t mask;
- #endif
-+#endif
- struct sched_param param;
-
- pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));