diff options
| author | marcus <marcus@FreeBSD.org> | 2007-07-09 13:30:36 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2007-07-09 13:30:36 +0800 |
| commit | 27cb583ca1c39b10149856bde3a8666cc50d1892 (patch) | |
| tree | 6da3132b49a87973f3f1db42c90c9d6b65271114 /audio | |
| parent | 350cc737b149bbc5c00a5a21fd3c291c871c97d2 (diff) | |
| download | freebsd-ports-gnome-27cb583ca1c39b10149856bde3a8666cc50d1892.tar.gz freebsd-ports-gnome-27cb583ca1c39b10149856bde3a8666cc50d1892.tar.zst freebsd-ports-gnome-27cb583ca1c39b10149856bde3a8666cc50d1892.zip | |
Fix the build and some possible functionality issues on 64-bit platforms.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/pulseaudio/Makefile | 1 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_atomic.h | 6 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index c6ac986c61a8..bf4ea75365fc 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -8,6 +8,7 @@ PORTNAME= pulseaudio PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ diff --git a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h index e52a427875e7..086d5feef67e 100644 --- a/audio/pulseaudio/files/patch-src_pulsecore_atomic.h +++ b/audio/pulseaudio/files/patch-src_pulsecore_atomic.h @@ -70,7 +70,7 @@ 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 ++#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); @@ -79,7 +79,7 @@ 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 ++#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); @@ -88,7 +88,7 @@ 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 ++#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); diff --git a/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c index c94541da3d56..96b6ff69bc49 100644 --- a/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c +++ b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c @@ -1,10 +1,11 @@ ---- 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 @@ +--- 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> |