mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] pipewire: allow to enable RAOP module
Date: Fri, 17 Dec 2021 14:27:08 +0100	[thread overview]
Message-ID: <20211217132708.3346630-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20211216101442.2704994-2-p.zabel@pengutronix.de>

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


  reply	other threads:[~2021-12-17 13:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2021-12-17 13:27 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.40 -> 0.3.42 Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211217132708.3346630-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=p.zabel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox