* [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.40 -> 0.3.42
@ 2021-12-16 10:14 Philipp Zabel
2021-12-16 10:14 ` [ptxdist] [PATCH v2 2/2] pipewire: allow to enable RAOP module Philipp Zabel
2021-12-17 13:27 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.40 -> 0.3.42 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2021-12-16 10:14 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Changes since v1:
- Update to 0.3.42 instead of 0.3.41
---
rules/pipewire.make | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/pipewire.make b/rules/pipewire.make
index 730f79cc3c57..aaf63ece7a48 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
#
# Paths and names
#
-PIPEWIRE_VERSION := 0.3.40
-PIPEWIRE_MD5 := 6a9fd25a010ed6113cb71f29ba2b1f84
+PIPEWIRE_VERSION := 0.3.42
+PIPEWIRE_MD5 := 545440bda38b596d2879f8fd8bbc703e
PIPEWIRE := pipewire-$(PIPEWIRE_VERSION)
PIPEWIRE_SUFFIX := tar.bz2
PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
@@ -70,11 +70,13 @@ PIPEWIRE_CONF_OPT := \
-Dlibpulse=disabled \
-Dlibusb=disabled \
-Dlibv4l2-path= \
+ -Dlv2=disabled \
-Dman=disabled \
-Dpipewire-alsa=enabled \
-Dpipewire-jack=disabled \
-Dpipewire-v4l2=enabled \
-Dpw-cat=enabled \
+ -Draop=disabled \
-Droc=disabled \
-Dsdl2=disabled \
-Dsession-managers= \
--
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] 4+ messages in thread
* [ptxdist] [PATCH v2 2/2] pipewire: allow to enable RAOP module
2021-12-16 10:14 [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.40 -> 0.3.42 Philipp Zabel
@ 2021-12-16 10:14 ` Philipp Zabel
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-12-17 13:27 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.40 -> 0.3.42 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2021-12-16 10:14 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 aaf63ece7a48..629d065db74e 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] 4+ messages in thread
* Re: [ptxdist] [APPLIED] pipewire: version bump 0.3.40 -> 0.3.42
2021-12-16 10:14 [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.40 -> 0.3.42 Philipp Zabel
2021-12-16 10:14 ` [ptxdist] [PATCH v2 2/2] pipewire: allow to enable RAOP module Philipp Zabel
@ 2021-12-17 13:27 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-12-17 13:27 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as f6436850a008d547b599f333cad325bbcb174b34.
Michael
[sent from post-receive hook]
On Fri, 17 Dec 2021 14:27:07 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20211216101442.2704994-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index 730f79cc3c57..aaf63ece7a48 100644
> --- a/rules/pipewire.make
> +++ b/rules/pipewire.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
> #
> # Paths and names
> #
> -PIPEWIRE_VERSION := 0.3.40
> -PIPEWIRE_MD5 := 6a9fd25a010ed6113cb71f29ba2b1f84
> +PIPEWIRE_VERSION := 0.3.42
> +PIPEWIRE_MD5 := 545440bda38b596d2879f8fd8bbc703e
> PIPEWIRE := pipewire-$(PIPEWIRE_VERSION)
> PIPEWIRE_SUFFIX := tar.bz2
> PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
> @@ -70,11 +70,13 @@ PIPEWIRE_CONF_OPT := \
> -Dlibpulse=disabled \
> -Dlibusb=disabled \
> -Dlibv4l2-path= \
> + -Dlv2=disabled \
> -Dman=disabled \
> -Dpipewire-alsa=enabled \
> -Dpipewire-jack=disabled \
> -Dpipewire-v4l2=enabled \
> -Dpw-cat=enabled \
> + -Draop=disabled \
> -Droc=disabled \
> -Dsdl2=disabled \
> -Dsession-managers= \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] pipewire: allow to enable RAOP module
2021-12-16 10:14 ` [ptxdist] [PATCH v2 2/2] pipewire: allow to enable RAOP module Philipp Zabel
@ 2021-12-17 13:27 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-12-17 13:27 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 9aaaf03e40ac99c7c1b2e06438e681dffae431d0.
Michael
[sent from post-receive hook]
On Fri, 17 Dec 2021 14:27:08 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20211216101442.2704994-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 aaf63ece7a48..629d065db74e 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))
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-17 13:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16 10:14 [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.40 -> 0.3.42 Philipp Zabel
2021-12-16 10:14 ` [ptxdist] [PATCH v2 2/2] pipewire: allow to enable RAOP module Philipp Zabel
2021-12-17 13:27 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-12-17 13:27 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.40 -> 0.3.42 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox