diff options
| author | ryoon <ryoon> | 2015-12-25 23:09:49 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2015-12-25 23:09:49 +0000 |
| commit | b7973ed0c833785dafca6949d148bd5572055405 (patch) | |
| tree | d1d07a244b51a12b0fcd06c60fa8d46d5f7ec495 | |
| parent | 6c63e3d782c0a4108d8c2481b8ff8e91e2e82410 (diff) | |
| download | pkgsrc-b7973ed0c833785dafca6949d148bd5572055405.tar.gz | |
Fix high CPU usage from Onno van der Linden. Bump PKGREVISION
| -rw-r--r-- | audio/pulseaudio/Makefile | 4 | ||||
| -rw-r--r-- | audio/pulseaudio/distinfo | 4 | ||||
| -rw-r--r-- | audio/pulseaudio/patches/patch-src_modules_module-detect.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 6fd5c531764..b4600dcee38 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.101 2015/12/10 10:54:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.102 2015/12/25 23:09:49 ryoon Exp $ DISTNAME= pulseaudio-7.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ EXTRACT_SUFX= .tar.xz diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index d9ac10c1648..fb1bd0e17e3 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2015/12/18 11:21:17 taca Exp $ +$NetBSD: distinfo,v 1.57 2015/12/25 23:09:49 ryoon Exp $ SHA1 (pulseaudio-7.1.tar.xz) = dc35a8aa66c513ac989319e13a18e317d8e432b3 RMD160 (pulseaudio-7.1.tar.xz) = 34e4a7644673d96806234042fc50a6f513b885c9 @@ -9,7 +9,7 @@ SHA1 (patch-configure.ac) = 10f976daa163b985312d4dc29933e87cf2e89c96 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 diff --git a/audio/pulseaudio/patches/patch-src_modules_module-detect.c b/audio/pulseaudio/patches/patch-src_modules_module-detect.c index bc26eb0ff14..876baee1f32 100644 --- a/audio/pulseaudio/patches/patch-src_modules_module-detect.c +++ b/audio/pulseaudio/patches/patch-src_modules_module-detect.c @@ -1,10 +1,10 @@ -$NetBSD: patch-src_modules_module-detect.c,v 1.2 2014/06/25 15:26:40 ryoon Exp $ +$NetBSD: patch-src_modules_module-detect.c,v 1.3 2015/12/25 23:09:49 ryoon Exp $ 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 @@ Hack to set proper sound device on NetBSD. + * 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 @@ Hack to set proper sound device on NetBSD. 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); |