share/gnome/ -> share/.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9550 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 361 insertions, 0 deletions

diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
new file mode 100644
index 000000000..32d08b68d
--- /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-browse.pc.in b/audio/pulseaudio/files/patch-libpulse-browse.pc.in
new file mode 100644
index 000000000..96299a084
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse-browse.pc.in
@@ -0,0 +1,11 @@
+--- libpulse-browse.pc.in.orig	Sun Apr 29 19:26:35 2007
++++ libpulse-browse.pc.in	Sun Apr 29 19:26:54 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse-browse
+ Description: PulseAudio Network Browsing API
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse-browse
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-browse
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in b/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
new file mode 100644
index 000000000..8b99e2d57
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse-mainloop-glib.pc.in
@@ -0,0 +1,11 @@
+--- libpulse-mainloop-glib.pc.in.orig	Sun Apr 29 19:27:05 2007
++++ libpulse-mainloop-glib.pc.in	Sun Apr 29 19:27:20 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse-mainloop-glib
+ Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse-mainloop-glib
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-mainloop-glib
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires: libpulse glib-2.0
diff --git a/audio/pulseaudio/files/patch-libpulse-simple.pc.in b/audio/pulseaudio/files/patch-libpulse-simple.pc.in
new file mode 100644
index 000000000..623dbf713
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse-simple.pc.in
@@ -0,0 +1,11 @@
+--- libpulse-simple.pc.in.orig	Sun Apr 29 19:26:00 2007
++++ libpulse-simple.pc.in	Sun Apr 29 19:26:18 2007
+@@ -6,6 +6,6 @@ includedir=${prefix}/include
+ Name: libpulse-simple
+ Description: Simplified Synchronous Client Interface to PulseAudio
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lpulse-simple
+-Cflags: -D_REENTRANT -I${includedir}
++Libs: -L${libdir} @PTHREAD_LIBS@ -lpulse-simple
++Cflags: -D_REENTRANT @PTHREAD_CFLAGS@ -I${includedir}
+ Requires: libpulse
diff --git a/audio/pulseaudio/files/patch-libpulse.pc.in b/audio/pulseaudio/files/patch-libpulse.pc.in
new file mode 100644
index 000000000..85fea12d1
--- /dev/null
+++ b/audio/pulseaudio/files/patch-libpulse.pc.in
@@ -0,0 +1,9 @@
+--- 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 @PTHREAD_LIBS@
+-Cflags: -D_REENTRANT -I${includedir}
++Cflags: -D_REENTRANT -I${includedir} @PTHREAD_CFLAGS@
+ Requires:
diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
new file mode 100644
index 000000000..3d6c892f4
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in
@@ -0,0 +1,11 @@
+--- src/daemon/default.pa.in.orig	Sat Jul 22 11:58:50 2006
++++ src/daemon/default.pa.in	Sat Jul 22 12:22:20 2006
+@@ -60,7 +60,7 @@
+ .nofail
+ 
+ ### Load something to the sample cache
+-load-sample x11-bell /usr/share/sounds/gtk-events/activate.wav
++load-sample x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav
+ #load-sample-dir-lazy /usr/share/sounds/*.wav
+ 
+ ### Load X11 bell module
diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c
new file mode 100644
index 000000000..1b96327a8
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_daemon_main.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000..bee800d5d
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_modules_oss-util.c
@@ -0,0 +1,25 @@
+--- src/modules/oss-util.c.orig	Sun Apr 29 19:53:31 2007
++++ src/modules/oss-util.c	Sun Apr 29 19:55:24 2007
+@@ -40,6 +40,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_pulse_thread-mainloop.c b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
new file mode 100644
index 000000000..314cb6778
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulse_thread-mainloop.c
@@ -0,0 +1,14 @@
+--- src/pulse/thread-mainloop.c.orig	Thu Jul 12 00:01:48 2007
++++ src/pulse/thread-mainloop.c	Thu Jul 12 00:03:32 2007
+@@ -30,6 +30,11 @@
+ #include <signal.h>
+ #include <stdio.h>
+ 
++#ifdef HAVE_PTHREAD
++#include <pthread.h>
++#include <signal.h>
++#endif
++
+ #ifdef HAVE_SYS_POLL_H
+ #include <sys/poll.h>
+ #else
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 000000000..086d5feef
--- /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_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) {
+-    AO_store_full(&a->value, (AO_t) 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) {
+-    return AO_compare_and_swap_full(&a->value, (AO_t) old_p, (AO_t) 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
+ }
+ 
+ #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 000000000..cb91964ad
--- /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 000000000..96b6ff69b
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c
@@ -0,0 +1,13 @@
+--- 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>
+ 
+ #include <pulse/xmalloc.h>
+ 
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
new file mode 100644
index 000000000..e3036c3ee
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c
@@ -0,0 +1,42 @@
+--- src/pulsecore/pstream.c.orig	Wed Jul 11 23:57:46 2007
++++ src/pulsecore/pstream.c	Wed Jul 11 23:57:49 2007
+@@ -178,14 +178,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_mutex_unlock(p->mutex);
+@@ -197,12 +200,13 @@ fail:
+ 
+     p->dead = 1;
+ 
+-    if (p->die_callback)
++    if (p->die_callback) {
++        pa_mutex_unlock(p->mutex);
+         p->die_callback(p, p->die_callback_userdata);
+-
+-    pa_mutex_unlock(p->mutex);
+-
+-    pa_pstream_unref(p);
++    } else {
++        pa_mutex_unlock(p->mutex);
++        pa_pstream_unref(p);
++    }
+ }
+ 
+ static void io_callback(pa_iochannel*io, void *userdata) {
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h b/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
new file mode 100644
index 000000000..c44c4c0e1
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulsecore_refcnt.h
@@ -0,0 +1,11 @@
+--- src/pulsecore/refcnt.h.orig	Wed Jul 11 23:44:24 2007
++++ src/pulsecore/refcnt.h	Wed Jul 11 23:49:59 2007
+@@ -36,7 +36,7 @@
+   pa_atomic_inc(&p->_ref)
+ 
+ #define PA_REFCNT_DEC(p) \
+-  (pa_atomic_dec(&p->_ref)-1)
++  pa_atomic_dec(&p->_ref)
+ 
+ #define PA_REFCNT_VALUE(p) \
+   pa_atomic_load(&p->_ref)
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
new file mode 100644
index 000000000..9c501dd4b
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
@@ -0,0 +1,10 @@
+--- src/pulsecore/shm.c.orig	Thu May 17 11:57:56 2007
++++ src/pulsecore/shm.c	Thu May 17 11:58:10 2007
+@@ -50,7 +50,7 @@
+ #define MAX_SHM_SIZE (1024*1024*20)
+ 
+ static char *segment_name(char *fn, size_t l, unsigned id) {
+-    snprintf(fn, l, "/pulse-shm-%u", id);
++    snprintf(fn, l, "/tmp/pulse-shm-%u", id);
+     return fn;
+ }