diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-04-11 03:24:39 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-04-11 03:24:39 +0800 |
commit | 58794b38b1a24b93c9a8c3321694e3883bae4cd0 (patch) | |
tree | 3d921b9d8836f0a4c0ba361d4581a70d202545ad /audio/pulseaudio/files | |
parent | f33c5fb61cfe4c8856817db7f2c84041a862250b (diff) | |
download | marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.gz marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.bz2 marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.lz marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.xz marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.tar.zst marcuscom-ports-58794b38b1a24b93c9a8c3321694e3883bae4cd0.zip |
Remove these ports now that they have been merged into FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12240 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio/pulseaudio/files')
-rw-r--r-- | audio/pulseaudio/files/patch-configure | 36 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_daemon_default.pa.in | 17 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_daemon_main.c | 28 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in | 11 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_modules_oss-util.c | 37 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulse_context.c | 11 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulse_introspect.c | 11 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c | 12 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulse_util.c | 20 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_atomic.h | 116 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_core-util.c | 49 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_pstream.c | 23 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_shm.c | 11 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_tests_rtpoll-test.c | 18 | ||||
-rw-r--r-- | audio/pulseaudio/files/patch-src_tests_rtstutter.c | 18 |
15 files changed, 0 insertions, 418 deletions
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure deleted file mode 100644 index 513081005..000000000 --- a/audio/pulseaudio/files/patch-configure +++ /dev/null @@ -1,36 +0,0 @@ ---- configure.orig 2008-07-26 15:15:12.000000000 -0400 -+++ configure 2008-07-26 15:15:35.000000000 -0400 -@@ -25321,6 +25321,7 @@ $as_echo_n "checking whether to check fo - 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:$LINENO: result: no" >&5 -@@ -32654,9 +32655,9 @@ _ACEOF - - else - -- { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5 --$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;} -- { (exit 1); exit 1; }; } -+# { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5 -+#$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;} -+# { (exit 1); exit 1; }; } - - fi - -@@ -32664,9 +32665,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 - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } 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 77ba7306a..000000000 --- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in +++ /dev/null @@ -1,17 +0,0 @@ ---- src/daemon/default.pa.in.orig 2008-08-19 17:25:03.000000000 -0400 -+++ src/daemon/default.pa.in 2008-09-28 19:48:14.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_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c deleted file mode 100644 index 27b2c4f1a..000000000 --- a/audio/pulseaudio/files/patch-src_daemon_main.c +++ /dev/null @@ -1,28 +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 -@@ -37,6 +37,7 @@ - #include <unistd.h> - #include <locale.h> - #include <sys/types.h> -+#include <sys/stat.h> - - #include <liboil/liboil.h> - -@@ -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/patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in deleted file mode 100644 index 65001b572..000000000 --- a/audio/pulseaudio/files/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/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_context.c b/audio/pulseaudio/files/patch-src_pulse_context.c deleted file mode 100644 index fda93a2a6..000000000 --- a/audio/pulseaudio/files/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-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 91f369249..000000000 --- a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c +++ /dev/null @@ -1,49 +0,0 @@ ---- src/pulsecore/core-util.c.orig 2008-09-08 19:33:30.000000000 -0400 -+++ src/pulsecore/core-util.c 2008-09-28 19:50:24.000000000 -0400 -@@ -37,6 +37,7 @@ - #include <time.h> - #include <ctype.h> - #include <sys/types.h> -+#include <sys/socket.h> - #include <sys/stat.h> - #include <sys/time.h> - #include <dirent.h> -@@ -567,6 +568,7 @@ int pa_make_realtime(int rtprio) { - errno = ENOTSUP; - return -1; - #endif -+ ; - } - - /* This is merely used for giving the user a hint. This is not correct -@@ -1131,22 +1133,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 = (short) (b ? F_WRLCK : F_UNLCK); -- flock.l_whence = SEEK_SET; -- flock.l_start = 0; -- flock.l_len = 0; -+ pa_flock.l_type = (short) (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; - } 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 c8d657481..000000000 --- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tests/rtstutter.c.orig 2008-07-26 17:10:17.000000000 -0400 -+++ src/tests/rtstutter.c 2008-07-26 17:12:26.000000000 -0400 -@@ -42,6 +42,7 @@ static int msec_lower, msec_upper; - static void* work(void *p) PA_GCC_NORETURN; - - static void* work(void *p) { -+#ifndef __FreeBSD__ - cpu_set_t mask; - struct sched_param param; - -@@ -83,6 +84,7 @@ static void* work(void *p) { - } while (now.tv_sec < end.tv_sec || - (now.tv_sec == end.tv_sec && now.tv_nsec < end.tv_nsec)); - } -+#endif - } - - int main(int argc, char*argv[]) { |