mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Tretter <m.tretter@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: mtr@pengutronix.de
Subject: [ptxdist] [PATCH] pipewire: allow to enable libcamera plugin
Date: Tue,  1 Nov 2022 14:23:52 +0100	[thread overview]
Message-ID: <20221101132352.3729560-1-m.tretter@pengutronix.de> (raw)

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




             reply	other threads:[~2022-11-01 13:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-01 13:23 Michael Tretter [this message]
2022-11-11 14:31 ` [ptxdist] [APPLIED] " 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=20221101132352.3729560-1-m.tretter@pengutronix.de \
    --to=m.tretter@pengutronix.de \
    --cc=mtr@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