diff options
| -rw-r--r-- | audio/pulseaudio/Makefile | 3 | ||||
| -rw-r--r-- | audio/pulseaudio/distinfo | 6 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-configure | 36 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-libpulse.pc.in | 12 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_atomic.h | 98 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_core-util.c | 49 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c | 12 | ||||
| -rw-r--r-- | audio/pulseaudio/pkg-plist | 9 |
8 files changed, 211 insertions, 14 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 4652b78b8dd9..c6ac986c61a8 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -7,8 +7,7 @@ # PORTNAME= pulseaudio -PORTVERSION= 0.9.5 -PORTREVISION= 5 +PORTVERSION= 0.9.6 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 95131ab945cb..dae2a4c98d35 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,3 +1,3 @@ -MD5 (pulseaudio-0.9.5.tar.gz) = 99b5d9efd4fce35cabb4ae5d0ebb230d -SHA256 (pulseaudio-0.9.5.tar.gz) = cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6 -SIZE (pulseaudio-0.9.5.tar.gz) = 1145930 +MD5 (pulseaudio-0.9.6.tar.gz) = 669d52a70fb9a7a83c2507005bfa2a6f +SHA256 (pulseaudio-0.9.6.tar.gz) = b7a5f14eb8cf7076f1df8fb78d4a05c83e1e655474688c48364fa1b96f478d64 +SIZE (pulseaudio-0.9.6.tar.gz) = 1157647 diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure new file mode 100644 index 000000000000..32d08b68d904 --- /dev/null +++ b/audio/pulseaudio/files/patch-configure @@ -0,0 +1,36 @@ +--- 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-libpulse.pc.in b/audio/pulseaudio/files/patch-libpulse.pc.in index 9065bdd2cd14..85fea12d1b91 100644 --- a/audio/pulseaudio/files/patch-libpulse.pc.in +++ b/audio/pulseaudio/files/patch-libpulse.pc.in @@ -1,11 +1,9 @@ ---- libpulse.pc.in.orig Sun Apr 29 19:25:22 2007 -+++ libpulse.pc.in Sun Apr 29 19:25:46 2007 -@@ -6,6 +6,6 @@ includedir=${prefix}/include - Name: libpulse +--- 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 + Libs: -L${libdir} -lpulse @PTHREAD_LIBS@ -Cflags: -D_REENTRANT -I${includedir} -+Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse -+Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir} ++Cflags: -D_REENTRANT -I${includedir} @PTHREAD_CFLAGS@ Requires: diff --git a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h new file mode 100644 index 000000000000..e52a427875e7 --- /dev/null +++ b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h @@ -0,0 +1,98 @@ +--- 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. + ***/ + +-#include <atomic_ops.h> ++#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); ++#ifdef atomic_load_acq_long ++ 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) { +- AO_store_full(&a->value, (AO_t) p); ++#ifdef atomic_load_acq_long ++ 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) { +- return AO_compare_and_swap_full(&a->value, (AO_t) old_p, (AO_t) new_p); ++#ifdef atomic_load_acq_long ++ 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 + } + + #endif diff --git a/audio/pulseaudio/files/patch-src_pulsecore_core-util.c b/audio/pulseaudio/files/patch-src_pulsecore_core-util.c new file mode 100644 index 000000000000..cb91964ad90b --- /dev/null +++ b/audio/pulseaudio/files/patch-src_pulsecore_core-util.c @@ -0,0 +1,49 @@ +--- 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_mutex-posix.c b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c new file mode 100644 index 000000000000..c94541da3d56 --- /dev/null +++ b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c @@ -0,0 +1,12 @@ +--- src/pulsecore/mutex-posix.c.orig Sun Jul 8 18:13:31 2007 ++++ src/pulsecore/mutex-posix.c Sun Jul 8 18:13:59 2007 +@@ -28,7 +28,8 @@ + #include <assert.h> + #include <pthread.h> + +-#include <atomic_ops.h> ++#include <sys/cdefs.h> ++#include <machine/atomic.h> + + #include <pulse/xmalloc.h> + diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index d59ffa22b54d..0d2804b33b44 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -39,6 +39,7 @@ 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 @@ -62,6 +63,7 @@ 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 @@ -70,8 +72,10 @@ 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 @@ -88,6 +92,7 @@ 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 @@ -105,6 +110,7 @@ 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 @@ -127,7 +133,7 @@ lib/libpulse.so.0 lib/libpulsecore.a lib/libpulsecore.la lib/libpulsecore.so -lib/libpulsecore.so.2 +lib/libpulsecore.so.3 lib/libpulsedsp.so lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.la lib/pulse-%%PULSE_VERSION%%/modules/libauthkey-prop.so @@ -262,7 +268,6 @@ libdata/pkgconfig/libpulse-mainloop-glib.pc libdata/pkgconfig/libpulse-simple.pc libdata/pkgconfig/libpulse.pc %%GCONF%%libexec/pulse/gconf-helper -%%GCONF%%libexec/pulse %%GCONF%%@dirrm libexec/pulse @dirrm lib/pulse-%%PULSE_VERSION%%/modules @dirrm lib/pulse-%%PULSE_VERSION%% |