From 9b6915182bad2de2492d69e2578542740d6f4357 Mon Sep 17 00:00:00 2001 From: Kevin Bowling Date: Tue, 13 Apr 2021 08:44:59 -0700 Subject: [PATCH] audio/pulseaudio: fix build with ALSA option PR: 252957 Reported by: rhurlin, fluffy Tested by: david@catwhisker.org Fixes: 6dd01d1520ee audio/pulseaudio: update the port to 14.2 --- audio/pulseaudio/pkg-plist | 145 +++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 72 deletions(-) diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index c517247f348b..0cac604707db 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -12,15 +12,6 @@ bin/pax11publish bin/pulseaudio bin/qpaeq bin/start-pulseaudio-x11 -share/bash-completion/completions/pacat -share/bash-completion/completions/pacmd -share/bash-completion/completions/pactl -share/bash-completion/completions/padsp -share/bash-completion/completions/paplay -share/bash-completion/completions/parec -share/bash-completion/completions/parecord -share/bash-completion/completions/pasuspender -share/bash-completion/completions/pulseaudio etc/dbus-1/system.d/pulseaudio-system.conf @sample etc/pulse/client.conf.sample @sample etc/pulse/daemon.conf.sample @@ -71,8 +62,6 @@ lib/libpulse.so lib/libpulse.so.0 lib/libpulse.so.0.23.0 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so -lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so -lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so lib/pulse-%%PULSE_VERSION%%/modules/libcli.so lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so @@ -83,6 +72,7 @@ lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so lib/pulse-%%PULSE_VERSION%%/modules/libraop.so lib/pulse-%%PULSE_VERSION%%/modules/librtp.so %%WEBRTC_AEC%%lib/pulse-%%PULSE_VERSION%%/modules/libwebrtc-util.so +%%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-card.so %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so @@ -93,12 +83,13 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so -lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so lib/pulse-%%PULSE_VERSION%%/modules/module-combine-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so lib/pulse-%%PULSE_VERSION%%/modules/module-dbus-protocol.so lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so +lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so lib/pulse-%%PULSE_VERSION%%/modules/module-equalizer-sink.so @@ -136,8 +127,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.so lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so -lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so +lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.so @@ -181,64 +172,15 @@ man/man5/pulse-cli-syntax.5.gz man/man5/pulse-client.conf.5.gz man/man5/pulse-daemon.conf.5.gz %%GSETTINGS%%share/GConf/gsettings/pulseaudio.convert -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-front-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-headphone-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-headset-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic-always.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-internal-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-linein.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic-line.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-mic.conf.common -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-rear-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-tvtuner.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-video.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input.conf.common -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones-2.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-headphones.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-lineout.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-mono.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker-always.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output-speaker.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-output.conf.common -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-0.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-1.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-2.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-3.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-4.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-5.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-input.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-5-output-chat.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-5-output-game.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-input.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-output-mono.conf -%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-7-output-stereo.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/dell-dock-tb16-usb-audio.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/maudio-fasttrack-pro.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio4dj.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-audio8dj.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-korecontroller.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio10.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-5-usb-audio.conf -%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-7-usb-audio.conf -share/zsh/site-functions/_pulseaudio +share/bash-completion/completions/pacat +share/bash-completion/completions/pacmd +share/bash-completion/completions/pactl +share/bash-completion/completions/padsp +share/bash-completion/completions/paplay +share/bash-completion/completions/parec +share/bash-completion/completions/parecord +share/bash-completion/completions/pasuspender +share/bash-completion/completions/pulseaudio share/locale/af/LC_MESSAGES/pulseaudio.mo share/locale/as/LC_MESSAGES/pulseaudio.mo share/locale/be/LC_MESSAGES/pulseaudio.mo @@ -253,8 +195,8 @@ share/locale/el/LC_MESSAGES/pulseaudio.mo share/locale/es/LC_MESSAGES/pulseaudio.mo share/locale/fi/LC_MESSAGES/pulseaudio.mo share/locale/fr/LC_MESSAGES/pulseaudio.mo -share/locale/gu/LC_MESSAGES/pulseaudio.mo share/locale/gl/LC_MESSAGES/pulseaudio.mo +share/locale/gu/LC_MESSAGES/pulseaudio.mo share/locale/he/LC_MESSAGES/pulseaudio.mo share/locale/hi/LC_MESSAGES/pulseaudio.mo share/locale/hr/LC_MESSAGES/pulseaudio.mo @@ -287,9 +229,68 @@ share/locale/tr/LC_MESSAGES/pulseaudio.mo share/locale/uk/LC_MESSAGES/pulseaudio.mo share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-aux.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-dock-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-fm.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-front-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-headphone-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-headset-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-internal-mic-always.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-internal-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-linein.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-mic-line.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-mic.conf.common +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-rear-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-tvtuner.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input-video.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-input.conf.common +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-headphones-2.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-headphones.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-lineout.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-mono.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-speaker-always.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output-speaker.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/analog-output.conf.common +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-0.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-1.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-2.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-3.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-4.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-5.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-6.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/hdmi-output-7.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/iec958-stereo-input.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/iec958-stereo-output.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/steelseries-arctis-output-chat-common.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/steelseries-arctis-output-game-common.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/usb-gaming-headset-input.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/usb-gaming-headset-output-mono.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/paths/usb-gaming-headset-output-stereo.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/audigy.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/default.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/dell-dock-tb16-usb-audio.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/force-speaker.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/kinect-audio.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/maudio-fasttrack-pro.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-audio4dj.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-audio8dj.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-korecontroller.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktor-audio10.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktor-audio2.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/steelseries-arctis-common-usb-audio.conf +%%ALSA%%%%DATADIR%%/alsa-mixer/profile-sets/usb-gaming-headset.conf share/vala/vapi/libpulse-mainloop-glib.deps share/vala/vapi/libpulse-mainloop-glib.vapi share/vala/vapi/libpulse-simple.deps share/vala/vapi/libpulse-simple.vapi share/vala/vapi/libpulse.deps share/vala/vapi/libpulse.vapi +share/zsh/site-functions/_pulseaudio