1 files changed, 8 insertions, 34 deletions
diff --git a/audio/pulseaudio/patches/patch-ac b/audio/pulseaudio/patches/patch-ac
index b380c744324..4635529571d 100644
--- a/audio/pulseaudio/patches/patch-ac
+++ b/audio/pulseaudio/patches/patch-ac
@@ -1,39 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2008/12/24 04:11:17 dsainty Exp $
+$NetBSD: patch-ac,v 1.4 2010/02/01 15:00:20 jmcneill Exp $
 
---- src/tests/rtstutter.c.orig	2008-08-19 17:25:05.000000000 -0400
-+++ src/tests/rtstutter.c	2008-12-23 13:25:08.000000000 -0500
-@@ -42,6 +42,7 @@ static int msec_lower, msec_upper;
- static void* work(void *p) PA_GCC_NORETURN;
+--- src/daemon/start-pulseaudio-x11.in.orig	2010-02-01 14:16:08.000000000 +0000
++++ src/daemon/start-pulseaudio-x11.in
+@@ -21,7 +21,7 @@ set -e
  
- static void* work(void *p) {
-+#if 0
-     cpu_set_t mask;
-     struct sched_param param;
+ [ -z "$PULSE_SERVER" ]
  
-@@ -83,10 +84,11 @@ static void* work(void *p) {
-         } while (now.tv_sec < end.tv_sec ||
-                  (now.tv_sec == end.tv_sec && now.tv_nsec < end.tv_nsec));
-     }
-+#endif
- }
+-@PA_BINARY@ --start "$@"
++@PA_BINARY@ -D "$@"
  
- int main(int argc, char*argv[]) {
--    int n;
-+    int n, ncpus;
+ if [ x"$DISPLAY" != x ] ; then
  
-     srand((unsigned) time(NULL));
- 
-@@ -106,7 +108,12 @@ int main(int argc, char*argv[]) {
- 
-     pa_log_notice("Creating random latencies in the range of %ims to  %ims.", msec_lower, msec_upper);
- 
--    for (n = 1; n < sysconf(_SC_NPROCESSORS_CONF); n++) {
-+#ifdef _SC_NPROCESSORS_CONF
-+    ncpus = sysconf(_SC_NPROCESSORS_CONF);
-+#else
-+    ncpus = 1;
-+#endif
-+    for (n = 1; n < ncpus; n++) {
-         pthread_t t;
-         pa_assert_se(pthread_create(&t, NULL, work, PA_INT_TO_PTR(n)) == 0);
-     }