* [ptxdist] [PATCH 2/2] pipewire: allow to enable RAOP module
2021-12-13 13:51 [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.40 -> 0.3.41 Philipp Zabel
@ 2021-12-13 13:51 ` Philipp Zabel
0 siblings, 0 replies; 2+ messages in thread
From: Philipp Zabel @ 2021-12-13 13:51 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/pipewire.in | 5 +++++
rules/pipewire.make | 8 +++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/rules/pipewire.in b/rules/pipewire.in
index 6f8a75276b13..f0a94cab2476 100644
--- a/rules/pipewire.in
+++ b/rules/pipewire.in
@@ -15,6 +15,7 @@ menuconfig PIPEWIRE
select READLINE if PIPEWIRE_PW_CTL
select NCURSES if PIPEWIRE_PW_TOP
select NCURSES_WIDE_CHAR if PIPEWIRE_PW_TOP
+ select OPENSSL if PIPEWIRE_RAOP
select SYSTEMD if PIPEWIRE_SYSTEMD
select UDEV
select UDEV_LIBUDEV
@@ -48,6 +49,10 @@ config PIPEWIRE_PULSEAUDIO
bool
prompt "install pulseaudio compatibility service"
+config PIPEWIRE_RAOP
+ bool
+ prompt "enable Remote Audio Output Protocol module"
+
config PIPEWIRE_SYSTEMD_UNIT
bool
default y
diff --git a/rules/pipewire.make b/rules/pipewire.make
index 0ead34c3d001..9f764c8eaa3d 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -76,7 +76,7 @@ PIPEWIRE_CONF_OPT := \
-Dpipewire-jack=disabled \
-Dpipewire-v4l2=enabled \
-Dpw-cat=enabled \
- -Draop=disabled \
+ -Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \
-Droc=disabled \
-Dsdl2=disabled \
-Dsession-managers= \
@@ -103,7 +103,7 @@ PIPEWIRE_CPPFLAGS = -isystem $(KERNEL_HEADERS_INCLUDE_DIR)
# Target-Install
# ----------------------------------------------------------------------------
-PIPEWIRE_MODULES := \
+PIPEWIRE_MODULES-y := \
access \
adapter \
client-device \
@@ -125,6 +125,8 @@ PIPEWIRE_MODULES := \
spa-node \
spa-node-factory
+PIPEWIRE_MODULES-$(PTXCONF_PIPEWIRE_RAOP) += raop-sink
+
PIPEWIRE_SPA_MODULES := \
alsa/libspa-alsa \
audiomixer/libspa-audiomixer \
@@ -181,7 +183,7 @@ endif
@$(call install_link, pipewire, pw-cat, /usr/bin/pw-play)
@$(call install_link, pipewire, pw-cat, /usr/bin/pw-record)
- @$(foreach module, $(PIPEWIRE_MODULES), \
+ @$(foreach module, $(PIPEWIRE_MODULES-y), \
$(call install_lib, pipewire, 0, 0, 644, \
pipewire-0.3/libpipewire-module-$(module))$(ptx/nl))
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread