CVS commit: pkgsrc/audio/pulseaudio

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sun Jun 23 04:46:21 UTC 2019

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile distinfo
Added Files:
        pkgsrc/audio/pulseaudio/patches: patch-src_pulsecore_shm.c

Log Message:
pulseaudio: handle NetBSD's shm_open(3) path for pa_shm_cleanup().

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/audio/pulseaudio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_shm.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.134 pkgsrc/audio/pulseaudio/Makefile:1.135
--- pkgsrc/audio/pulseaudio/Makefile:1.134      Thu Apr 25 07:32:36 2019
+++ pkgsrc/audio/pulseaudio/Makefile    Sun Jun 23 04:46:20 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.134 2019/04/25 07:32:36 maya Exp $
+# $NetBSD: Makefile,v 1.135 2019/06/23 04:46:20 tsutsui Exp $
 
 DISTNAME=      pulseaudio-12.2
-PKGREVISION=   3
+PKGREVISION=   4
 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.68 pkgsrc/audio/pulseaudio/distinfo:1.69
--- pkgsrc/audio/pulseaudio/distinfo:1.68       Tue Sep 11 16:39:42 2018
+++ pkgsrc/audio/pulseaudio/distinfo    Sun Jun 23 04:46:20 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2018/09/11 16:39:42 jperkin Exp $
+$NetBSD: distinfo,v 1.69 2019/06/23 04:46:20 tsutsui Exp $
 
 SHA1 (pulseaudio-12.2.tar.xz) = 310a6245036a51df6585a7ebfac75b32e073aa88
 RMD160 (pulseaudio-12.2.tar.xz) = 04d389135b61c0b2155ac855dbfe532a5c979323
@@ -10,5 +10,6 @@ SHA1 (patch-src_modules_module-detect.c)
 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
+SHA1 (patch-src_pulsecore_shm.c) = 64224e6b855e2d185b59f8a6067a914f2f4a10ad
 SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
 SHA1 (patch-src_utils_padsp.c) = e893d6848e2a2f6ef0cc11d1b1f5fb51abbc26a7

Added files:

Index: pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_shm.c
diff -u /dev/null pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_shm.c:1.1
--- /dev/null   Sun Jun 23 04:46:21 2019
+++ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_shm.c   Sun Jun 23 04:46:21 2019
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_pulsecore_shm.c,v 1.1 2019/06/23 04:46:21 tsutsui Exp $
+
+- handle NetBSD's shm_open(3) path for pa_shm_cleanup().
+
+--- src/pulsecore/shm.c.orig   2018-07-13 19:06:12.000000000 +0000
++++ src/pulsecore/shm.c
+@@ -72,6 +72,9 @@
+ #elif defined(__sun)
+ #define SHM_PATH "/tmp"
+ #define SHM_ID_LEN 15
++#elif defined(__NetBSD__)
++#define SHM_PATH "/var/shm"
++#define SHM_ID_LEN 18
+ #else
+ #undef SHM_PATH
+ #undef SHM_ID_LEN
+@@ -445,6 +448,8 @@ int pa_shm_cleanup(void) {
+ 
+ #if defined(__sun)
+         if (strncmp(de->d_name, ".SHMDpulse-shm-", SHM_ID_LEN))
++#elif defined(__NetBSD__)
++        if (strncmp(de->d_name, ".shmobj_pulse-shm-", SHM_ID_LEN))
+ #else
+         if (strncmp(de->d_name, "pulse-shm-", SHM_ID_LEN))
+ #endif