Fri Jul 30 12:21:06 2021 UTC ()
pulseaudio: Update to 15.0

* Convert to use meson to build.

Changelog:
 1. Notes for end users
     1. Support for LDAC and AptX bluetooth codecs, plus "SBC XQ" (SBC with
        higher-quality parameters)
     2. Support for HFP bluetooth profiles
     3. Support for Bluetooth A2DP AVRCP Absolute Volume
     4. ALSA path configuration files can now be placed in user home directory
     5. module-virtual-surround-sink rewritten
     6. More options for module-jackdbus-detect
     7. Improved hardware support
         1. SteelSeries Arctis 9
         2. HP Thunderbolt Dock 120W G2
         3. Behringer U-Phoria UMC22
         4. OnePlus Type-C Bullets
         5. Sennheiser GSX 1000/1200 PRO
     8. New udev variable: PULSE_MODARGS
     9. max_latency_msec argument added to module-null-source
    10. module-filter-apply can take filter parameters from device properties
    11. module-match can now be loaded multiple times
    12. Improvements to FreeBSD support
    13. Windows support added to Meson
    14. Additional commands for pactl
    15. Card profiles can be set to sticky
 2. Notes for application developers
     1. New API for sending messages from clients to PulseAudio objects
     2. New mechanism for applications to disable shared memory on their
        connection to PulseAudio
 3. Notes for packagers
     1. Autotools build system have been dropped
     2. The startup script can now read additional configuration from the /etc/
        pulse/default.pa.d/ directory
     3. Option to build client library and utilities only
     4. Avoid loading X11 modules on Wayland (GNOME-only for now)
     5. OSS support is now configurable in Meson
     6. Valgrind support is now configurable in Meson


(ryoon)
diff -r1.160 -r1.161 pkgsrc/audio/pulseaudio/Makefile
diff -r1.35 -r1.36 pkgsrc/audio/pulseaudio/PLIST
diff -r1.78 -r1.79 pkgsrc/audio/pulseaudio/distinfo
diff -r1.13 -r1.14 pkgsrc/audio/pulseaudio/options.mk
diff -r1.17 -r0 pkgsrc/audio/pulseaudio/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/patches/patch-meson.build
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h
diff -r1.3 -r0 pkgsrc/audio/pulseaudio/patches/patch-src_Makefile.am
diff -r1.7 -r1.8 pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c
diff -r1.3 -r1.4 pkgsrc/audio/pulseaudio/patches/patch-src_modules_oss_module-oss.c
diff -r1.2 -r1.3 pkgsrc/audio/pulseaudio/patches/patch-src_utils_padsp.c

cvs diff -r1.160 -r1.161 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2021/07/13 16:18:10 1.160
+++ pkgsrc/audio/pulseaudio/Makefile 2021/07/30 12:21:06 1.161
@@ -1,94 +1,94 @@ @@ -1,94 +1,94 @@
1# $NetBSD: Makefile,v 1.160 2021/07/13 16:18:10 schmonz Exp $ 1# $NetBSD: Makefile,v 1.161 2021/07/30 12:21:06 ryoon Exp $
2 2
3DISTNAME= pulseaudio-14.2 3DISTNAME= pulseaudio-15.0
4PKGREVISION= 3 
5CATEGORIES= audio 4CATEGORIES= audio
6MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ 5MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/wiki/Software/PulseAudio 9HOMEPAGE= https://www.freedesktop.org/wiki/Software/PulseAudio
11COMMENT= Sound server for POSIX and Win32 systems 10COMMENT= Sound server for POSIX and Win32 systems
12LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 11LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
13 12
14NOT_FOR_PLATFORM= DragonFly-*-* 13NOT_FOR_PLATFORM= DragonFly-*-*
15 14
16SUBST_CLASSES+= oss 15SUBST_CLASSES+= oss
17SUBST_STAGE.oss= pre-configure 16SUBST_STAGE.oss= pre-configure
18SUBST_MESSAGE.oss= Set OSS device node 17SUBST_MESSAGE.oss= Set OSS device node
19SUBST_FILES.oss+= src/modules/oss/module-oss.c 18SUBST_FILES.oss+= src/modules/oss/module-oss.c
20SUBST_FILES.oss+= src/modules/module-detect.c 19SUBST_FILES.oss+= src/modules/module-detect.c
21SUBST_VARS.oss+= DEVOSSAUDIO 20SUBST_VARS.oss+= DEVOSSAUDIO
22 21
 22SUBST_CLASSES+= egdir
 23SUBST_STAGE.egdir= pre-configure
 24SUBST_MESSAGE.egdir= Set EGDIR for config file installation for pkgsrc
 25SUBST_FILES.egdir+= src/pulse/meson.build
 26SUBST_FILES.egdir+= src/daemon/meson.build
 27SUBST_VARS.egdir+= EGDIR
 28
23# Requires --desktop in msgfmt. 29# Requires --desktop in msgfmt.
24_TOOLS_USE_PKGSRC.msgfmt= yes 30_TOOLS_USE_PKGSRC.msgfmt= yes
25 31
26LIBTOOL_REQD= 2.4 32LIBTOOL_REQD= 2.4
27GCC_REQD+= 4.8 33GCC_REQD+= 4.8
28 34
29USE_LANGUAGES= c c++ 35USE_LANGUAGES= c c++
30USE_LIBTOOL= yes 36USE_LIBTOOL= yes
31USE_PKGLOCALEDIR= yes 37USE_PKGLOCALEDIR= yes
32USE_TOOLS+= aclocal autoheader autoconf automake bash:run gmake gm4 38USE_TOOLS+= bash:run gmake gm4
33USE_TOOLS+= msgfmt perl:build pkg-config 39USE_TOOLS+= msgfmt perl:build pkg-config
34GNU_CONFIGURE= yes 40MESON_ARGS+= -Dtcpwrap=disabled
35CONFIGURE_ARGS+= --disable-tcpwrap 41MESON_ARGS+= --localstatedir=${VARBASE}
36CONFIGURE_ARGS+= --localstatedir=${VARBASE} 42MESON_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
37CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 43MESON_ARGS+= -Dfftw=disabled
38CONFIGURE_ARGS+= --without-fftw 44MESON_ARGS+= -Ddoxygen=false
39CONFIGURE_ENV+= DATADIRNAME=${PKGLOCALEDIR} 45CONFIGURE_ENV+= DATADIRNAME=${PKGLOCALEDIR}
40PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in 46PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in
41PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in 47PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in
42PKGCONFIG_OVERRIDE+= libpulse.pc.in 48PKGCONFIG_OVERRIDE+= libpulse.pc.in
43 49
44TOOL_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser 50TOOL_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
45 51
46REPLACE_BASH+= shell-completion/bash/pulseaudio git-version-gen 52REPLACE_BASH+= shell-completion/bash/pulseaudio git-version-gen
47REPLACE_BASH+= src/utils/pa-info 53REPLACE_BASH+= src/utils/pa-info
48 54
49.include "../../mk/bsd.prefs.mk" 55.include "../../mk/bsd.prefs.mk"
50 56
51# Some tests are incompatible for NetBSD at least 57# Some tests are incompatible for NetBSD at least
52CONFIGURE_ARGS.NetBSD+= --disable-default-build-tests 58.if ${OPSYS} == "NetBSD"
 59MESON_ARGS+= -Dtests=false
 60.endif
53 61
54# broken test for TLS 62# broken test for TLS
55.if ((${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[45].*)) || \ 63.if ((${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[45].*)) || \
56 (${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mclang))) 64 (${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mclang)))
57CONFIGURE_ENV+= ac_cv_tls=none 65CONFIGURE_ENV+= ac_cv_tls=none
58.endif 66.endif
59 67
60# Wrong sys/capability.h assumptions, incompatible implementation: 68# Wrong sys/capability.h assumptions, incompatible implementation:
61CONFIGURE_ARGS.FreeBSD+= --without-caps 
62 69
63CONFIGURE_ENV+= EGDIR=${EGDIR} 70CONFIGURE_ENV+= EGDIR=${EGDIR}
64MAKE_ENV+= EGDIR=${EGDIR} 
65 71
66MAKE_FLAGS+= bashcompletiondir=${PREFIX}/share/bash-completion/completions 72MAKE_FLAGS+= bashcompletiondir=${PREFIX}/share/bash-completion/completions
67 73
68# Disable NEON on NetBSD/aarch64 (does not build with pulseaudio 11.1) 
69# use of q0 register in aarch64 is considered not valid 
70.if !empty(PKGSRC_COMPILER:Mclang) && (${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin") && ${MACHINE_CPU} == "aarch64" 
71CONFIGURE_ARGS+= --disable-neon-opt 
72.endif 
73 
74# Use native atomic ops on NetBSD >= 5.0, otherwise 74# Use native atomic ops on NetBSD >= 5.0, otherwise
75# fallback to libatomic_ops 75# fallback to libatomic_ops
76.if !(${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h)) 76.if !(${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h))
77.include "../../devel/libatomic_ops/buildlink3.mk" 77.include "../../devel/libatomic_ops/buildlink3.mk"
78.endif 78.endif
79 79
80# Version number in patch-configure.ac.must be changed too. 80# Version number in patch-configure.ac.must be changed too.
81PLIST_SUBST+= PULSELIBVER=14.2 81PLIST_SUBST+= PULSELIBVER=15.0
82PLIST_VARS+= alsa bonjour coreaudio evdev oss sun 82PLIST_VARS+= alsa bonjour coreaudio evdev oss sun
83 83
84# Build module-mmkbd-evdev.so under Linux 84# Build module-mmkbd-evdev.so under Linux
85.if ${OPSYS} == "Linux" 85.if ${OPSYS} == "Linux"
86. if exists(/usr/include/linux/input.h) 86. if exists(/usr/include/linux/input.h)
87PLIST.evdev= yes 87PLIST.evdev= yes
88. endif 88. endif
89. if exists(/usr/include/linux/soundcard.h) 89. if exists(/usr/include/linux/soundcard.h)
90PLIST.oss= yes 90PLIST.oss= yes
91. endif 91. endif
92PLIST.alsa= yes 92PLIST.alsa= yes
93.include "../../audio/alsa-lib/buildlink3.mk" 93.include "../../audio/alsa-lib/buildlink3.mk"
94.elif ${OPSYS} == "SunOS" 94.elif ${OPSYS} == "SunOS"
@@ -96,54 +96,57 @@ USE_LANGUAGES+= c99 @@ -96,54 +96,57 @@ USE_LANGUAGES+= c99
96PLIST.sun= yes 96PLIST.sun= yes
97. if ${OS_VERSION} == "5.11" 97. if ${OS_VERSION} == "5.11"
98PLIST.oss= yes 98PLIST.oss= yes
99. endif 99. endif
100.elif ${OPSYS} == "Darwin" 100.elif ${OPSYS} == "Darwin"
101PLIST.bonjour= yes 101PLIST.bonjour= yes
102PLIST.coreaudio= yes 102PLIST.coreaudio= yes
103.else 103.else
104PLIST.oss= yes 104PLIST.oss= yes
105.endif 105.endif
106 106
107.include "options.mk" 107.include "options.mk"
108 108
109LIBS.NetBSD+= ${LIBOSSAUDIO} 109# LIBS is not passed to meson build system. Use LDFLAGS instead.
 110LDFLAGS.NetBSD+= ${LIBOSSAUDIO}
 111
 112# Do not depend on RPATH $ORIGIN.
 113LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulseaudio
 114LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/pulse-${PKGVERSION_NOREV}/modules
110 115
111INSTALLATION_DIRS= share/examples/pulse 116INSTALLATION_DIRS= share/examples/pulse
112 117
113PULSE_USER?= pulse 118PULSE_USER?= pulse
114PULSE_GROUP?= pulse 119PULSE_GROUP?= pulse
115PULSE_GROUP_REALTIME?= pulsert 120PULSE_GROUP_REALTIME?= pulsert
116PULSE_GROUP_ACCESS?= pulseacc 121PULSE_GROUP_ACCESS?= pulseacc
117 122
118BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 123BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
119 124
120PKG_SYSCONFSUBDIR= pulse 125PKG_SYSCONFSUBDIR= pulse
121EGDIR= ${PREFIX}/share/examples/pulseaudio 126EGDIR= ${PREFIX}/share/examples/pulseaudio
122CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf 127CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
123CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf 128CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
124CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa 129CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
125CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa 130CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
126CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \ 131CONF_FILES+= ${EGDIR}/dbus-1/system.d/pulseaudio-system.conf \
127 ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf 132 ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf
128 133
129PKG_GROUPS= ${PULSE_GROUP} 134PKG_GROUPS= ${PULSE_GROUP}
130PKG_GROUPS+= ${PULSE_GROUP_REALTIME} 135PKG_GROUPS+= ${PULSE_GROUP_REALTIME}
131PKG_GROUPS+= ${PULSE_GROUP_ACCESS} 136PKG_GROUPS+= ${PULSE_GROUP_ACCESS}
132PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} 137PKG_USERS= ${PULSE_USER}:${PULSE_GROUP}
133 138
134pre-configure: 139.include "../../devel/meson/build.mk"
135 set -e; cd ${WRKSRC}; \ 
136 aclocal; autoheader; automake -a --foreign -i; autoconf 
137 
138.if ${OPSYS} != Linux && ${OPSYS} != "Darwin" 140.if ${OPSYS} != Linux && ${OPSYS} != "Darwin"
139.include "../../sysutils/consolekit/buildlink3.mk" 141.include "../../sysutils/consolekit/buildlink3.mk"
140.endif 142.endif
141.include "../../audio/libsndfile/buildlink3.mk" 143.include "../../audio/libsndfile/buildlink3.mk"
142.include "../../audio/speexdsp/buildlink3.mk" 144.include "../../audio/speexdsp/buildlink3.mk"
143.include "../../databases/gdbm/buildlink3.mk" 145.include "../../databases/tdb/buildlink3.mk"
 146.include "../../devel/check/buildlink3.mk"
144.include "../../devel/glib2/buildlink3.mk" 147.include "../../devel/glib2/buildlink3.mk"
145.include "../../devel/libltdl/buildlink3.mk" 148.include "../../devel/libltdl/buildlink3.mk"
146.include "../../security/openssl/buildlink3.mk" 149.include "../../security/openssl/buildlink3.mk"
147.include "../../sysutils/dbus/buildlink3.mk" 150.include "../../sysutils/dbus/buildlink3.mk"
148.include "../../mk/oss.buildlink3.mk" 151.include "../../mk/oss.buildlink3.mk"
149.include "../../mk/bsd.pkg.mk" 152.include "../../mk/bsd.pkg.mk"

cvs diff -r1.35 -r1.36 pkgsrc/audio/pulseaudio/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/PLIST 2021/02/02 10:31:31 1.35
+++ pkgsrc/audio/pulseaudio/PLIST 2021/07/30 12:21:06 1.36
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1@comment $NetBSD: PLIST,v 1.35 2021/02/02 10:31:31 markd Exp $ 1@comment $NetBSD: PLIST,v 1.36 2021/07/30 12:21:06 ryoon Exp $
2bin/esdcompat 
3bin/pa-info 2bin/pa-info
4bin/pacat 3bin/pacat
5bin/pacmd 4bin/pacmd
6bin/pactl 5bin/pactl
7${PLIST.oss}bin/padsp 6${PLIST.oss}bin/padsp
8bin/pamon 7bin/pamon
9bin/paplay 8bin/paplay
10bin/parec 9bin/parec
11bin/parecord 10bin/parecord
12bin/pasuspender 11bin/pasuspender
13${PLIST.x11}bin/pax11publish 12${PLIST.x11}bin/pax11publish
14bin/pulseaudio 13bin/pulseaudio
15${PLIST.x11}bin/start-pulseaudio-x11 14${PLIST.x11}bin/start-pulseaudio-x11
@@ -37,265 +36,174 @@ include/pulse/sample.h @@ -37,265 +36,174 @@ include/pulse/sample.h
37include/pulse/scache.h 36include/pulse/scache.h
38include/pulse/simple.h 37include/pulse/simple.h
39include/pulse/stream.h 38include/pulse/stream.h
40include/pulse/subscribe.h 39include/pulse/subscribe.h
41include/pulse/thread-mainloop.h 40include/pulse/thread-mainloop.h
42include/pulse/timeval.h 41include/pulse/timeval.h
43include/pulse/utf8.h 42include/pulse/utf8.h
44include/pulse/util.h 43include/pulse/util.h
45include/pulse/version.h 44include/pulse/version.h
46include/pulse/volume.h 45include/pulse/volume.h
47include/pulse/xmalloc.h 46include/pulse/xmalloc.h
48lib/cmake/PulseAudio/PulseAudioConfig.cmake 47lib/cmake/PulseAudio/PulseAudioConfig.cmake
49lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake 48lib/cmake/PulseAudio/PulseAudioConfigVersion.cmake
50lib/libpulse-mainloop-glib.la 49lib/libpulse-mainloop-glib.so
51lib/libpulse-simple.la 50lib/libpulse-mainloop-glib.so.0
52lib/libpulse.la 51lib/libpulse-mainloop-glib.so.0.0.6
 52lib/libpulse-simple.so
 53lib/libpulse-simple.so.0
 54lib/libpulse-simple.so.0.1.1
 55lib/libpulse.so
 56lib/libpulse.so.0
 57lib/libpulse.so.0.24.0
53lib/pkgconfig/libpulse-mainloop-glib.pc 58lib/pkgconfig/libpulse-mainloop-glib.pc
54lib/pkgconfig/libpulse-simple.pc 59lib/pkgconfig/libpulse-simple.pc
55lib/pkgconfig/libpulse.pc 60lib/pkgconfig/libpulse.pc
56${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/libalsa-util.a 
57${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/libalsa-util.so 61${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/libalsa-util.so
58${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/libavahi-wrap.a 
59${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/libavahi-wrap.so 62${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/libavahi-wrap.so
60lib/pulse-${PULSELIBVER}/modules/libcli.a 63lib/pulse-${PKGVERSION}/modules/libavahi-wrap.so
61lib/pulse-${PULSELIBVER}/modules/libcli.so 64lib/pulse-${PKGVERSION}/modules/libcli.so
62${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/liboss-util.a 
63${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/liboss-util.so 65${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/liboss-util.so
64lib/pulse-${PULSELIBVER}/modules/libprotocol-cli.a 66lib/pulse-${PKGVERSION}/modules/libprotocol-cli.so
65lib/pulse-${PULSELIBVER}/modules/libprotocol-cli.so 67lib/pulse-${PKGVERSION}/modules/libprotocol-http.so
66lib/pulse-${PULSELIBVER}/modules/libprotocol-esound.a 68lib/pulse-${PKGVERSION}/modules/libprotocol-native.so
67lib/pulse-${PULSELIBVER}/modules/libprotocol-esound.so 69lib/pulse-${PKGVERSION}/modules/libprotocol-simple.so
68lib/pulse-${PULSELIBVER}/modules/libprotocol-http.a 70lib/pulse-${PKGVERSION}/modules/libraop.so
69lib/pulse-${PULSELIBVER}/modules/libprotocol-http.so 71lib/pulse-${PKGVERSION}/modules/librtp.so
70lib/pulse-${PULSELIBVER}/modules/libprotocol-native.a 72lib/pulse-${PKGVERSION}/modules/module-allow-passthrough.so
71lib/pulse-${PULSELIBVER}/modules/libprotocol-native.so 
72lib/pulse-${PULSELIBVER}/modules/libprotocol-simple.a 
73lib/pulse-${PULSELIBVER}/modules/libprotocol-simple.so 
74lib/pulse-${PULSELIBVER}/modules/libraop.a 
75lib/pulse-${PULSELIBVER}/modules/libraop.so 
76lib/pulse-${PULSELIBVER}/modules/librtp.a 
77lib/pulse-${PULSELIBVER}/modules/librtp.so 
78lib/pulse-${PULSELIBVER}/modules/module-allow-passthrough.a 
79lib/pulse-${PULSELIBVER}/modules/module-allow-passthrough.so 
80${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-card.a 
81${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-card.so 73${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-card.so
82${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-sink.a 
83${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-sink.so 74${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-sink.so
84${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-source.a 
85${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-source.so 75${PLIST.alsa}lib/pulse-${PULSELIBVER}/modules/module-alsa-source.so
86lib/pulse-${PULSELIBVER}/modules/module-always-sink.a 76lib/pulse-${PKGVERSION}/modules/module-always-sink.so
87lib/pulse-${PULSELIBVER}/modules/module-always-sink.so 77lib/pulse-${PKGVERSION}/modules/module-always-source.so
88lib/pulse-${PULSELIBVER}/modules/module-always-source.a 78lib/pulse-${PKGVERSION}/modules/module-augment-properties.so
89lib/pulse-${PULSELIBVER}/modules/module-always-source.so 
90lib/pulse-${PULSELIBVER}/modules/module-augment-properties.a 
91lib/pulse-${PULSELIBVER}/modules/module-augment-properties.so 
92${PLIST.bonjour}lib/pulse-${PULSELIBVER}/modules/module-bonjour-publish.a 
93${PLIST.bonjour}lib/pulse-${PULSELIBVER}/modules/module-bonjour-publish.so 79${PLIST.bonjour}lib/pulse-${PULSELIBVER}/modules/module-bonjour-publish.so
94lib/pulse-${PULSELIBVER}/modules/module-card-restore.a 80lib/pulse-${PKGVERSION}/modules/module-card-restore.so
95lib/pulse-${PULSELIBVER}/modules/module-card-restore.so 81lib/pulse-${PKGVERSION}/modules/module-cli-protocol-tcp.so
96lib/pulse-${PULSELIBVER}/modules/module-cli-protocol-tcp.a 82lib/pulse-${PKGVERSION}/modules/module-cli-protocol-unix.so
97lib/pulse-${PULSELIBVER}/modules/module-cli-protocol-tcp.so 83lib/pulse-${PKGVERSION}/modules/module-cli.so
98lib/pulse-${PULSELIBVER}/modules/module-cli-protocol-unix.a 84lib/pulse-${PKGVERSION}/modules/module-combine-sink.so
99lib/pulse-${PULSELIBVER}/modules/module-cli-protocol-unix.so 85lib/pulse-${PKGVERSION}/modules/module-combine.so
100lib/pulse-${PULSELIBVER}/modules/module-cli.a 86lib/pulse-${PKGVERSION}/modules/module-console-kit.so
101lib/pulse-${PULSELIBVER}/modules/module-cli.so 
102lib/pulse-${PULSELIBVER}/modules/module-combine-sink.a 
103lib/pulse-${PULSELIBVER}/modules/module-combine-sink.so 
104lib/pulse-${PULSELIBVER}/modules/module-combine.a 
105lib/pulse-${PULSELIBVER}/modules/module-combine.so 
106lib/pulse-${PULSELIBVER}/modules/module-console-kit.a 
107lib/pulse-${PULSELIBVER}/modules/module-console-kit.so 
108${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-detect.a 
109${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-detect.so 87${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-detect.so
110${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-device.a 
111${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-device.so 88${PLIST.coreaudio}lib/pulse-${PULSELIBVER}/modules/module-coreaudio-device.so
112lib/pulse-${PULSELIBVER}/modules/module-dbus-protocol.a 89lib/pulse-${PKGVERSION}/modules/module-dbus-protocol.so
113lib/pulse-${PULSELIBVER}/modules/module-dbus-protocol.so 90lib/pulse-${PKGVERSION}/modules/module-default-device-restore.so
114lib/pulse-${PULSELIBVER}/modules/module-default-device-restore.a 91lib/pulse-${PKGVERSION}/modules/module-detect.so
115lib/pulse-${PULSELIBVER}/modules/module-default-device-restore.so 92lib/pulse-${PKGVERSION}/modules/module-device-manager.so
116lib/pulse-${PULSELIBVER}/modules/module-detect.a 93lib/pulse-${PKGVERSION}/modules/module-device-restore.so
117lib/pulse-${PULSELIBVER}/modules/module-detect.so 94lib/pulse-${PKGVERSION}/modules/module-echo-cancel.so
118lib/pulse-${PULSELIBVER}/modules/module-device-manager.a 95lib/pulse-${PKGVERSION}/modules/module-filter-apply.so
119lib/pulse-${PULSELIBVER}/modules/module-device-manager.so 96lib/pulse-${PKGVERSION}/modules/module-filter-heuristics.so
120lib/pulse-${PULSELIBVER}/modules/module-device-restore.a 
121lib/pulse-${PULSELIBVER}/modules/module-device-restore.so 
122lib/pulse-${PULSELIBVER}/modules/module-echo-cancel.a 
123lib/pulse-${PULSELIBVER}/modules/module-echo-cancel.so 
124lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnfd.a 
125lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnfd.so 
126lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnpid.a 
127lib/pulse-${PULSELIBVER}/modules/module-esound-compat-spawnpid.so 
128lib/pulse-${PULSELIBVER}/modules/module-esound-protocol-tcp.a 
129lib/pulse-${PULSELIBVER}/modules/module-esound-protocol-tcp.so 
130lib/pulse-${PULSELIBVER}/modules/module-esound-protocol-unix.a 
131lib/pulse-${PULSELIBVER}/modules/module-esound-protocol-unix.so 
132lib/pulse-${PULSELIBVER}/modules/module-esound-sink.a 
133lib/pulse-${PULSELIBVER}/modules/module-esound-sink.so 
134lib/pulse-${PULSELIBVER}/modules/module-filter-apply.a 
135lib/pulse-${PULSELIBVER}/modules/module-filter-apply.so 
136lib/pulse-${PULSELIBVER}/modules/module-filter-heuristics.a 
137lib/pulse-${PULSELIBVER}/modules/module-filter-heuristics.so 
138${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.a 
139${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.so 97${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.so
140lib/pulse-${PULSELIBVER}/modules/module-http-protocol-tcp.a 98lib/pulse-${PKGVERSION}/modules/module-http-protocol-tcp.so
141lib/pulse-${PULSELIBVER}/modules/module-http-protocol-tcp.so 99lib/pulse-${PKGVERSION}/modules/module-http-protocol-unix.so
142lib/pulse-${PULSELIBVER}/modules/module-http-protocol-unix.a 100lib/pulse-${PKGVERSION}/modules/module-intended-roles.so
143lib/pulse-${PULSELIBVER}/modules/module-http-protocol-unix.so 101lib/pulse-${PKGVERSION}/modules/module-ladspa-sink.so
144lib/pulse-${PULSELIBVER}/modules/module-intended-roles.a 
145lib/pulse-${PULSELIBVER}/modules/module-intended-roles.so 
146lib/pulse-${PULSELIBVER}/modules/module-ladspa-sink.a 
147lib/pulse-${PULSELIBVER}/modules/module-ladspa-sink.so 
148${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.a 
149${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.so 102${PLIST.lirc}lib/pulse-${PULSELIBVER}/modules/module-lirc.so
150lib/pulse-${PULSELIBVER}/modules/module-loopback.a 103lib/pulse-${PKGVERSION}/modules/module-loopback.so
151lib/pulse-${PULSELIBVER}/modules/module-loopback.so 104lib/pulse-${PKGVERSION}/modules/module-match.so
152lib/pulse-${PULSELIBVER}/modules/module-match.a 
153lib/pulse-${PULSELIBVER}/modules/module-match.so 
154${PLIST.evdev}lib/pulse-${PULSELIBVER}/modules/module-mmkbd-evdev.a 
155${PLIST.evdev}lib/pulse-${PULSELIBVER}/modules/module-mmkbd-evdev.so 105${PLIST.evdev}lib/pulse-${PULSELIBVER}/modules/module-mmkbd-evdev.so
156lib/pulse-${PULSELIBVER}/modules/module-native-protocol-fd.a 106lib/pulse-${PKGVERSION}/modules/module-native-protocol-fd.so
157lib/pulse-${PULSELIBVER}/modules/module-native-protocol-fd.so 107lib/pulse-${PKGVERSION}/modules/module-native-protocol-tcp.so
158lib/pulse-${PULSELIBVER}/modules/module-native-protocol-tcp.a 108lib/pulse-${PKGVERSION}/modules/module-native-protocol-unix.so
159lib/pulse-${PULSELIBVER}/modules/module-native-protocol-tcp.so 109lib/pulse-${PKGVERSION}/modules/module-null-sink.so
160lib/pulse-${PULSELIBVER}/modules/module-native-protocol-unix.a 110lib/pulse-${PKGVERSION}/modules/module-null-source.so
161lib/pulse-${PULSELIBVER}/modules/module-native-protocol-unix.so 
162lib/pulse-${PULSELIBVER}/modules/module-null-sink.a 
163lib/pulse-${PULSELIBVER}/modules/module-null-sink.so 
164lib/pulse-${PULSELIBVER}/modules/module-null-source.a 
165lib/pulse-${PULSELIBVER}/modules/module-null-source.so 
166${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/module-oss.a 
167${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/module-oss.so 111${PLIST.oss}lib/pulse-${PULSELIBVER}/modules/module-oss.so
168lib/pulse-${PULSELIBVER}/modules/module-pipe-sink.a 112lib/pulse-${PKGVERSION}/modules/module-pipe-sink.so
169lib/pulse-${PULSELIBVER}/modules/module-pipe-sink.so 113lib/pulse-${PKGVERSION}/modules/module-pipe-source.so
170lib/pulse-${PULSELIBVER}/modules/module-pipe-source.a 114lib/pulse-${PKGVERSION}/modules/module-position-event-sounds.so
171lib/pulse-${PULSELIBVER}/modules/module-pipe-source.so 
172lib/pulse-${PULSELIBVER}/modules/module-position-event-sounds.a 
173lib/pulse-${PULSELIBVER}/modules/module-position-event-sounds.so 
174${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-raop-discover.a 
175${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-raop-discover.so 115${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-raop-discover.so
176lib/pulse-${PULSELIBVER}/modules/module-raop-sink.a 116lib/pulse-${PKGVERSION}/modules/module-raop-sink.so
177lib/pulse-${PULSELIBVER}/modules/module-raop-sink.so 117lib/pulse-${PKGVERSION}/modules/module-remap-sink.so
178lib/pulse-${PULSELIBVER}/modules/module-remap-sink.a 118lib/pulse-${PKGVERSION}/modules/module-remap-source.so
179lib/pulse-${PULSELIBVER}/modules/module-remap-sink.so 119lib/pulse-${PKGVERSION}/modules/module-rescue-streams.so
180lib/pulse-${PULSELIBVER}/modules/module-remap-source.a 120lib/pulse-${PKGVERSION}/modules/module-role-cork.so
181lib/pulse-${PULSELIBVER}/modules/module-remap-source.so 121lib/pulse-${PKGVERSION}/modules/module-role-ducking.so
182lib/pulse-${PULSELIBVER}/modules/module-rescue-streams.a 122lib/pulse-${PKGVERSION}/modules/module-rtp-recv.so
183lib/pulse-${PULSELIBVER}/modules/module-rescue-streams.so 123lib/pulse-${PKGVERSION}/modules/module-rtp-send.so
184lib/pulse-${PULSELIBVER}/modules/module-role-cork.a 124lib/pulse-${PKGVERSION}/modules/module-rygel-media-server.so
185lib/pulse-${PULSELIBVER}/modules/module-role-cork.so 125lib/pulse-${PKGVERSION}/modules/module-simple-protocol-tcp.so
186lib/pulse-${PULSELIBVER}/modules/module-role-ducking.a 126lib/pulse-${PKGVERSION}/modules/module-simple-protocol-unix.so
187lib/pulse-${PULSELIBVER}/modules/module-role-ducking.so 127lib/pulse-${PKGVERSION}/modules/module-sine-source.so
188lib/pulse-${PULSELIBVER}/modules/module-rtp-recv.a 128lib/pulse-${PKGVERSION}/modules/module-sine.so
189lib/pulse-${PULSELIBVER}/modules/module-rtp-recv.so 
190lib/pulse-${PULSELIBVER}/modules/module-rtp-send.a 
191lib/pulse-${PULSELIBVER}/modules/module-rtp-send.so 
192lib/pulse-${PULSELIBVER}/modules/module-rygel-media-server.a 
193lib/pulse-${PULSELIBVER}/modules/module-rygel-media-server.so 
194lib/pulse-${PULSELIBVER}/modules/module-simple-protocol-tcp.a 
195lib/pulse-${PULSELIBVER}/modules/module-simple-protocol-tcp.so 
196lib/pulse-${PULSELIBVER}/modules/module-simple-protocol-unix.a 
197lib/pulse-${PULSELIBVER}/modules/module-simple-protocol-unix.so 
198lib/pulse-${PULSELIBVER}/modules/module-sine-source.a 
199lib/pulse-${PULSELIBVER}/modules/module-sine-source.so 
200lib/pulse-${PULSELIBVER}/modules/module-sine.a 
201lib/pulse-${PULSELIBVER}/modules/module-sine.so 
202${PLIST.sun}lib/pulse-${PULSELIBVER}/modules/module-solaris.a 
203${PLIST.sun}lib/pulse-${PULSELIBVER}/modules/module-solaris.so 129${PLIST.sun}lib/pulse-${PULSELIBVER}/modules/module-solaris.so
204lib/pulse-${PULSELIBVER}/modules/module-stream-restore.a 130lib/pulse-${PKGVERSION}/modules/module-stream-restore.so
205lib/pulse-${PULSELIBVER}/modules/module-stream-restore.so 131lib/pulse-${PKGVERSION}/modules/module-suspend-on-idle.so
206lib/pulse-${PULSELIBVER}/modules/module-suspend-on-idle.a 132lib/pulse-${PKGVERSION}/modules/module-switch-on-connect.so
207lib/pulse-${PULSELIBVER}/modules/module-suspend-on-idle.so 133lib/pulse-${PKGVERSION}/modules/module-switch-on-port-available.so
208lib/pulse-${PULSELIBVER}/modules/module-switch-on-connect.a 134lib/pulse-${PKGVERSION}/modules/module-tunnel-sink-new.so
209lib/pulse-${PULSELIBVER}/modules/module-switch-on-connect.so 135lib/pulse-${PKGVERSION}/modules/module-tunnel-sink.so
210lib/pulse-${PULSELIBVER}/modules/module-switch-on-port-available.a 136lib/pulse-${PKGVERSION}/modules/module-tunnel-source-new.so
211lib/pulse-${PULSELIBVER}/modules/module-switch-on-port-available.so 137lib/pulse-${PKGVERSION}/modules/module-tunnel-source.so
212lib/pulse-${PULSELIBVER}/modules/module-tunnel-sink-new.a 138lib/pulse-${PKGVERSION}/modules/module-virtual-sink.so
213lib/pulse-${PULSELIBVER}/modules/module-tunnel-sink-new.so 139lib/pulse-${PKGVERSION}/modules/module-virtual-source.so
214lib/pulse-${PULSELIBVER}/modules/module-tunnel-sink.a 140lib/pulse-${PKGVERSION}/modules/module-volume-restore.so
215lib/pulse-${PULSELIBVER}/modules/module-tunnel-sink.so 141${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-bell.so
216lib/pulse-${PULSELIBVER}/modules/module-tunnel-source-new.a 142${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-cork-request.so
217lib/pulse-${PULSELIBVER}/modules/module-tunnel-source-new.so 143${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-publish.so
218lib/pulse-${PULSELIBVER}/modules/module-tunnel-source.a 144${PLIST.x11}lib/pulse-${PKGVERSION}/modules/module-x11-xsmp.so
219lib/pulse-${PULSELIBVER}/modules/module-tunnel-source.so 145${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-discover.so
220lib/pulse-${PULSELIBVER}/modules/module-virtual-sink.a 146${PLIST.avahi}lib/pulse-${PKGVERSION}/modules/module-zeroconf-publish.so
221lib/pulse-${PULSELIBVER}/modules/module-virtual-sink.so 147lib/pulseaudio/libpulsecommon-${PKGVERSION}.so
222lib/pulse-${PULSELIBVER}/modules/module-virtual-source.a 148lib/pulseaudio/libpulsecore-${PKGVERSION}.so
223lib/pulse-${PULSELIBVER}/modules/module-virtual-source.so 149${PLIST.oss}lib/pulseaudio/libpulsedsp.so
224lib/pulse-${PULSELIBVER}/modules/module-virtual-surround-sink.a 
225lib/pulse-${PULSELIBVER}/modules/module-virtual-surround-sink.so 
226lib/pulse-${PULSELIBVER}/modules/module-volume-restore.a 
227lib/pulse-${PULSELIBVER}/modules/module-volume-restore.so 
228${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-bell.a 
229${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-bell.so 
230${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-cork-request.a 
231${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-cork-request.so 
232${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-publish.a 
233${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-publish.so 
234${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-xsmp.a 
235${PLIST.x11}lib/pulse-${PULSELIBVER}/modules/module-x11-xsmp.so 
236${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-zeroconf-discover.a 
237${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-zeroconf-discover.so 
238${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-zeroconf-publish.a 
239${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-zeroconf-publish.so 
240lib/pulseaudio/libpulsecommon-${PULSELIBVER}.la 
241lib/pulseaudio/libpulsecore-${PULSELIBVER}.la 
242${PLIST.oss}lib/pulseaudio/libpulsedsp.la 
243${PLIST.gsettings}libexec/pulse/gsettings-helper 150${PLIST.gsettings}libexec/pulse/gsettings-helper
244man/man1/esdcompat.1 
245man/man1/pacat.1 151man/man1/pacat.1
246man/man1/pacmd.1 152man/man1/pacmd.1
247man/man1/pactl.1 153man/man1/pactl.1
248man/man1/padsp.1 154man/man1/padsp.1
249man/man1/pamon.1 155man/man1/pamon.1
250man/man1/paplay.1 156man/man1/paplay.1
251man/man1/parec.1 157man/man1/parec.1
252man/man1/parecord.1 158man/man1/parecord.1
253man/man1/pasuspender.1 159man/man1/pasuspender.1
254man/man1/pax11publish.1 160man/man1/pax11publish.1
255man/man1/pulseaudio.1 161man/man1/pulseaudio.1
256man/man1/start-pulseaudio-x11.1 162man/man1/start-pulseaudio-x11.1
257man/man5/default.pa.5 163man/man5/default.pa.5
258man/man5/pulse-cli-syntax.5 164man/man5/pulse-cli-syntax.5
259man/man5/pulse-client.conf.5 165man/man5/pulse-client.conf.5
260man/man5/pulse-daemon.conf.5 166man/man5/pulse-daemon.conf.5
261${PLIST.gsettings}share/GConf/gsettings/pulseaudio.convert 167${PLIST.gsettings}share/GConf/gsettings/pulseaudio.convert
262share/bash-completion/completions/pacat 168share/bash-completion/completions/pacat
263share/bash-completion/completions/pacmd 169share/bash-completion/completions/pacmd
264share/bash-completion/completions/pactl 170share/bash-completion/completions/pactl
265share/bash-completion/completions/padsp 171share/bash-completion/completions/padsp
266share/bash-completion/completions/paplay 172share/bash-completion/completions/paplay
267share/bash-completion/completions/parec 173share/bash-completion/completions/parec
268share/bash-completion/completions/parecord 174share/bash-completion/completions/parecord
269share/bash-completion/completions/pasuspender 175share/bash-completion/completions/pasuspender
270share/bash-completion/completions/pulseaudio 176share/bash-completion/completions/pulseaudio
 177share/examples/pulseaudio/dbus-1/system.d/pulseaudio-system.conf
271share/examples/pulseaudio/client.conf 178share/examples/pulseaudio/client.conf
272share/examples/pulseaudio/daemon.conf 179share/examples/pulseaudio/daemon.conf
273share/examples/pulseaudio/default.pa 180share/examples/pulseaudio/default.pa
274share/examples/pulseaudio/pulseaudio-system.conf 
275${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop 
276share/examples/pulseaudio/system.pa 181share/examples/pulseaudio/system.pa
277${PLIST.gsettings}share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml 182${PLIST.gsettings}share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml
 183${PLIST.x11}share/examples/pulseaudio/xdg/Xwayland-session.d/00-pulseaudio-x11
 184${PLIST.x11}share/examples/pulseaudio/xdg/autostart/pulseaudio.desktop
278share/locale/af/LC_MESSAGES/pulseaudio.mo 185share/locale/af/LC_MESSAGES/pulseaudio.mo
279share/locale/as/LC_MESSAGES/pulseaudio.mo 186share/locale/as/LC_MESSAGES/pulseaudio.mo
280share/locale/be/LC_MESSAGES/pulseaudio.mo 187share/locale/be/LC_MESSAGES/pulseaudio.mo
281share/locale/bg/LC_MESSAGES/pulseaudio.mo 188share/locale/bg/LC_MESSAGES/pulseaudio.mo
282share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo 189share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
283share/locale/ca/LC_MESSAGES/pulseaudio.mo 190share/locale/ca/LC_MESSAGES/pulseaudio.mo
284share/locale/cs/LC_MESSAGES/pulseaudio.mo 191share/locale/cs/LC_MESSAGES/pulseaudio.mo
285share/locale/da/LC_MESSAGES/pulseaudio.mo 192share/locale/da/LC_MESSAGES/pulseaudio.mo
286share/locale/de/LC_MESSAGES/pulseaudio.mo 193share/locale/de/LC_MESSAGES/pulseaudio.mo
287share/locale/de_CH/LC_MESSAGES/pulseaudio.mo 194share/locale/de_CH/LC_MESSAGES/pulseaudio.mo
288share/locale/el/LC_MESSAGES/pulseaudio.mo 195share/locale/el/LC_MESSAGES/pulseaudio.mo
 196share/locale/eo/LC_MESSAGES/pulseaudio.mo
289share/locale/es/LC_MESSAGES/pulseaudio.mo 197share/locale/es/LC_MESSAGES/pulseaudio.mo
290share/locale/fi/LC_MESSAGES/pulseaudio.mo 198share/locale/fi/LC_MESSAGES/pulseaudio.mo
291share/locale/fr/LC_MESSAGES/pulseaudio.mo 199share/locale/fr/LC_MESSAGES/pulseaudio.mo
292share/locale/gl/LC_MESSAGES/pulseaudio.mo 200share/locale/gl/LC_MESSAGES/pulseaudio.mo
293share/locale/gu/LC_MESSAGES/pulseaudio.mo 201share/locale/gu/LC_MESSAGES/pulseaudio.mo
294share/locale/he/LC_MESSAGES/pulseaudio.mo 202share/locale/he/LC_MESSAGES/pulseaudio.mo
295share/locale/hi/LC_MESSAGES/pulseaudio.mo 203share/locale/hi/LC_MESSAGES/pulseaudio.mo
296share/locale/hr/LC_MESSAGES/pulseaudio.mo 204share/locale/hr/LC_MESSAGES/pulseaudio.mo
297share/locale/hu/LC_MESSAGES/pulseaudio.mo 205share/locale/hu/LC_MESSAGES/pulseaudio.mo
298share/locale/id/LC_MESSAGES/pulseaudio.mo 206share/locale/id/LC_MESSAGES/pulseaudio.mo
299share/locale/it/LC_MESSAGES/pulseaudio.mo 207share/locale/it/LC_MESSAGES/pulseaudio.mo
300share/locale/ja/LC_MESSAGES/pulseaudio.mo 208share/locale/ja/LC_MESSAGES/pulseaudio.mo
301share/locale/kk/LC_MESSAGES/pulseaudio.mo 209share/locale/kk/LC_MESSAGES/pulseaudio.mo
@@ -303,26 +211,27 @@ share/locale/kn/LC_MESSAGES/pulseaudio.m @@ -303,26 +211,27 @@ share/locale/kn/LC_MESSAGES/pulseaudio.m
303share/locale/ko/LC_MESSAGES/pulseaudio.mo 211share/locale/ko/LC_MESSAGES/pulseaudio.mo
304share/locale/lt/LC_MESSAGES/pulseaudio.mo 212share/locale/lt/LC_MESSAGES/pulseaudio.mo
305share/locale/ml/LC_MESSAGES/pulseaudio.mo 213share/locale/ml/LC_MESSAGES/pulseaudio.mo
306share/locale/mr/LC_MESSAGES/pulseaudio.mo 214share/locale/mr/LC_MESSAGES/pulseaudio.mo
307share/locale/nl/LC_MESSAGES/pulseaudio.mo 215share/locale/nl/LC_MESSAGES/pulseaudio.mo
308share/locale/nn/LC_MESSAGES/pulseaudio.mo 216share/locale/nn/LC_MESSAGES/pulseaudio.mo
309share/locale/oc/LC_MESSAGES/pulseaudio.mo 217share/locale/oc/LC_MESSAGES/pulseaudio.mo
310share/locale/or/LC_MESSAGES/pulseaudio.mo 218share/locale/or/LC_MESSAGES/pulseaudio.mo
311share/locale/pa/LC_MESSAGES/pulseaudio.mo 219share/locale/pa/LC_MESSAGES/pulseaudio.mo
312share/locale/pl/LC_MESSAGES/pulseaudio.mo 220share/locale/pl/LC_MESSAGES/pulseaudio.mo
313share/locale/pt/LC_MESSAGES/pulseaudio.mo 221share/locale/pt/LC_MESSAGES/pulseaudio.mo
314share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo 222share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
315share/locale/ru/LC_MESSAGES/pulseaudio.mo 223share/locale/ru/LC_MESSAGES/pulseaudio.mo
 224share/locale/si/LC_MESSAGES/pulseaudio.mo
316share/locale/sk/LC_MESSAGES/pulseaudio.mo 225share/locale/sk/LC_MESSAGES/pulseaudio.mo
317share/locale/sr/LC_MESSAGES/pulseaudio.mo 226share/locale/sr/LC_MESSAGES/pulseaudio.mo
318share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo 227share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
319share/locale/sv/LC_MESSAGES/pulseaudio.mo 228share/locale/sv/LC_MESSAGES/pulseaudio.mo
320share/locale/ta/LC_MESSAGES/pulseaudio.mo 229share/locale/ta/LC_MESSAGES/pulseaudio.mo
321share/locale/te/LC_MESSAGES/pulseaudio.mo 230share/locale/te/LC_MESSAGES/pulseaudio.mo
322share/locale/tr/LC_MESSAGES/pulseaudio.mo 231share/locale/tr/LC_MESSAGES/pulseaudio.mo
323share/locale/uk/LC_MESSAGES/pulseaudio.mo 232share/locale/uk/LC_MESSAGES/pulseaudio.mo
324share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo 233share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
325share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo 234share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
326${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf 235${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf
327${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf 236${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf
328${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf 237${PLIST.alsa}share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf

cvs diff -r1.78 -r1.79 pkgsrc/audio/pulseaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/distinfo 2021/03/30 18:09:45 1.78
+++ pkgsrc/audio/pulseaudio/distinfo 2021/07/30 12:21:06 1.79
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: distinfo,v 1.78 2021/03/30 18:09:45 wiz Exp $ 1$NetBSD: distinfo,v 1.79 2021/07/30 12:21:06 ryoon Exp $
2 2
3SHA1 (pulseaudio-14.2.tar.xz) = 5dfc46595e981f0eb6308d07666f4108a69b2106 3SHA1 (pulseaudio-15.0.tar.xz) = 41e9f001770ccf7b47dc228311a99a09bb579563
4RMD160 (pulseaudio-14.2.tar.xz) = 5e52b8549a0ece2b52df854b5edaa2998c438ccd 4RMD160 (pulseaudio-15.0.tar.xz) = ed6607183e7c137e5df10cee31e1567c76aa6da1
5SHA512 (pulseaudio-14.2.tar.xz) = 196338cbb26c542301b6d0579070dfbcc42e76dc17405f3e216af70519bec2003089b80c573a32d5f96bdab078631ca09ce89998ab7a0a8ffa26955a9bcb3c4a 5SHA512 (pulseaudio-15.0.tar.xz) = 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
6Size (pulseaudio-14.2.tar.xz) = 1951300 bytes 6Size (pulseaudio-15.0.tar.xz) = 1521760 bytes
7SHA1 (patch-configure.ac) = c7088a6cde0898942806a7d0871cf24f16df3cf6 7SHA1 (patch-meson.build) = f5916ceee1e17923073c009778c4d9dd7b3fae74
8SHA1 (patch-src_Makefile.am) = 5d136002c12016a8b451e84103a627685ec403de 8SHA1 (patch-src_daemon_meson.build) = 20f2909ceaea27d43ef2cb5fb228952f8376fb3c
9SHA1 (patch-src_modules_module-detect.c) = 860529fef9a14cbaa3979d985f5fde391b121484 9SHA1 (patch-src_modules_module-detect.c) = 72605c7d9392be7217dab2fbd9ecc85ed02021aa
10SHA1 (patch-src_modules_oss_module-oss.c) = d254f6c346d34470c9e178199c485e929bfd84c5 10SHA1 (patch-src_modules_oss_module-oss.c) = d373b855138a931640be7bf5271a33b402b549e5
11SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb 11SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb
 12SHA1 (patch-src_pulse_meson.build) = 56b5f1d4fc9d617a9bee95f9cbaa8a6d529996e6
 13SHA1 (patch-src_pulsecore_creds.h) = a73c9669e00ff7625bc645c54e45403f20ac389b
12SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342 14SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
13SHA1 (patch-src_pulsecore_shm.c) = c7079e8ac3461f5069e1415a2816784781aaa59c 15SHA1 (patch-src_pulsecore_shm.c) = c7079e8ac3461f5069e1415a2816784781aaa59c
14SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae 16SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
15SHA1 (patch-src_utils_padsp.c) = e893d6848e2a2f6ef0cc11d1b1f5fb51abbc26a7 17SHA1 (patch-src_utils_padsp.c) = 42be17be4dc94e8b96652a9f32a52902af261497

cvs diff -r1.13 -r1.14 pkgsrc/audio/pulseaudio/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/options.mk 2019/10/27 12:44:28 1.13
+++ pkgsrc/audio/pulseaudio/options.mk 2021/07/30 12:21:06 1.14
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: options.mk,v 1.13 2019/10/27 12:44:28 kamil Exp $ 1# $NetBSD: options.mk,v 1.14 2021/07/30 12:21:06 ryoon Exp $
2 2
3.include "../../comms/lirc/available.mk" 3.include "../../comms/lirc/available.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio 5PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio
6PKG_SUPPORTED_OPTIONS= avahi gsettings x11 6PKG_SUPPORTED_OPTIONS= avahi gsettings x11
7.if ${LIRC_AVAILABLE} == "yes" 7.if ${LIRC_AVAILABLE} == "yes"
8PKG_SUPPORTED_OPTIONS+= lirc 8PKG_SUPPORTED_OPTIONS+= lirc
9.endif 9.endif
10PKG_SUGGESTED_OPTIONS= avahi x11 10PKG_SUGGESTED_OPTIONS= avahi x11
11PLIST_VARS+= avahi gsettings x11 lirc 11PLIST_VARS+= avahi gsettings x11 lirc
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15.if !empty(PKG_OPTIONS:Mavahi) 15.if !empty(PKG_OPTIONS:Mavahi)
16.include "../../net/avahi/buildlink3.mk" 16.include "../../net/avahi/buildlink3.mk"
17PLIST.avahi= yes 17PLIST.avahi= yes
18.else 18.else
19CONFIGURE_ARGS+= --disable-avahi 19MESON_ARGS+= -Davahi=disabled
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mgsettings) 22.if !empty(PKG_OPTIONS:Mgsettings)
23PLIST.gsettings= yes 23PLIST.gsettings= yes
24CONFIGURE_ARGS+= --enable-gsettings 24CONFIGURE_ARGS+= --enable-gsettings
25.else 25.else
26CONFIGURE_ARGS+= --disable-gsettings 26CONFIGURE_ARGS+= --disable-gsettings
27.endif 27.endif
28 28
29.if !empty(PKG_OPTIONS:Mlirc) 29.if !empty(PKG_OPTIONS:Mlirc)
30PLIST.lirc= yes 30PLIST.lirc= yes
31CONFIGURE_ARGS+= --enable-lirc 31CONFIGURE_ARGS+= --enable-lirc
32.include "../../comms/lirc/buildlink3.mk" 32.include "../../comms/lirc/buildlink3.mk"

File Deleted: pkgsrc/audio/pulseaudio/patches/Attic/patch-configure.ac

File Added: pkgsrc/audio/pulseaudio/patches/patch-meson.build
$NetBSD: patch-meson.build,v 1.1 2021/07/30 12:21:06 ryoon Exp $

* Non-MS Windows case uses libintl for dgettext.
  Fix build under NetBSD.

--- meson.build.orig	2021-07-27 20:02:27.711868000 +0000
+++ meson.build
@@ -348,7 +349,7 @@ if cc.has_header_symbol('sys/syscall.h',
 endif
 
 if cc.has_function('dgettext')
-  if host_machine.system() != 'windows'
+  if host_machine.system() == 'windows'
     libintl_dep = []
   else
     libintl_dep = cc.find_library('intl')

File Added: pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build
$NetBSD: patch-src_daemon_meson.build,v 1.1 2021/07/30 12:21:06 ryoon Exp $

--- src/daemon/meson.build.orig	2021-07-27 20:02:27.738868200 +0000
+++ src/daemon/meson.build
@@ -52,7 +52,7 @@ if x11_dep.found()
     output : '00-pulseaudio-x11',
     configuration : conf,
     install : true,
-    install_dir : join_paths(sysconfdir, 'xdg', 'Xwayland-session.d'),
+    install_dir : join_paths('@EGDIR@', 'xdg', 'Xwayland-session.d'),
   )
 
   desktop_file = i18n.merge_file(
@@ -61,7 +61,7 @@ if x11_dep.found()
     po_dir : po_dir,
     type : 'desktop',
     install : true,
-    install_dir : join_paths(sysconfdir, 'xdg', 'autostart'),
+    install_dir : join_paths('@EGDIR@', 'xdg', 'autostart'),
   )
 
   desktop_utils = find_program('desktop-file-validate', required: false)
@@ -93,7 +93,7 @@ custom_target('daemon.conf',
   command : [m4, '@INPUT@'],
   build_by_default : true,
   install : true,
-  install_dir : pulsesysconfdir,
+  install_dir : '@EGDIR@',
 )
 
 default_conf = configuration_data()
@@ -117,7 +117,7 @@ custom_target('default.pa',
   command : [m4, '@INPUT@'],
   build_by_default : true,
   install : true,
-  install_dir : pulsesysconfdir,
+  install_dir : '@EGDIR@',
 )
 
 system_conf = configuration_data()
@@ -136,12 +136,12 @@ custom_target('system.pa',
   command : [m4, '@INPUT@'],
   build_by_default : true,
   install : true,
-  install_dir : pulsesysconfdir,
+  install_dir : '@EGDIR@',
 )
 
 if dbus_dep.found()
   install_data('pulseaudio-system.conf',
-    install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
+    install_dir : join_paths('@EGDIR@', 'dbus-1', 'system.d')
   )
 endif
 

File Added: pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build
$NetBSD: patch-src_pulse_meson.build,v 1.1 2021/07/30 12:21:06 ryoon Exp $

--- src/pulse/meson.build.orig	2021-07-27 20:02:27.811869100 +0000
+++ src/pulse/meson.build
@@ -134,5 +134,5 @@ client_conf_file = configure_file(
   input : 'client.conf.in',
   output : 'client.conf',
   configuration : client_conf,
-  install_dir : pulsesysconfdir,
+  install_dir : '@EGDIR@',
 )

File Added: pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h
$NetBSD: patch-src_pulsecore_creds.h,v 1.1 2021/07/30 12:21:06 ryoon Exp $

* Disable ucred for NetBSD.

--- src/pulsecore/creds.h.orig	2021-07-27 20:02:27.821869100 +0000
+++ src/pulsecore/creds.h
@@ -34,7 +34,7 @@
 typedef struct pa_creds pa_creds;
 typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data;
 
-#if defined(SCM_CREDENTIALS) || defined(SCM_CREDS)
+#if (defined(SCM_CREDENTIALS) || defined(SCM_CREDS)) && !defined(__NetBSD__)
 
 #define HAVE_CREDS 1
 

File Deleted: pkgsrc/audio/pulseaudio/patches/Attic/patch-src_Makefile.am

cvs diff -r1.7 -r1.8 pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c 2021/02/20 22:10:39 1.7
+++ pkgsrc/audio/pulseaudio/patches/patch-src_modules_module-detect.c 2021/07/30 12:21:06 1.8
@@ -1,50 +1,51 @@ @@ -1,50 +1,51 @@
1$NetBSD: patch-src_modules_module-detect.c,v 1.7 2021/02/20 22:10:39 ryoon Exp $ 1$NetBSD: patch-src_modules_module-detect.c,v 1.8 2021/07/30 12:21:06 ryoon Exp $
2 2
3Hack to set proper sound device on NetBSD. 3Hack to set proper sound device on NetBSD.
4 4
5--- src/modules/module-detect.c.orig 2019-07-05 00:06:47.000000000 +0000 5--- src/modules/module-detect.c.orig 2021-07-27 20:02:27.767868500 +0000
6+++ src/modules/module-detect.c 6+++ src/modules/module-detect.c
7@@ -121,7 +121,27 @@ static int detect_alsa(pa_core *c, int j 7@@ -121,7 +121,28 @@ static int detect_alsa(pa_core *c, int j
8 static int detect_oss(pa_core *c, int just_one) { 8 static int detect_oss(pa_core *c, int just_one) {
9 FILE *f; 9 FILE *f;
10 int n = 0, b = 0; 10 int n = 0, b = 0;
11+ pa_module *m = NULL; 11+ pa_module *m = NULL;
12+ 12+
13+#if defined(__NetBSD__) 13+#if defined(__NetBSD__)
14+/* 14+/*
15+ * Use audio and audio0 to audio3 that are enabled by default 15+ * Use audio and audio0 to audio3 that are enabled by default
16+ * under NetBSD. 16+ * under NetBSD.
17+ */ 17+ */
18+ char args[64]; 18+ char args[64];
19  19
20+ pa_snprintf(args, sizeof(args), "mmap=0 device=@DEVOSSAUDIO@"); 20+ pa_snprintf(args, sizeof(args), "mmap=0 device=@DEVOSSAUDIO@");
21+ if (pa_module_load(&m, c, "module-oss", args) < 0) 21+ if (pa_module_load(&m, c, "module-oss", args) < 0)
22+ return 0; 22+ return 0;
 23+ n = 1;
23+ 24+
24+ for (int i = 0; i < 4; i++) { 25+ for (int i = 0; i < 4; i++) {
25+ pa_snprintf(args, sizeof(args), "mmap=0 device=@DEVOSSAUDIO@%d", i); 26+ pa_snprintf(args, sizeof(args), "mmap=0 device=@DEVOSSAUDIO@%d", i);
26+ if (pa_module_load(&m, c, "module-oss", args) < 0) 27+ if (pa_module_load(&m, c, "module-oss", args) < 0)
27+ return i + 1; 28+ return n;
 29+ n++;
28+ } 30+ }
29+ 31+
30+ n = 5; 
31+#else /* __linux__ or __FreeBSD__ */ 32+#else /* __linux__ or __FreeBSD__ */
32 if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) && 33 if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) &&
33 !(f = pa_fopen_cloexec("/proc/sndstat", "r")) && 34 !(f = pa_fopen_cloexec("/proc/sndstat", "r")) &&
34 !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) { 35 !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) {
35@@ -135,7 +155,6 @@ static int detect_oss(pa_core *c, int ju 36@@ -135,7 +156,6 @@ static int detect_oss(pa_core *c, int ju
36 while (!feof(f)) { 37 while (!feof(f)) {
37 char line[256], args[64]; 38 char line[256], args[64];
38 unsigned device; 39 unsigned device;
39- pa_module *m = NULL; 40- pa_module *m = NULL;
40  41
41 if (!fgets(line, sizeof(line), f)) 42 if (!fgets(line, sizeof(line), f))
42 break; 43 break;
43@@ -174,6 +193,7 @@ static int detect_oss(pa_core *c, int ju 44@@ -203,6 +223,7 @@ static int detect_oss(pa_core *c, int ju
44 } 45 }
45  46
46 fclose(f); 47 fclose(f);
47+#endif 48+#endif
48 return n; 49 return n;
49 } 50 }
50 #endif 51 #endif

cvs diff -r1.3 -r1.4 pkgsrc/audio/pulseaudio/patches/patch-src_modules_oss_module-oss.c (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/patch-src_modules_oss_module-oss.c 2021/02/20 22:10:39 1.3
+++ pkgsrc/audio/pulseaudio/patches/patch-src_modules_oss_module-oss.c 2021/07/30 12:21:06 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_modules_oss_module-oss.c,v 1.3 2021/02/20 22:10:39 ryoon Exp $ 1$NetBSD: patch-src_modules_oss_module-oss.c,v 1.4 2021/07/30 12:21:06 ryoon Exp $
2 2
3Set DEVOSSAUDIO value to fix default device on NetBSD at least. 3Set DEVOSSAUDIO value to fix default device on NetBSD at least.
4 4
5--- src/modules/oss/module-oss.c.orig 2021-01-16 17:26:36.000000000 +0000 5--- src/modules/oss/module-oss.c.orig 2021-07-27 20:02:27.777868700 +0000
6+++ src/modules/oss/module-oss.c 6+++ src/modules/oss/module-oss.c
7@@ -95,7 +95,7 @@ PA_MODULE_USAGE( 7@@ -95,7 +95,7 @@ PA_MODULE_USAGE(
8 PA_MODULE_DEPRECATED("Please use module-alsa-card instead of module-oss!"); 8 PA_MODULE_DEPRECATED("Please use module-alsa-card instead of module-oss!");
9 #endif 9 #endif
10  10
11-#define DEFAULT_DEVICE "/dev/dsp" 11-#define DEFAULT_DEVICE "/dev/dsp"
12+#define DEFAULT_DEVICE "@DEVOSSAUDIO@" 12+#define DEFAULT_DEVICE "@DEVOSSAUDIO@"
13  13
14 struct userdata { 14 struct userdata {
15 pa_core *core; 15 pa_core *core;

cvs diff -r1.2 -r1.3 pkgsrc/audio/pulseaudio/patches/patch-src_utils_padsp.c (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/patch-src_utils_padsp.c 2018/09/11 16:39:42 1.2
+++ pkgsrc/audio/pulseaudio/patches/patch-src_utils_padsp.c 2021/07/30 12:21:06 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-src_utils_padsp.c,v 1.2 2018/09/11 16:39:42 jperkin Exp $ 1$NetBSD: patch-src_utils_padsp.c,v 1.3 2021/07/30 12:21:06 ryoon Exp $
2 2
3ioctl() takes u_long argument on NetBSD. 3ioctl() takes u_long argument on NetBSD.
4On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs. 4On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs.
5stat() system call has been versioned, use latest version when dlopen()ing. 5stat() system call has been versioned, use latest version when dlopen()ing.
6Try more typical device names. 6Try more typical device names.
7SOUND_PCM_* is not available on SunOS. 7SOUND_PCM_* is not available on SunOS.
8 8
9--- src/utils/padsp.c.orig 2018-07-13 19:06:13.000000000 +0000 9--- src/utils/padsp.c.orig 2021-07-27 20:02:27.853869700 +0000
10+++ src/utils/padsp.c 10+++ src/utils/padsp.c
11@@ -48,6 +48,10 @@ 11@@ -48,6 +48,10 @@
12 #include <linux/sockios.h> 12 #include <linux/sockios.h>
13 #endif 13 #endif
14  14
15+#ifdef __NetBSD__ 15+#ifdef __NetBSD__
16+#include <sys/param.h> 16+#include <sys/param.h>
17+#endif 17+#endif
18+ 18+
19 #include <pulse/pulseaudio.h> 19 #include <pulse/pulseaudio.h>
20 #include <pulse/gccmacro.h> 20 #include <pulse/gccmacro.h>
21 #include <pulsecore/llist.h> 21 #include <pulsecore/llist.h>
22@@ -115,7 +119,11 @@ static pthread_mutex_t func_mutex = PTHR 22@@ -115,7 +119,11 @@ static pthread_mutex_t func_mutex = PTHR
@@ -95,57 +95,31 @@ SOUND_PCM_* is not available on SunOS. @@ -95,57 +95,31 @@ SOUND_PCM_* is not available on SunOS.
95+#if HAVE_DECL_SOUND_PCM_READ_CHANNELS 95+#if HAVE_DECL_SOUND_PCM_READ_CHANNELS
96 case SOUND_PCM_READ_CHANNELS: 96 case SOUND_PCM_READ_CHANNELS:
97 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n"); 97 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n");
98  98
99@@ -2315,7 +2343,7 @@ static int dsp_ioctl(fd_info *i, unsigne 99@@ -2315,7 +2343,7 @@ static int dsp_ioctl(fd_info *i, unsigne
100 break; 100 break;
101 #endif 101 #endif
102  102
103-#ifdef HAVE_DECL_SOUND_PCM_READ_BITS 103-#ifdef HAVE_DECL_SOUND_PCM_READ_BITS
104+#if HAVE_DECL_SOUND_PCM_READ_BITS 104+#if HAVE_DECL_SOUND_PCM_READ_BITS
105 case SOUND_PCM_READ_BITS: 105 case SOUND_PCM_READ_BITS:
106 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n"); 106 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n");
107  107
108@@ -2394,21 +2422,33 @@ fail: 108@@ -2394,7 +2422,7 @@ fail:
109 return ret; 109 return ret;
110 } 110 }
111  111
112-#ifndef __GLIBC__ 112-#if !defined(__GLIBC__) && !defined(__FreeBSD__)
113+/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */ 113+#if !defined(__GLIBC__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
114+#if defined(__NetBSD__) && (__NetBSD_Version__ < 600000000 || \ 
115+ (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) ) 
116+# define OLD_NETBSD_IOCTL_CALL 
117+#endif 
118+ 
119+#if !defined(__GLIBC__) && !defined(__NetBSD__) 
120 int ioctl(int fd, int request, ...) { 114 int ioctl(int fd, int request, ...) {
121+#elif defined(OLD_NETBSD_IOCTL_CALL) 
122+int ioctl(int fd, u_long request, void *_argp) { 
123 #else 115 #else
124 int ioctl(int fd, unsigned long request, ...) { 116 int ioctl(int fd, unsigned long request, ...) {
125 #endif 117@@ -2536,7 +2564,7 @@ int stat(const char *pathname, struct st
126 fd_info *i; 
127+#if !defined(OLD_NETBSD_IOCTL_CALL) 
128 va_list args; 
129+#endif 
130 void *argp; 
131 int r, _errno = 0; 
132  
133 debug(DEBUG_LEVEL_VERBOSE, __FILE__": ioctl()\n"); 
134  
135+#if defined(OLD_NETBSD_IOCTL_CALL) 
136 va_start(args, request); 
137 argp = va_arg(args, void *); 
138 va_end(args); 
139+#endif 
140  
141 if (!function_enter()) { 
142 LOAD_IOCTL_FUNC(); 
143@@ -2536,7 +2576,7 @@ int stat(const char *pathname, struct st 
144 } 118 }
145 #ifdef HAVE_OPEN64 119 #ifdef HAVE_OPEN64
146 #undef stat64 120 #undef stat64
147-#ifdef __GLIBC__ 121-#ifdef __GLIBC__
148+#if defined(__GLIBC__) || defined(__sun) 122+#if defined(__GLIBC__) || defined(__sun)
149 int stat64(const char *pathname, struct stat64 *buf) { 123 int stat64(const char *pathname, struct stat64 *buf) {
150 #else 124 #else
151 int stat64(const char *pathname, struct stat *buf) { 125 int stat64(const char *pathname, struct stat *buf) {