CVS commit: pkgsrc/audio/pulseaudio

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Dec 17 09:42:59 UTC 2020

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile distinfo
        pkgsrc/audio/pulseaudio/patches: patch-src_modules_module-detect.c

Log Message:
pulseaudio: Support more /dev/audio* in OSS module

Bump PKGREVISION for NetBSD binary change.


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/audio/pulseaudio/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.149 pkgsrc/audio/pulseaudio/Makefile:1.150
--- pkgsrc/audio/pulseaudio/Makefile:1.149      Fri Dec  4 04:55:42 2020
+++ pkgsrc/audio/pulseaudio/Makefile    Thu Dec 17 09:42:59 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.149 2020/12/04 04:55:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.150 2020/12/17 09:42:59 ryoon Exp $
 
 DISTNAME=      pulseaudio-13.0
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    audio
 MASTER_SITES=  https://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/audio/pulseaudio/distinfo
diff -u pkgsrc/audio/pulseaudio/distinfo:1.71 pkgsrc/audio/pulseaudio/distinfo:1.72
--- pkgsrc/audio/pulseaudio/distinfo:1.71       Wed Sep 18 14:12:20 2019
+++ pkgsrc/audio/pulseaudio/distinfo    Thu Dec 17 09:42:59 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2019/09/18 14:12:20 ryoon Exp $
+$NetBSD: distinfo,v 1.72 2020/12/17 09:42:59 ryoon Exp $
 
 SHA1 (pulseaudio-13.0.tar.xz) = dd07a49f09821913c5ed1b131ea7f85f27085d0b
 RMD160 (pulseaudio-13.0.tar.xz) = 3f55971ab45045dac6270a2a48ccaf900ae0951f
@@ -6,7 +6,7 @@ SHA512 (pulseaudio-13.0.tar.xz) = d445b8
 Size (pulseaudio-13.0.tar.xz) = 1901768 bytes
 SHA1 (patch-configure.ac) = 6505b474f8d88baecb4638eccb84d3ab6fd56718
 SHA1 (patch-src_Makefile.am) = 5dc602576f0d01498596cf8d1c3f3c12bfb5830b
-SHA1 (patch-src_modules_module-detect.c) = 09cce0611e8a8d793c7636e8d2a76e505ac7f0ef
+SHA1 (patch-src_modules_module-detect.c) = b68923d6adc6640d2eef4b50b54e3f9ec437d042
 SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
 SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb
 SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342

Index: pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c
diff -u pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c:1.5 pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c:1.6
--- pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c:1.5       Fri Jul  6 14:10:15 2018
+++ pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c   Thu Dec 17 09:42:59 2020
@@ -1,30 +1,38 @@
-$NetBSD: patch-src_modules_module-detect.c,v 1.5 2018/07/06 14:10:15 ryoon Exp $
+$NetBSD: patch-src_modules_module-detect.c,v 1.6 2020/12/17 09:42:59 ryoon Exp $
 
 Hack to set proper sound device on NetBSD.
 
---- src/modules/module-detect.c.orig   2018-05-11 11:43:30.000000000 +0000
+--- src/modules/module-detect.c.orig   2019-07-05 00:06:47.000000000 +0000
 +++ src/modules/module-detect.c
-@@ -121,7 +121,19 @@ static int detect_alsa(pa_core *c, int j
+@@ -121,7 +121,27 @@ static int detect_alsa(pa_core *c, int j
  static int detect_oss(pa_core *c, int just_one) {
      FILE *f;
      int n = 0, b = 0;
 +    pa_module *m = NULL;
- 
++
 +#if defined(__NetBSD__)
 +/*
-+ * Assume primary sound device is used (/dev/audio).
-+ * And only primary sound device will be used (n=1).
++ * Use audio and audio0 to audio3 that are enabled by default
++ * under NetBSD.
 + */
 +    char args[64];
+ 
 +    pa_snprintf(args, sizeof(args), "mmap=0 device=/dev/audio");
 +    if (pa_module_load(&m, c, "module-oss", args) < 0)
-+      return 0;
-+    n = 1;
++      return 0;
++
++    for (int i = 0; i < 4; i++) {
++      pa_snprintf(args, sizeof(args), "mmap=0 device=/dev/audio%d", i);
++      if (pa_module_load(&m, c, "module-oss", args) < 0)
++        return i + 1;
++    }
++
++    n = 5;
 +#else /* __linux__ or __FreeBSD__ */
      if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
          !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
          !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {
-@@ -135,7 +147,6 @@ static int detect_oss(pa_core *c, int ju
+@@ -135,7 +155,6 @@ static int detect_oss(pa_core *c, int ju
      while (!feof(f)) {
          char line[256], args[64];
          unsigned device;
@@ -32,7 +40,7 @@ Hack to set proper sound device on NetBS
  
          if (!fgets(line, sizeof(line), f))
              break;
-@@ -174,6 +185,7 @@ static int detect_oss(pa_core *c, int ju
+@@ -174,6 +193,7 @@ static int detect_oss(pa_core *c, int ju
      }
  
      fclose(f);