multimedia/pipewire: Restore ALSA option

3 files changed, 98 insertions, 4 deletions

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
index 2224ae6f9745..82913a537b20 100644
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pipewire
 DISTVERSION=	1.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -30,10 +30,14 @@ GL_SITE=	https://gitlab.freedesktop.org
 SHEBANG_FILES=	doc/*.py
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		AVAHI DOCS DOXYGEN GSTREAMER JACK LV2 PULSEAUDIO VULKAN X11_BELL
+OPTIONS_DEFINE=		ALSA AVAHI DOCS DOXYGEN GSTREAMER JACK LV2 PULSEAUDIO \
+			VULKAN X11_BELL
 OPTIONS_DEFAULT=	GSTREAMER JACK
 OPTIONS_SUB=		yes
 
+ALSA_MESON_ENABLED=	alsa pipewire-alsa
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+
 AVAHI_DESC=		Automatic service discovery for the Pulseaudio module via Avahi
 AVAHI_IMPLIES=		PULSEAUDIO
 AVAHI_MESON_ENABLED=	avahi
@@ -72,8 +76,7 @@ MESON_ARGS=	-D pw-cat=enabled \
 		-D v4l2=enabled \
 		-D raop=enabled \
 		-D session-managers='[]' \
-		-D alsa=disabled \
-		-D pipewire-alsa=disabled \
+		-D compress-offload=disabled \
 		-D avb=disabled \
 		-D bluez5=disabled \
 		-D man=disabled \
diff --git a/multimedia/pipewire/files/patch-spa_plugins_alsa_alsa-compress-offload-sink.c b/multimedia/pipewire/files/patch-spa_plugins_alsa_alsa-compress-offload-sink.c
new file mode 100644
index 000000000000..c5a6c7713836
--- /dev/null
+++ b/multimedia/pipewire/files/patch-spa_plugins_alsa_alsa-compress-offload-sink.c
@@ -0,0 +1,10 @@
+--- spa/plugins/alsa/alsa-compress-offload-sink.c.orig	2024-10-23 07:44:10 UTC
++++ spa/plugins/alsa/alsa-compress-offload-sink.c
+@@ -7,7 +7,6 @@
+ #include <assert.h>
+ #include <stddef.h>
+ #include <limits.h>
+-#include <linux/version.h>
+ 
+ #include <spa/monitor/device.h>
+ #include <spa/debug/types.h>
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
index 71bfb36805b9..25f5afa59c48 100644
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -24,6 +24,7 @@ bin/pw-profiler
 bin/pw-record
 bin/pw-reserve
 bin/pw-top
+%%ALSA%%bin/spa-acp-tool
 bin/spa-inspect
 bin/spa-json-dump
 bin/spa-monitor
@@ -234,6 +235,8 @@ include/spa-0.2/spa/utils/ringbuffer.h
 include/spa-0.2/spa/utils/string.h
 include/spa-0.2/spa/utils/type-info.h
 include/spa-0.2/spa/utils/type.h
+%%ALSA%%lib/alsa-lib/libasound_module_ctl_pipewire.so
+%%ALSA%%lib/alsa-lib/libasound_module_pcm_pipewire.so
 %%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
 lib/libpipewire-0.3.so
 lib/libpipewire-0.3.so.0
@@ -291,6 +294,7 @@ lib/pipewire-0.3/libpipewire-module-vban-send.so
 %%AVAHI%%lib/pipewire-0.3/libpipewire-module-zeroconf-discover.so
 lib/spa-0.2/aec/libspa-aec-null.so
 lib/spa-0.2/aec/libspa-aec-webrtc.so
+%%ALSA%%lib/spa-0.2/alsa/libspa-alsa.so
 lib/spa-0.2/audioconvert/libspa-audioconvert.so
 lib/spa-0.2/audiomixer/libspa-audiomixer.so
 lib/spa-0.2/audiotestsrc/libspa-audiotestsrc.so
@@ -302,8 +306,85 @@ lib/spa-0.2/v4l2/libspa-v4l2.so
 lib/spa-0.2/videoconvert/libspa-videoconvert.so
 lib/spa-0.2/videotestsrc/libspa-videotestsrc.so
 %%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so
+%%ALSA%%lib/udev/rules.d/90-pipewire-alsa.rules
 libdata/pkgconfig/libpipewire-0.3.pc
 libdata/pkgconfig/libspa-0.2.pc
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-aux.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-dock-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-fm.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-front-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-headphone-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-headset-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-internal-mic-always.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-internal-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-linein.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-mic-line.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-mic.conf.common
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-rear-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-tvtuner.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input-video.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-input.conf.common
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-chat.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-headphones-2.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-headphones.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-lineout.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-mono.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-speaker-always.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output-speaker.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/analog-output.conf.common
+%%ALSA%%share/alsa-card-profile/mixer/paths/audigy-analog-output-mirror.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/audigy-analog-output.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-0.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-1.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-10.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-2.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-3.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-4.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-5.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-6.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-7.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-8.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-9.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/iec958-stereo-input.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/iec958-stereo-output.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-chat-common.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-game-common.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-input.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-output-mono.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-output-stereo.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/virtual-surround-7.1.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/9999-custom.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/analog-only.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/asus-xonar-se.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/audigy.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/default.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/force-speaker-and-int-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/force-speaker.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-120w-g2.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-audio-module.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/kinect-audio.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/maudio-fasttrack-pro.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio4dj.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio8dj.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-komplete-audio6.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-korecontroller.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio10.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio2.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio6.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/sb-omni-surround-5.1.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/sennheiser-gsx.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/simple-headphones-mic.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/texas-instruments-pcm2902.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset.conf
+%%ALSA%%share/alsa/alsa.conf.d/50-pipewire.conf
+%%ALSA%%share/alsa/alsa.conf.d/99-pipewire-default.conf
 share/locale/af/LC_MESSAGES/pipewire.mo
 share/locale/as/LC_MESSAGES/pipewire.mo
 share/locale/be/LC_MESSAGES/pipewire.mo