mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

Update to 0.9.6.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2007-07-09 02:59:25 +00:00
parent c9646ec7cf
commit 296115588b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=195258
8 changed files with 211 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/pulseaudio/Makefile
View File

@ -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}/

6
audio/pulseaudio/distinfo
View File

@ -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

36
audio/pulseaudio/files/patch-configure Normal file
View File

@ -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) ####

12
audio/pulseaudio/files/patch-libpulse.pc.in
View File

@ -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:

98
audio/pulseaudio/files/patch-src_pulsecore_atomic.h Normal file
View File

@ -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

49
audio/pulseaudio/files/patch-src_pulsecore_core-util.c Normal file
View File

@ -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;
}

12
audio/pulseaudio/files/patch-src_pulsecore_mutex-posix.c Normal file
View File

@ -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>

9
audio/pulseaudio/pkg-plist
View File

@ -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%%