summaryrefslogtreecommitdiffstats
path: root/audio/pulseaudio/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-03-24 13:30:51 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-03-24 13:30:51 +0800
commita6888a2a213b49d671bf658e58428d9a1d342f66 (patch)
tree73b4b8892d2a32df0f24d16b19046bc481baf971 /audio/pulseaudio/files
parenta740241125f843ca61310f787f0eea0d5b40784f (diff)
downloadmarcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.tar
marcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.tar.gz
marcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.tar.bz2
marcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.tar.lz
marcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.tar.xz
marcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.tar.zst
marcuscom-ports-a6888a2a213b49d671bf658e58428d9a1d342f66.zip
Remove these ports now that they have been merged into the FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10818 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/pulseaudio/files')
-rw-r--r--audio/pulseaudio/files/patch-configure36
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_default.pa.in17
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_main.c10
-rw-r--r--audio/pulseaudio/files/patch-src_modules_oss-util.c37
-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_core-util.c49
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_pstream.c23
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_shm.c11
-rw-r--r--audio/pulseaudio/files/patch-src_tests_rtpoll-test.c18
12 files changed, 0 insertions, 360 deletions
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
deleted file mode 100644
index 32d08b68d..000000000
--- a/audio/pulseaudio/files/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.orig Sun Jul 8 18:17:17 2007
-+++ configure Sun Jul 8 18:41:18 2007
-@@ -25255,6 +25255,7 @@ echo $ECHO_N "checking whether to check
- 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
- { echo "$as_me:$LINENO: result: no" >&5
-@@ -28924,9 +28925,9 @@ _ACEOF
-
- else
-
--{ { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
--echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-- { (exit 1); exit 1; }; }
-+#{ { echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
-+#echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-+# { (exit 1); exit 1; }; }
-
- fi
-
-@@ -28934,9 +28935,9 @@ done
-
-
- # 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
-
- #### OSS support (optional) ####
-
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 7abc21071..000000000
--- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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 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
-
diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c
deleted file mode 100644
index 1b96327a8..000000000
--- a/audio/pulseaudio/files/patch-src_daemon_main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_modules_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss-util.c
deleted file mode 100644
index bf44d4fdd..000000000
--- a/audio/pulseaudio/files/patch-src_modules_oss-util.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/modules/oss-util.c.orig 2007-11-08 21:45:25.000000000 -0500
-+++ src/modules/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;
-@@ -300,7 +316,11 @@ static int get_device_number(const char
- int r;
-
- if (!(p = rp = pa_readlink(dev))) {
-+#ifdef ENOLINK
- if (errno != EINVAL && errno != ENOLINK) {
-+#else
-+ if (errno != EINVAL) {
-+#endif
- r = -1;
- goto finish;
- }
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_core-util.c b/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
deleted file mode 100644
index cb91964ad..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/pulsecore/core-util.c.orig Sun Jul 8 18:35:21 2007
-+++ src/pulsecore/core-util.c Sun Jul 8 18:39:04 2007
-@@ -40,6 +40,7 @@
- #include <time.h>
- #include <ctype.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-
-@@ -544,6 +545,7 @@ fail:
- cap_free(caps);
- }
- #endif
-+ ;
- }
-
- /* Reset the priority to normal, inverting the changes made by pa_raise_priority() */
-@@ -838,22 +840,22 @@ int pa_check_in_group(gid_t g) {
- (advisory on UNIX, mandatory on Windows) */
- int pa_lock_fd(int fd, int b) {
- #ifdef F_SETLKW
-- struct flock flock;
-+ struct flock pa_flock;
-
- /* Try a R/W lock first */
-
-- flock.l_type = b ? F_WRLCK : F_UNLCK;
-- flock.l_whence = SEEK_SET;
-- flock.l_start = 0;
-- flock.l_len = 0;
-+ pa_flock.l_type = b ? F_WRLCK : F_UNLCK;
-+ pa_flock.l_whence = SEEK_SET;
-+ pa_flock.l_start = 0;
-+ pa_flock.l_len = 0;
-
-- if (fcntl(fd, F_SETLKW, &flock) >= 0)
-+ if (fcntl(fd, F_SETLKW, &pa_flock) >= 0)
- return 0;
-
- /* Perhaps the file descriptor qas opened for read only, than try again with a read lock. */
- if (b && errno == EBADF) {
-- flock.l_type = F_RDLCK;
-- if (fcntl(fd, F_SETLKW, &flock) >= 0)
-+ pa_flock.l_type = F_RDLCK;
-+ if (fcntl(fd, F_SETLKW, &pa_flock) >= 0)
- return 0;
- }
-
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 549091ccc..000000000
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) {
-- pa_snprintf(fn, l, "/pulse-shm-%u", id);
-+ pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id);
- return fn;
- }
-
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;
- }