[ptxdist] [PATCH] pipewire: allow to enable libcamera plugin

[ptxdist] [PATCH] pipewire: allow to enable libcamera plugin

[Michael Tretter]

Add a configuration item to enable libcamera support. Make it
configurable to avoid always pulling libcamera as a dependency.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/pipewire.in   | 5 +++++
 rules/pipewire.make | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rules/pipewire.in b/rules/pipewire.in
index e9032674c21a..9d1b920b429e 100644
--- a/rules/pipewire.in
+++ b/rules/pipewire.in
@@ -11,6 +11,7 @@ menuconfig PIPEWIRE
 	select GLIB			if PIPEWIRE_GSTREAMER
 	select GSTREAMER1		if PIPEWIRE_GSTREAMER
 	select GST_PLUGINS_BASE1	if PIPEWIRE_GSTREAMER
+	select LIBCAMERA		if PIPEWIRE_LIBCAMERA
 	select LIBSNDFILE
 	select READLINE			if PIPEWIRE_PW_CTL
 	select NCURSES			if PIPEWIRE_PW_TOP
@@ -49,6 +50,10 @@ config PIPEWIRE_PULSEAUDIO
 	bool
 	prompt "install pulseaudio compatibility service"
 
+config PIPEWIRE_LIBCAMERA
+	bool
+	prompt "build and install libcamera plugin"
+
 config PIPEWIRE_RAOP
 	bool
 	prompt "enable Remote Audio Output Protocol module"
diff --git a/rules/pipewire.make b/rules/pipewire.make
index 838ddc660fc0..3b9e1b51a914 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -71,7 +71,7 @@ PIPEWIRE_CONF_OPT	:= \
 	-Djack=disabled \
 	-Djack-devel=false \
 	-Dlegacy-rtkit=false \
-	-Dlibcamera=disabled \
+	-Dlibcamera=$(call ptx/endis,PTXCONF_PIPEWIRE_LIBCAMERA)d \
 	-Dlibcanberra=disabled \
 	-Dlibjack-path= \
 	-Dlibpulse=disabled \
@@ -145,6 +145,7 @@ PIPEWIRE_SPA_MODULES := \
 	audiomixer/libspa-audiomixer \
 	audiotestsrc/libspa-audiotestsrc \
 	control/libspa-control \
+	$(call ptx/ifdef,PTXCONF_PIPEWIRE_LIBCAMERA,libcamera/libspa-libcamera) \
 	support/libspa-dbus \
 	$(call ptx/ifdef,PTXCONF_PIPEWIRE_SYSTEMD,support/libspa-journal) \
 	support/libspa-support \
-- 
2.30.2

Re: [ptxdist] [APPLIED] pipewire: allow to enable libcamera plugin

[Michael Olbrich]

Thanks, applied as 1be36f8658df38148553a079efe4a77f4a1430b2.

Michael

[sent from post-receive hook]

On Fri, 11 Nov 2022 15:31:21 +0100, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Add a configuration item to enable libcamera support. Make it
> configurable to avoid always pulling libcamera as a dependency.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20221101132352.3729560-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/pipewire.in b/rules/pipewire.in
> index e9032674c21a..9d1b920b429e 100644
> --- a/rules/pipewire.in
> +++ b/rules/pipewire.in
> @@ -11,6 +11,7 @@ menuconfig PIPEWIRE
>  	select GLIB			if PIPEWIRE_GSTREAMER
>  	select GSTREAMER1		if PIPEWIRE_GSTREAMER
>  	select GST_PLUGINS_BASE1	if PIPEWIRE_GSTREAMER
> +	select LIBCAMERA		if PIPEWIRE_LIBCAMERA
>  	select LIBSNDFILE
>  	select READLINE			if PIPEWIRE_PW_CTL
>  	select NCURSES			if PIPEWIRE_PW_TOP
> @@ -49,6 +50,10 @@ config PIPEWIRE_PULSEAUDIO
>  	bool
>  	prompt "install pulseaudio compatibility service"
>  
> +config PIPEWIRE_LIBCAMERA
> +	bool
> +	prompt "build and install libcamera plugin"
> +
>  config PIPEWIRE_RAOP
>  	bool
>  	prompt "enable Remote Audio Output Protocol module"
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index 838ddc660fc0..3b9e1b51a914 100644
> --- a/rules/pipewire.make
> +++ b/rules/pipewire.make
> @@ -71,7 +71,7 @@ PIPEWIRE_CONF_OPT	:= \
>  	-Djack=disabled \
>  	-Djack-devel=false \
>  	-Dlegacy-rtkit=false \
> -	-Dlibcamera=disabled \
> +	-Dlibcamera=$(call ptx/endis,PTXCONF_PIPEWIRE_LIBCAMERA)d \
>  	-Dlibcanberra=disabled \
>  	-Dlibjack-path= \
>  	-Dlibpulse=disabled \
> @@ -145,6 +145,7 @@ PIPEWIRE_SPA_MODULES := \
>  	audiomixer/libspa-audiomixer \
>  	audiotestsrc/libspa-audiotestsrc \
>  	control/libspa-control \
> +	$(call ptx/ifdef,PTXCONF_PIPEWIRE_LIBCAMERA,libcamera/libspa-libcamera) \
>  	support/libspa-dbus \
>  	$(call ptx/ifdef,PTXCONF_PIPEWIRE_SYSTEMD,support/libspa-journal) \
>  	support/libspa-support \