Fix for high CPU usage of audio/pulseaudio

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

Hi,

The patch from Onno van der Linden improves audio/pulseaudio.
So its high CPU usage problem is fixed.
Can I commit the patch during freeze?

http://mail-index.netbsd.org/netbsd-users/2015/12/25/msg017535.html

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/Makefile,v
retrieving revision 1.101
diff -u -r1.101 Makefile
--- Makefile	10 Dec 2015 10:54:50 -0000	1.101
+++ Makefile	25 Dec 2015 21:29:19 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.101 2015/12/10 10:54:50 ryoon Exp $
 
 DISTNAME=	pulseaudio-7.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=	.tar.xz
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/distinfo,v
retrieving revision 1.56
diff -u -r1.56 distinfo
--- distinfo	18 Dec 2015 11:21:17 -0000	1.56
+++ distinfo	25 Dec 2015 21:29:19 -0000
@@ -9,7 +9,7 @@
 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
 SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
 SHA1 (patch-src_daemon_main.c) = 746d520fce6c076d45a6e36730d5345325f19e03
-SHA1 (patch-src_modules_module-detect.c) = 25c803ee2d5addf9dbf522d81bd422dc201d4550
+SHA1 (patch-src_modules_module-detect.c) = e376b088d939abc70425310875882a0daf90dca2
 SHA1 (patch-src_modules_module-solaris.c) = 03ea8912da4bb76294ca23271e47d40a8c9a61a7
 SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
 SHA1 (patch-src_pulsecore_core-util.c) = 186c805ac4083446afe3ce8db5c6157da92871be
Index: patches/patch-src_modules_module-detect.c
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_modules_module-detect.c
--- patches/patch-src_modules_module-detect.c	25 Jun 2014 15:26:40 -0000	1.2
+++ patches/patch-src_modules_module-detect.c	25 Dec 2015 21:29:19 -0000
@@ -2,9 +2,9 @@
 
 Hack to set proper sound device on NetBSD.
 
---- src/modules/module-detect.c.orig	2014-01-23 18:57:55.000000000 +0000
+--- src/modules/module-detect.c.orig	2015-09-10 04:51:41.000000000 +0000
 +++ src/modules/module-detect.c
-@@ -122,6 +122,17 @@ static int detect_oss(pa_core *c, int ju
+@@ -120,6 +120,17 @@ static int detect_oss(pa_core *c, int ju
      FILE *f;
      int n = 0, b = 0;
  
@@ -14,7 +14,7 @@
 + * And only primary sound device will be used (n=1).
 + */
 +    char args[64];
-+    pa_snprintf(args, sizeof(args), "device=/dev/audio");
++    pa_snprintf(args, sizeof(args), "mmap=0 device=/dev/audio");
 +    if (!pa_module_load(c, "module-oss", args))
 +	exit(1);
 +    n = 1;
@@ -22,7 +22,7 @@
      if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
          !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
          !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {
-@@ -173,6 +184,7 @@ static int detect_oss(pa_core *c, int ju
+@@ -171,6 +182,7 @@ static int detect_oss(pa_core *c, int ju
      }
  
      fclose(f);


--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3