From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 11 Nov 2022 15:32:30 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1otV54-004IWi-6m for lore@lore.pengutronix.de; Fri, 11 Nov 2022 15:32:30 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1otV52-0000KD-BH; Fri, 11 Nov 2022 15:32:28 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1otV3z-0006qK-34; Fri, 11 Nov 2022 15:31:23 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1otV3x-003fcB-HL; Fri, 11 Nov 2022 15:31:22 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1otV3x-003kb9-LV; Fri, 11 Nov 2022 15:31:21 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 11 Nov 2022 15:31:21 +0100 Message-Id: <20221111143121.894046-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221101132352.3729560-1-m.tretter@pengutronix.de> References: <20221101132352.3729560-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] pipewire: allow to enable libcamera plugin X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 1be36f8658df38148553a079efe4a77f4a1430b2. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:21 +0100, Michael Tretter 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 > Message-Id: <20221101132352.3729560-1-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 \