Update to 0.9.21.

Fix build on -current properly. [1]

Submitted by:	avl@


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

5 files changed, 46 insertions, 26 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index f2f8f9c65..a5e7bcce2 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/audio/pulseaudio/Makefile,v 1.18 2009/11/20 12:17:14 kwm Exp $
 #
 
 PORTNAME=	pulseaudio
-PORTVERSION=	0.9.20
+PORTVERSION=	0.9.21
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 62db3406c..8529bce24 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.20.tar.gz) = c877d996bb6e13f2d6c36078e84c14f8
-SHA256 (pulseaudio-0.9.20.tar.gz) = 8d6070aa4d57ec224b300f9fad95f529841e55d0edb26587791239ad78875550
-SIZE (pulseaudio-0.9.20.tar.gz) = 2048332
+MD5 (pulseaudio-0.9.21.tar.gz) = 76e623c4c72e2258bc8bdeb1599bad74
+SHA256 (pulseaudio-0.9.21.tar.gz) = 94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
+SIZE (pulseaudio-0.9.21.tar.gz) = 2056896
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
index 261720d6e..21a97d912 100644
--- a/audio/pulseaudio/files/patch-configure
+++ b/audio/pulseaudio/files/patch-configure
@@ -1,35 +1,23 @@
---- configure.orig	2008-07-26 15:15:12.000000000 -0400
-+++ configure	2008-07-26 15:15:35.000000000 -0400
-@@ -2380,7 +2380,6 @@ ac_func_list="$ac_func_list shm_open"
- ac_func_list="$ac_func_list sigaction"
- ac_func_list="$ac_func_list sleep"
- ac_func_list="$ac_func_list sysconf"
--ac_func_list="$ac_func_list pthread_setaffinity_np"
- ac_func_list="$ac_func_list readlink"
- ac_func_list="$ac_func_list ctime_r"
- ac_func_list="$ac_func_list usleep"
-@@ -25321,6 +25321,7 @@ $as_echo_n "checking whether to check fo
+--- configure.orig	2009-11-24 16:31:47.000000000 +0100
++++ configure	2009-11-24 16:32:35.000000000 +0100
+@@ -13586,6 +13586,7 @@
     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
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -18007,7 +18008,7 @@
  
  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; }; }
+-   as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
++#   as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
  
  fi
  
-@@ -32664,9 +32665,9 @@ done
+@@ -18015,9 +18016,9 @@
  
  
     # Win32 does not need the lib and breaks horribly if we try to include it
@@ -40,5 +28,5 @@
 +#       LIBS="$LIBS -latomic_ops"
 +#   fi
  else
-    { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
new file mode 100644
index 000000000..c80737b19
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
@@ -0,0 +1,27 @@
+--- src/tests/rtstutter.c.orig	2009-07-23 15:40:47.000000000 +0200
++++ src/tests/rtstutter.c	2009-11-24 16:26:36.000000000 +0100
+@@ -31,6 +31,11 @@
+ #include <string.h>
+ #include <pthread.h>
+ 
++#ifdef HAVE_PTHREAD_SETAFFINITY_NP 
++#include <sys/param.h>
++#include <sys/cpuset.h> 
++#endif
++
+ #include <pulse/timeval.h>
+ #include <pulse/gccmacro.h>
+ 
+@@ -44,8 +49,12 @@
+ 
+ static void* work(void *p) {
+ #ifdef HAVE_PTHREAD_SETAFFINITY_NP
++#ifdef __FreeBSD__
++    cpuset_t mask;
++#else
+     cpu_set_t mask;
+ #endif
++#endif
+     struct sched_param param;
+ 
+     pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index a8f4206a6..8be114347 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -11,6 +11,7 @@ bin/parecord
 bin/pasuspender
 bin/pax11publish
 bin/pulseaudio
+bin/start-pulseaudio-kde
 bin/start-pulseaudio-x11
 etc/dbus-1/system.d/pulseaudio-system.conf
 @unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
@@ -26,12 +27,14 @@ etc/pulse/default.pa-dist
 etc/pulse/system.pa-dist
 @exec [ -f %B/system.pa ] || cp %B/%f %B/system.pa
 etc/xdg/autostart/pulseaudio.desktop
+etc/xdg/autostart/pulseaudio-kde.desktop
 %%AVAHI%%include/pulse/browser.h
 include/pulse/cdecl.h
 include/pulse/channelmap.h
 include/pulse/context.h
 include/pulse/def.h
 include/pulse/error.h
+include/pulse/ext-device-manager.h
 include/pulse/ext-stream-restore.h
 include/pulse/gccmacro.h
 include/pulse/glib-mainloop.h
@@ -81,6 +84,8 @@ lib/libpulsedsp.a
 lib/libpulsedsp.so
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a