mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40
@ 2021-11-22 13:33 Philipp Zabel
  2021-11-22 13:33 ` [ptxdist] [PATCH 2/2] media-session: new package Philipp Zabel
  2021-11-25 15:57 ` [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
  0 siblings, 2 replies; 8+ messages in thread
From: Philipp Zabel @ 2021-11-22 13:33 UTC (permalink / raw)
  To: ptxdist

- pipewire-media-session was split out into its own package
- pw-cli now uses readline.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/pipewire.in   |  1 +
 rules/pipewire.make | 25 +++++++++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/rules/pipewire.in b/rules/pipewire.in
index c77dec87276e..2fd3025dfc12 100644
--- a/rules/pipewire.in
+++ b/rules/pipewire.in
@@ -12,6 +12,7 @@ menuconfig PIPEWIRE
 	select GSTREAMER1		if PIPEWIRE_GSTREAMER
 	select GST_PLUGINS_BASE1	if PIPEWIRE_GSTREAMER
 	select LIBSNDFILE
+	select READLINE
 	select SYSTEMD			if PIPEWIRE_SYSTEMD
 	select UDEV
 	select UDEV_LIBUDEV
diff --git a/rules/pipewire.make b/rules/pipewire.make
index 341f7141a6ec..98891cdf60ab 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
 #
 # Paths and names
 #
-PIPEWIRE_VERSION	:= 0.3.37
-PIPEWIRE_MD5		:= 7e69099ca3763761acca33bdc3e28e8d
+PIPEWIRE_VERSION	:= 0.3.40
+PIPEWIRE_MD5		:= 6a9fd25a010ed6113cb71f29ba2b1f84
 PIPEWIRE		:= pipewire-$(PIPEWIRE_VERSION)
 PIPEWIRE_SUFFIX		:= tar.bz2
 PIPEWIRE_URL		:= https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
@@ -53,6 +53,7 @@ PIPEWIRE_CONF_OPT	:= \
 	-Dbluez5-codec-aptx=disabled \
 	-Dbluez5-codec-ldac=disabled \
 	-Dcontrol=enabled \
+	-Ddbus=enabled \
 	-Ddocdir= \
 	-Ddocs=disabled \
 	-Decho-cancel-webrtc=disabled \
@@ -66,15 +67,17 @@ PIPEWIRE_CONF_OPT	:= \
 	-Djack-devel=false \
 	-Dlibcamera=disabled \
 	-Dlibjack-path= \
+	-Dlibv4l2-path= \
 	-Dlibpulse=disabled \
 	-Dlibusb=disabled \
 	-Dman=disabled \
 	-Dpipewire-alsa=enabled \
 	-Dpipewire-jack=disabled \
+	-Dpipewire-v4l2=enabled \
 	-Dpw-cat=enabled \
 	-Droc=disabled \
 	-Dsdl2=disabled \
-	-Dsession-managers=media-session \
+	-Dsession-managers= \
 	-Dsndfile=enabled \
 	-Dspa-plugins=enabled \
 	-Dsupport=enabled \
@@ -144,7 +147,6 @@ $(STATEDIR)/pipewire.targetinstall:
 	@$(call install_lib, pipewire, 0, 0, 644, libpipewire-0.3)
 
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire)
-	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire-media-session)
 ifdef PTXCONF_PIPEWIRE_PULSEAUDIO
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire-pulse)
 endif
@@ -159,6 +161,7 @@ endif
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-mon)
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-profiler)
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-reserve)
+	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-v4l2)
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-acp-tool)
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-inspect)
 	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-json-dump)
@@ -175,6 +178,8 @@ endif
 		$(call install_lib, pipewire, 0, 0, 644, \
 			pipewire-0.3/libpipewire-module-$(module))$(ptx/nl))
 
+	@$(call install_lib, pipewire, 0, 0, 644, pipewire-0.3/v4l2/libpw-v4l2)
+
 	@$(foreach module, $(PIPEWIRE_SPA_MODULES), \
 		$(call install_lib, pipewire, 0, 0, 644, \
 			spa-0.2/$(module))$(ptx/nl))
@@ -192,10 +197,6 @@ endif
 ifdef PTXCONF_PIPEWIRE_PULSEAUDIO
 	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/pipewire-pulse.conf)
 endif
-	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/alsa-monitor.conf)
-	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/bluez-monitor.conf)
-	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/media-session.conf)
-	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/v4l2-monitor.conf)
 
 ifdef PTXCONF_PIPEWIRE_GSTREAMER
 	@$(call install_lib, pipewire, 0, 0, 644, gstreamer-1.0/libgstpipewire)
@@ -203,14 +204,10 @@ endif
 ifdef PTXCONF_PIPEWIRE_SYSTEMD_UNIT_USER
 	@$(call install_alternative, pipewire, 0, 0, 0644, \
 		/usr/lib/systemd/user/pipewire.service)
-	@$(call install_alternative, pipewire, 0, 0, 0644, \
-		/usr/lib/systemd/user/pipewire-media-session.service)
 	@$(call install_alternative, pipewire, 0, 0, 0644, \
 		/usr/lib/systemd/user/pipewire.socket)
 	@$(call install_link, pipewire, ../pipewire.socket, \
 		/usr/lib/systemd/user/sockets.target.wants/pipewire.socket)
-	@$(call install_link, pipewire, ../pipewire-media-session.service, \
-		/usr/lib/systemd/user/pipewire.service.wants/pipewire-media-session.service)
 ifdef PTXCONF_PIPEWIRE_PULSEAUDIO
 	@$(call install_alternative, pipewire, 0, 0, 0644, \
 		/usr/lib/systemd/user/pipewire-pulse.service)
@@ -221,14 +218,10 @@ endif
 ifdef PTXCONF_PIPEWIRE_SYSTEMD_UNIT
 	@$(call install_alternative, pipewire, 0, 0, 0644, \
 		/usr/lib/systemd/system/pipewire.service)
-	@$(call install_alternative, pipewire, 0, 0, 0644, \
-		/usr/lib/systemd/system/pipewire-media-session.service)
 	@$(call install_alternative, pipewire, 0, 0, 0644, \
 		/usr/lib/systemd/system/pipewire.socket)
 	@$(call install_link, pipewire, ../pipewire.socket, \
 		/usr/lib/systemd/system/sockets.target.wants/pipewire.socket)
-	@$(call install_link, pipewire, ../pipewire-media-session.service, \
-		/usr/lib/systemd/system/pipewire.service.wants/pipewire-media-session.service)
 endif
 
 	@$(call install_finish, pipewire)
-- 
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] 8+ messages in thread
* [ptxdist] [PATCH 2/2] media-session: new package
  2021-11-22 13:33 [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
@ 2021-11-22 13:33 ` Philipp Zabel
  2021-11-25 16:11   ` Michael Olbrich
  2021-11-25 15:57 ` [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
  1 sibling, 1 reply; 8+ messages in thread
From: Philipp Zabel @ 2021-11-22 13:33 UTC (permalink / raw)
  To: ptxdist

Starting from PipeWire 0.3.39, pipewire-media-session was split out into
its own standalone package. Include a backported patch to fix build with
systemd system service enabled.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...remove-session-managers-option-check.patch |  32 +++++
 patches/media-session-0.4.1/series            |   1 +
 rules/media-session.in                        |  38 ++++++
 rules/media-session.make                      | 126 ++++++++++++++++++
 4 files changed, 197 insertions(+)
 create mode 100644 patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch
 create mode 100644 patches/media-session-0.4.1/series
 create mode 100644 rules/media-session.in
 create mode 100644 rules/media-session.make

diff --git a/patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch b/patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch
new file mode 100644
index 000000000000..7def21649b0f
--- /dev/null
+++ b/patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch
@@ -0,0 +1,32 @@
+From dfa740175c83e1cd0d815ad423f90872de566437 Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1@gmail.com>
+Date: Wed, 10 Nov 2021 08:54:06 -0700
+Subject: [PATCH] meson: remove session-managers option check.
+
+This option no longer exists and causes a build failure if building
+with the systemd system service enabled.
+---
+ systemd/system/meson.build | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/systemd/system/meson.build b/systemd/system/meson.build
+index ab0d49064986..0e9885b0f39f 100644
+--- a/systemd/system/meson.build
++++ b/systemd/system/meson.build
+@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit
+ systemd_config = configuration_data()
+ systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session')
+ 
+-if get_option('session-managers').contains('media-session')
+-  configure_file(input : 'pipewire-media-session.service.in',
+-               output : 'pipewire-media-session.service',
+-               configuration : systemd_config,
+-               install_dir : systemd_system_services_dir)
+-endif
++configure_file(input : 'pipewire-media-session.service.in',
++             output : 'pipewire-media-session.service',
++             configuration : systemd_config,
++             install_dir : systemd_system_services_dir)
+-- 
+2.30.2
+
diff --git a/patches/media-session-0.4.1/series b/patches/media-session-0.4.1/series
new file mode 100644
index 000000000000..fef1ad945fb8
--- /dev/null
+++ b/patches/media-session-0.4.1/series
@@ -0,0 +1 @@
+0001-meson-remove-session-managers-option-check.patch
diff --git a/rules/media-session.in b/rules/media-session.in
new file mode 100644
index 000000000000..24a9012dec8c
--- /dev/null
+++ b/rules/media-session.in
@@ -0,0 +1,38 @@
+## SECTION=multimedia_libs
+
+menuconfig MEDIA_SESSION
+	tristate
+	select HOST_MESON
+	select DBUS
+	select ALSA_LIB
+	select ALSA_LIB_PCM
+	select ALSA_LIB_UCM
+	select ALSA_LIB_SEQ
+	select PIPEWIRE
+	select PIPEWIRE_SYSTEMD_UNIT		if MEDIA_SESSION_SYSTEMD_UNIT
+	select PIPEWIRE_SYSTEMD_UNIT_USER	if MEDIA_SESSION_SYSTEMD_UNIT_USER
+	select SYSTEMD				if MEDIA_SESSION_SYSTEMD
+	prompt "media-session                 "
+	help
+	  Example session manager for PipeWire
+
+if MEDIA_SESSION
+
+config MEDIA_SESSION_SYSTEMD
+	bool
+
+config MEDIA_SESSION_SYSTEMD_UNIT
+	bool
+	default y
+	depends on INITMETHOD_SYSTEMD
+	select MEDIA_SESSION_SYSTEMD
+	prompt "install systemd system unit file for media-session"
+
+config MEDIA_SESSION_SYSTEMD_UNIT_USER
+	bool
+	default y
+	depends on INITMETHOD_SYSTEMD
+	select MEDIA_SESSION_SYSTEMD
+	prompt "install systemd user unit file for media-session"
+
+endif
diff --git a/rules/media-session.make b/rules/media-session.make
new file mode 100644
index 000000000000..2fac07834e25
--- /dev/null
+++ b/rules/media-session.make
@@ -0,0 +1,126 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2021 by Philipp Zabel <p.zabel@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_MEDIA_SESSION) += media-session
+
+#
+# Paths and names
+#
+MEDIA_SESSION_VERSION	:= 0.4.1
+MEDIA_SESSION_MD5	:= 5f6d9e82330c8102f97b099f5269286f
+MEDIA_SESSION		:= media-session-$(MEDIA_SESSION_VERSION)
+MEDIA_SESSION_SUFFIX	:= tar.bz2
+MEDIA_SESSION_URL	:= \
+	https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(MEDIA_SESSION_VERSION)/$(MEDIA_SESSION).$(MEDIA_SESSION_SUFFIX)
+MEDIA_SESSION_SOURCE	:= $(SRCDIR)/$(MEDIA_SESSION).$(MEDIA_SESSION_SUFFIX)
+MEDIA_SESSION_DIR	:= $(BUILDDIR)/$(MEDIA_SESSION)
+MEDIA_SESSION_LICENSE	:= MIT AND LGPL-2.1-or-later AND GPL-2.0-only
+MEDIA_SESSION_LICENSE_FILES := \
+	file://LICENSE;md5=647cfa0f759d97b208bfb5c1eb912071 \
+	file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+MEDIA_SESSION_CONF_ENV := \
+	PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT=systemdsystemunitdir
+
+#
+# meson
+#
+MEDIA_SESSION_CONF_TOOL	:= meson
+MEDIA_SESSION_CONF_OPT	:= \
+	$(CROSS_MESON_USR) \
+	-Ddocdir= \
+	-Ddocs=disabled \
+	-Dinstalled_tests=disabled \
+	-Dsystemd-system-service=$(call ptx/endis,PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT)d \
+	-Dsystemd-user-service=$(call ptx/endis,PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT_USER)d \
+	-Dsystemd-user-unit-dir= \
+	-Dsystemd=$(call ptx/endis,PTXCONF_MEDIA_SESSION_SYSTEMD)d \
+	-Dtests=disabled \
+	-Dwith-module-sets=
+
+MEDIA_SESSION_CPPFLAGS = -isystem $(KERNEL_HEADERS_INCLUDE_DIR)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+MEDIA_SESSION_MODULES := \
+	access \
+	adapter \
+	client-device \
+	client-node \
+	echo-cancel \
+	filter-chain \
+	link-factory \
+	loopback \
+	metadata \
+	portal \
+	profiler \
+	protocol-native \
+	protocol-pulse \
+	rt \
+	rtkit \
+	session-manager \
+	spa-device \
+	spa-device-factory \
+	spa-node \
+	spa-node-factory
+
+MEDIA_SESSION_SPA_MODULES := \
+	alsa/libspa-alsa \
+	audiomixer/libspa-audiomixer \
+	audiotestsrc/libspa-audiotestsrc \
+	control/libspa-control \
+	support/libspa-dbus \
+	$(call ptx/ifdef,PTXCONF_MEDIA_SESSION_SYSTEMD,support/libspa-journal) \
+	support/libspa-support \
+	v4l2/libspa-v4l2 \
+	videotestsrc/libspa-videotestsrc \
+	volume/libspa-volume
+
+$(STATEDIR)/media-session.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, media-session)
+	@$(call install_fixup, media-session,PRIORITY,optional)
+	@$(call install_fixup, media-session,SECTION,base)
+	@$(call install_fixup, media-session,AUTHOR,"Philipp Zabel <p.zabel@pengutronix.de>")
+	@$(call install_fixup, media-session,DESCRIPTION,missing)
+
+	@$(call install_copy, media-session, 0, 0, 755, -, /usr/bin/pipewire-media-session)
+
+ifdef PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT
+	@$(call install_alternative, media-session, 0, 0, 0644, \
+		/usr/lib/systemd/system/pipewire-media-session.service)
+	@$(call install_link, media-session, ../pipewire-media-session.service, \
+		/usr/lib/systemd/system/pipewire.service.wants/pipewire-media-session.service)
+endif
+ifdef PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT_USER
+	@$(call install_alternative, media-session, 0, 0, 0644, \
+		/usr/lib/systemd/user/pipewire-media-session.service)
+	@$(call install_link, media-session, ../pipewire-media-session.service, \
+		/usr/lib/systemd/user/pipewire.service.wants/pipewire-media-session.service)
+endif
+
+	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/alsa-monitor.conf)
+	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/bluez-monitor.conf)
+	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/media-session.conf)
+	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/v4l2-monitor.conf)
+
+	@$(call install_finish, media-session)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
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] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40
  2021-11-22 13:33 [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
  2021-11-22 13:33 ` [ptxdist] [PATCH 2/2] media-session: new package Philipp Zabel
@ 2021-11-25 15:57 ` Michael Olbrich
  2021-11-26  9:38   ` Philipp Zabel
  1 sibling, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2021-11-25 15:57 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: ptxdist

On Mon, Nov 22, 2021 at 02:33:54PM +0100, Philipp Zabel wrote:
> - pipewire-media-session was split out into its own package
> - pw-cli now uses readline.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/pipewire.in   |  1 +
>  rules/pipewire.make | 25 +++++++++----------------
>  2 files changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/rules/pipewire.in b/rules/pipewire.in
> index c77dec87276e..2fd3025dfc12 100644
> --- a/rules/pipewire.in
> +++ b/rules/pipewire.in
> @@ -12,6 +12,7 @@ menuconfig PIPEWIRE
>  	select GSTREAMER1		if PIPEWIRE_GSTREAMER
>  	select GST_PLUGINS_BASE1	if PIPEWIRE_GSTREAMER
>  	select LIBSNDFILE
> +	select READLINE

Please make pw-cli optional. readline ist GPL-3.0 and that can be a
problem for some people.

Michael

>  	select SYSTEMD			if PIPEWIRE_SYSTEMD
>  	select UDEV
>  	select UDEV_LIBUDEV
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index 341f7141a6ec..98891cdf60ab 100644
> --- a/rules/pipewire.make
> +++ b/rules/pipewire.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
>  #
>  # Paths and names
>  #
> -PIPEWIRE_VERSION	:= 0.3.37
> -PIPEWIRE_MD5		:= 7e69099ca3763761acca33bdc3e28e8d
> +PIPEWIRE_VERSION	:= 0.3.40
> +PIPEWIRE_MD5		:= 6a9fd25a010ed6113cb71f29ba2b1f84
>  PIPEWIRE		:= pipewire-$(PIPEWIRE_VERSION)
>  PIPEWIRE_SUFFIX		:= tar.bz2
>  PIPEWIRE_URL		:= https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
> @@ -53,6 +53,7 @@ PIPEWIRE_CONF_OPT	:= \
>  	-Dbluez5-codec-aptx=disabled \
>  	-Dbluez5-codec-ldac=disabled \
>  	-Dcontrol=enabled \
> +	-Ddbus=enabled \
>  	-Ddocdir= \
>  	-Ddocs=disabled \
>  	-Decho-cancel-webrtc=disabled \
> @@ -66,15 +67,17 @@ PIPEWIRE_CONF_OPT	:= \
>  	-Djack-devel=false \
>  	-Dlibcamera=disabled \
>  	-Dlibjack-path= \
> +	-Dlibv4l2-path= \
>  	-Dlibpulse=disabled \
>  	-Dlibusb=disabled \
>  	-Dman=disabled \
>  	-Dpipewire-alsa=enabled \
>  	-Dpipewire-jack=disabled \
> +	-Dpipewire-v4l2=enabled \
>  	-Dpw-cat=enabled \
>  	-Droc=disabled \
>  	-Dsdl2=disabled \
> -	-Dsession-managers=media-session \
> +	-Dsession-managers= \
>  	-Dsndfile=enabled \
>  	-Dspa-plugins=enabled \
>  	-Dsupport=enabled \
> @@ -144,7 +147,6 @@ $(STATEDIR)/pipewire.targetinstall:
>  	@$(call install_lib, pipewire, 0, 0, 644, libpipewire-0.3)
>  
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire)
> -	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire-media-session)
>  ifdef PTXCONF_PIPEWIRE_PULSEAUDIO
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pipewire-pulse)
>  endif
> @@ -159,6 +161,7 @@ endif
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-mon)
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-profiler)
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-reserve)
> +	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-v4l2)
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-acp-tool)
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-inspect)
>  	@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-json-dump)
> @@ -175,6 +178,8 @@ endif
>  		$(call install_lib, pipewire, 0, 0, 644, \
>  			pipewire-0.3/libpipewire-module-$(module))$(ptx/nl))
>  
> +	@$(call install_lib, pipewire, 0, 0, 644, pipewire-0.3/v4l2/libpw-v4l2)
> +
>  	@$(foreach module, $(PIPEWIRE_SPA_MODULES), \
>  		$(call install_lib, pipewire, 0, 0, 644, \
>  			spa-0.2/$(module))$(ptx/nl))
> @@ -192,10 +197,6 @@ endif
>  ifdef PTXCONF_PIPEWIRE_PULSEAUDIO
>  	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/pipewire-pulse.conf)
>  endif
> -	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/alsa-monitor.conf)
> -	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/bluez-monitor.conf)
> -	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/media-session.conf)
> -	@$(call install_alternative, pipewire, 0, 0, 644, /usr/share/pipewire/media-session.d/v4l2-monitor.conf)
>  
>  ifdef PTXCONF_PIPEWIRE_GSTREAMER
>  	@$(call install_lib, pipewire, 0, 0, 644, gstreamer-1.0/libgstpipewire)
> @@ -203,14 +204,10 @@ endif
>  ifdef PTXCONF_PIPEWIRE_SYSTEMD_UNIT_USER
>  	@$(call install_alternative, pipewire, 0, 0, 0644, \
>  		/usr/lib/systemd/user/pipewire.service)
> -	@$(call install_alternative, pipewire, 0, 0, 0644, \
> -		/usr/lib/systemd/user/pipewire-media-session.service)
>  	@$(call install_alternative, pipewire, 0, 0, 0644, \
>  		/usr/lib/systemd/user/pipewire.socket)
>  	@$(call install_link, pipewire, ../pipewire.socket, \
>  		/usr/lib/systemd/user/sockets.target.wants/pipewire.socket)
> -	@$(call install_link, pipewire, ../pipewire-media-session.service, \
> -		/usr/lib/systemd/user/pipewire.service.wants/pipewire-media-session.service)
>  ifdef PTXCONF_PIPEWIRE_PULSEAUDIO
>  	@$(call install_alternative, pipewire, 0, 0, 0644, \
>  		/usr/lib/systemd/user/pipewire-pulse.service)
> @@ -221,14 +218,10 @@ endif
>  ifdef PTXCONF_PIPEWIRE_SYSTEMD_UNIT
>  	@$(call install_alternative, pipewire, 0, 0, 0644, \
>  		/usr/lib/systemd/system/pipewire.service)
> -	@$(call install_alternative, pipewire, 0, 0, 0644, \
> -		/usr/lib/systemd/system/pipewire-media-session.service)
>  	@$(call install_alternative, pipewire, 0, 0, 0644, \
>  		/usr/lib/systemd/system/pipewire.socket)
>  	@$(call install_link, pipewire, ../pipewire.socket, \
>  		/usr/lib/systemd/system/sockets.target.wants/pipewire.socket)
> -	@$(call install_link, pipewire, ../pipewire-media-session.service, \
> -		/usr/lib/systemd/system/pipewire.service.wants/pipewire-media-session.service)
>  endif
>  
>  	@$(call install_finish, pipewire)
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] media-session: new package
  2021-11-22 13:33 ` [ptxdist] [PATCH 2/2] media-session: new package Philipp Zabel
@ 2021-11-25 16:11   ` Michael Olbrich
  2021-11-26  9:36     ` Philipp Zabel
  0 siblings, 1 reply; 8+ messages in thread
From: Michael Olbrich @ 2021-11-25 16:11 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: ptxdist

On Mon, Nov 22, 2021 at 02:33:55PM +0100, Philipp Zabel wrote:
> Starting from PipeWire 0.3.39, pipewire-media-session was split out into
> its own standalone package. Include a backported patch to fix build with
> systemd system service enabled.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  ...remove-session-managers-option-check.patch |  32 +++++
>  patches/media-session-0.4.1/series            |   1 +
>  rules/media-session.in                        |  38 ++++++
>  rules/media-session.make                      | 126 ++++++++++++++++++
>  4 files changed, 197 insertions(+)
>  create mode 100644 patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch
>  create mode 100644 patches/media-session-0.4.1/series
>  create mode 100644 rules/media-session.in
>  create mode 100644 rules/media-session.make
> 
> diff --git a/patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch b/patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch
> new file mode 100644
> index 000000000000..7def21649b0f
> --- /dev/null
> +++ b/patches/media-session-0.4.1/0001-meson-remove-session-managers-option-check.patch
> @@ -0,0 +1,32 @@
> +From dfa740175c83e1cd0d815ad423f90872de566437 Mon Sep 17 00:00:00 2001
> +From: James Hilliard <james.hilliard1@gmail.com>
> +Date: Wed, 10 Nov 2021 08:54:06 -0700
> +Subject: [PATCH] meson: remove session-managers option check.
> +
> +This option no longer exists and causes a build failure if building
> +with the systemd system service enabled.
> +---
> + systemd/system/meson.build | 10 ++++------
> + 1 file changed, 4 insertions(+), 6 deletions(-)
> +
> +diff --git a/systemd/system/meson.build b/systemd/system/meson.build
> +index ab0d49064986..0e9885b0f39f 100644
> +--- a/systemd/system/meson.build
> ++++ b/systemd/system/meson.build
> +@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit
> + systemd_config = configuration_data()
> + systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session')
> + 
> +-if get_option('session-managers').contains('media-session')
> +-  configure_file(input : 'pipewire-media-session.service.in',
> +-               output : 'pipewire-media-session.service',
> +-               configuration : systemd_config,
> +-               install_dir : systemd_system_services_dir)
> +-endif
> ++configure_file(input : 'pipewire-media-session.service.in',
> ++             output : 'pipewire-media-session.service',
> ++             configuration : systemd_config,
> ++             install_dir : systemd_system_services_dir)
> +-- 
> +2.30.2
> +
> diff --git a/patches/media-session-0.4.1/series b/patches/media-session-0.4.1/series
> new file mode 100644
> index 000000000000..fef1ad945fb8
> --- /dev/null
> +++ b/patches/media-session-0.4.1/series
> @@ -0,0 +1 @@
> +0001-meson-remove-session-managers-option-check.patch
> diff --git a/rules/media-session.in b/rules/media-session.in
> new file mode 100644
> index 000000000000..24a9012dec8c
> --- /dev/null
> +++ b/rules/media-session.in
> @@ -0,0 +1,38 @@
> +## SECTION=multimedia_libs
> +
> +menuconfig MEDIA_SESSION
> +	tristate
> +	select HOST_MESON
> +	select DBUS
> +	select ALSA_LIB
> +	select ALSA_LIB_PCM
> +	select ALSA_LIB_UCM
> +	select ALSA_LIB_SEQ
> +	select PIPEWIRE
> +	select PIPEWIRE_SYSTEMD_UNIT		if MEDIA_SESSION_SYSTEMD_UNIT
> +	select PIPEWIRE_SYSTEMD_UNIT_USER	if MEDIA_SESSION_SYSTEMD_UNIT_USER
> +	select SYSTEMD				if MEDIA_SESSION_SYSTEMD
> +	prompt "media-session                 "
> +	help
> +	  Example session manager for PipeWire
> +
> +if MEDIA_SESSION
> +
> +config MEDIA_SESSION_SYSTEMD
> +	bool
> +
> +config MEDIA_SESSION_SYSTEMD_UNIT
> +	bool
> +	default y
> +	depends on INITMETHOD_SYSTEMD
> +	select MEDIA_SESSION_SYSTEMD
> +	prompt "install systemd system unit file for media-session"
> +
> +config MEDIA_SESSION_SYSTEMD_UNIT_USER
> +	bool
> +	default y
> +	depends on INITMETHOD_SYSTEMD

		&& SYSTEMD_UNITS_USER

> +	select MEDIA_SESSION_SYSTEMD
> +	prompt "install systemd user unit file for media-session"
> +
> +endif
> diff --git a/rules/media-session.make b/rules/media-session.make
> new file mode 100644
> index 000000000000..2fac07834e25
> --- /dev/null
> +++ b/rules/media-session.make
> @@ -0,0 +1,126 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2021 by Philipp Zabel <p.zabel@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_MEDIA_SESSION) += media-session
> +
> +#
> +# Paths and names
> +#
> +MEDIA_SESSION_VERSION	:= 0.4.1
> +MEDIA_SESSION_MD5	:= 5f6d9e82330c8102f97b099f5269286f
> +MEDIA_SESSION		:= media-session-$(MEDIA_SESSION_VERSION)
> +MEDIA_SESSION_SUFFIX	:= tar.bz2
> +MEDIA_SESSION_URL	:= \
> +	https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(MEDIA_SESSION_VERSION)/$(MEDIA_SESSION).$(MEDIA_SESSION_SUFFIX)
> +MEDIA_SESSION_SOURCE	:= $(SRCDIR)/$(MEDIA_SESSION).$(MEDIA_SESSION_SUFFIX)
> +MEDIA_SESSION_DIR	:= $(BUILDDIR)/$(MEDIA_SESSION)
> +MEDIA_SESSION_LICENSE	:= MIT AND LGPL-2.1-or-later AND GPL-2.0-only
> +MEDIA_SESSION_LICENSE_FILES := \
> +	file://LICENSE;md5=647cfa0f759d97b208bfb5c1eb912071 \
> +	file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +MEDIA_SESSION_CONF_ENV := \
> +	PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT=systemdsystemunitdir
> +
> +#
> +# meson
> +#
> +MEDIA_SESSION_CONF_TOOL	:= meson
> +MEDIA_SESSION_CONF_OPT	:= \
> +	$(CROSS_MESON_USR) \
> +	-Ddocdir= \
> +	-Ddocs=disabled \
> +	-Dinstalled_tests=disabled \
> +	-Dsystemd-system-service=$(call ptx/endis,PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT)d \
> +	-Dsystemd-user-service=$(call ptx/endis,PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT_USER)d \
> +	-Dsystemd-user-unit-dir= \
> +	-Dsystemd=$(call ptx/endis,PTXCONF_MEDIA_SESSION_SYSTEMD)d \
> +	-Dtests=disabled \
> +	-Dwith-module-sets=
> +
> +MEDIA_SESSION_CPPFLAGS = -isystem $(KERNEL_HEADERS_INCLUDE_DIR)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +MEDIA_SESSION_MODULES := \

unused?

> +	access \
> +	adapter \
> +	client-device \
> +	client-node \
> +	echo-cancel \
> +	filter-chain \
> +	link-factory \
> +	loopback \
> +	metadata \
> +	portal \
> +	profiler \
> +	protocol-native \
> +	protocol-pulse \
> +	rt \
> +	rtkit \
> +	session-manager \
> +	spa-device \
> +	spa-device-factory \
> +	spa-node \
> +	spa-node-factory
> +
> +MEDIA_SESSION_SPA_MODULES := \

unused?

> +	alsa/libspa-alsa \
> +	audiomixer/libspa-audiomixer \
> +	audiotestsrc/libspa-audiotestsrc \
> +	control/libspa-control \
> +	support/libspa-dbus \
> +	$(call ptx/ifdef,PTXCONF_MEDIA_SESSION_SYSTEMD,support/libspa-journal) \
> +	support/libspa-support \
> +	v4l2/libspa-v4l2 \
> +	videotestsrc/libspa-videotestsrc \
> +	volume/libspa-volume
> +
> +$(STATEDIR)/media-session.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, media-session)
> +	@$(call install_fixup, media-session,PRIORITY,optional)
> +	@$(call install_fixup, media-session,SECTION,base)
> +	@$(call install_fixup, media-session,AUTHOR,"Philipp Zabel <p.zabel@pengutronix.de>")
> +	@$(call install_fixup, media-session,DESCRIPTION,missing)
> +
> +	@$(call install_copy, media-session, 0, 0, 755, -, /usr/bin/pipewire-media-session)
> +
> +ifdef PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT
> +	@$(call install_alternative, media-session, 0, 0, 0644, \
> +		/usr/lib/systemd/system/pipewire-media-session.service)
> +	@$(call install_link, media-session, ../pipewire-media-session.service, \
> +		/usr/lib/systemd/system/pipewire.service.wants/pipewire-media-session.service)
> +endif
> +ifdef PTXCONF_MEDIA_SESSION_SYSTEMD_UNIT_USER
> +	@$(call install_alternative, media-session, 0, 0, 0644, \
> +		/usr/lib/systemd/user/pipewire-media-session.service)
> +	@$(call install_link, media-session, ../pipewire-media-session.service, \
> +		/usr/lib/systemd/user/pipewire.service.wants/pipewire-media-session.service)
> +endif
> +
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/alsa-monitor.conf)
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/bluez-monitor.conf)
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/media-session.conf)
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/v4l2-monitor.conf)

break the lines.

Michael

> +
> +	@$(call install_finish, media-session)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] media-session: new package
  2021-11-25 16:11   ` Michael Olbrich
@ 2021-11-26  9:36     ` Philipp Zabel
  2021-11-26 14:27       ` Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Philipp Zabel @ 2021-11-26  9:36 UTC (permalink / raw)
  To: ptxdist

On Thu, 2021-11-25 at 17:11 +0100, Michael Olbrich wrote:
[...]
> > +	select SYSTEMD				if MEDIA_SESSION_SYSTEMD
[...]
> > +config MEDIA_SESSION_SYSTEMD
> > +	bool
[...]
> 
> > +config MEDIA_SESSION_SYSTEMD_UNIT_USER
> > +	bool
> > +	default y
> > +	depends on INITMETHOD_SYSTEMD
> 
> 		&& SYSTEMD_UNITS_USER

This would cause a dependency loop:

.../rules/systemd.in:3:error: recursive dependency detected!
.../rules/systemd.in:3:	symbol SYSTEMD is selected by MEDIA_SESSION_SYSTEMD
.../rules/media-session.in:21:	symbol MEDIA_SESSION_SYSTEMD is selected by MEDIA_SESSION_SYSTEMD_UNIT_USER
.../rules/media-session.in:31:	symbol MEDIA_SESSION_SYSTEMD_UNIT_USER depends on SYSTEMD_UNITS_USER
.../rules/systemd.in:100:	symbol SYSTEMD_UNITS_USER depends on SYSTEMD

pulseaudio.in has "default y if SYSTEMD_UNITS_USER" instead.

dbus.in has an invisible option DBUS_SYSTEMD_USER_UNIT that depends on
SYSTEMD_UNITS_USER and DBUS_SYSTEMD_UNIT

Should this follow either of those?

[...]
> +MEDIA_SESSION_MODULES := \

unused?
[...]
> +MEDIA_SESSION_SPA_MODULES := \

unused?

Ouch, copy&paste-from-pipewire.make error, will remove.

[...]
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/alsa-monitor.conf)
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/bluez-monitor.conf)
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/media-session.conf)
> +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/v4l2-monitor.conf)

break the lines.

Ok.

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40
  2021-11-25 15:57 ` [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
@ 2021-11-26  9:38   ` Philipp Zabel
  2021-11-26 14:29     ` Michael Olbrich
  0 siblings, 1 reply; 8+ messages in thread
From: Philipp Zabel @ 2021-11-26  9:38 UTC (permalink / raw)
  To: ptxdist

On Thu, 2021-11-25 at 16:57 +0100, Michael Olbrich wrote:
> On Mon, Nov 22, 2021 at 02:33:54PM +0100, Philipp Zabel wrote:
> > - pipewire-media-session was split out into its own package
> > - pw-cli now uses readline.
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  rules/pipewire.in   |  1 +
> >  rules/pipewire.make | 25 +++++++++----------------
> >  2 files changed, 10 insertions(+), 16 deletions(-)
> > 
> > diff --git a/rules/pipewire.in b/rules/pipewire.in
> > index c77dec87276e..2fd3025dfc12 100644
> > --- a/rules/pipewire.in
> > +++ b/rules/pipewire.in
> > @@ -12,6 +12,7 @@ menuconfig PIPEWIRE
> >  	select GSTREAMER1		if PIPEWIRE_GSTREAMER
> >  	select GST_PLUGINS_BASE1	if PIPEWIRE_GSTREAMER
> >  	select LIBSNDFILE
> > +	select READLINE
> 
> Please make pw-cli optional. readline ist GPL-3.0 and that can be a
> problem for some people.

readline support is an optional dependency, I'll add a PIPEWIRE_READLINE
option.

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] media-session: new package
  2021-11-26  9:36     ` Philipp Zabel
@ 2021-11-26 14:27       ` Michael Olbrich
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2021-11-26 14:27 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: ptxdist

On Fri, Nov 26, 2021 at 10:36:25AM +0100, Philipp Zabel wrote:
> On Thu, 2021-11-25 at 17:11 +0100, Michael Olbrich wrote:
> [...]
> > > +	select SYSTEMD				if MEDIA_SESSION_SYSTEMD
> [...]
> > > +config MEDIA_SESSION_SYSTEMD
> > > +	bool
> [...]
> > 
> > > +config MEDIA_SESSION_SYSTEMD_UNIT_USER
> > > +	bool
> > > +	default y
> > > +	depends on INITMETHOD_SYSTEMD
> > 
> > 		&& SYSTEMD_UNITS_USER
> 
> This would cause a dependency loop:
> 
> .../rules/systemd.in:3:error: recursive dependency detected!
> .../rules/systemd.in:3:	symbol SYSTEMD is selected by MEDIA_SESSION_SYSTEMD
> .../rules/media-session.in:21:	symbol MEDIA_SESSION_SYSTEMD is selected by MEDIA_SESSION_SYSTEMD_UNIT_USER
> .../rules/media-session.in:31:	symbol MEDIA_SESSION_SYSTEMD_UNIT_USER depends on SYSTEMD_UNITS_USER
> .../rules/systemd.in:100:	symbol SYSTEMD_UNITS_USER depends on SYSTEMD
> 
> pulseaudio.in has "default y if SYSTEMD_UNITS_USER" instead.
> 
> dbus.in has an invisible option DBUS_SYSTEMD_USER_UNIT that depends on
> SYSTEMD_UNITS_USER and DBUS_SYSTEMD_UNIT
> 
> Should this follow either of those?

Now that I think about it, just default to the corresponding PIPEWIRE
option without a prompt. It's only used in combination with that anyways.

Michael

> [...]
> > +MEDIA_SESSION_MODULES := \
> 
> unused?
> [...]
> > +MEDIA_SESSION_SPA_MODULES := \
> 
> unused?
> 
> Ouch, copy&paste-from-pipewire.make error, will remove.
> 
> [...]
> > +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/alsa-monitor.conf)
> > +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/bluez-monitor.conf)
> > +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/media-session.conf)
> > +	@$(call install_copy, media-session, 0, 0, 644, -, /usr/share/pipewire/media-session.d/v4l2-monitor.conf)
> 
> break the lines.
> 
> Ok.
> 
> regards
> Philipp
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40
  2021-11-26  9:38   ` Philipp Zabel
@ 2021-11-26 14:29     ` Michael Olbrich
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2021-11-26 14:29 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: ptxdist

On Fri, Nov 26, 2021 at 10:38:28AM +0100, Philipp Zabel wrote:
> On Thu, 2021-11-25 at 16:57 +0100, Michael Olbrich wrote:
> > On Mon, Nov 22, 2021 at 02:33:54PM +0100, Philipp Zabel wrote:
> > > - pipewire-media-session was split out into its own package
> > > - pw-cli now uses readline.
> > > 
> > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > > ---
> > >  rules/pipewire.in   |  1 +
> > >  rules/pipewire.make | 25 +++++++++----------------
> > >  2 files changed, 10 insertions(+), 16 deletions(-)
> > > 
> > > diff --git a/rules/pipewire.in b/rules/pipewire.in
> > > index c77dec87276e..2fd3025dfc12 100644
> > > --- a/rules/pipewire.in
> > > +++ b/rules/pipewire.in
> > > @@ -12,6 +12,7 @@ menuconfig PIPEWIRE
> > >  	select GSTREAMER1		if PIPEWIRE_GSTREAMER
> > >  	select GST_PLUGINS_BASE1	if PIPEWIRE_GSTREAMER
> > >  	select LIBSNDFILE
> > > +	select READLINE
> > 
> > Please make pw-cli optional. readline ist GPL-3.0 and that can be a
> > problem for some people.
> 
> readline support is an optional dependency, I'll add a PIPEWIRE_READLINE
> option.

In this case, I prefer a PIPEWIRE_PW_CTL option. That's the only tool that
uses it and it's only available when readline is found.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-26 14:29 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 13:33 [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
2021-11-22 13:33 ` [ptxdist] [PATCH 2/2] media-session: new package Philipp Zabel
2021-11-25 16:11   ` Michael Olbrich
2021-11-26  9:36     ` Philipp Zabel
2021-11-26 14:27       ` Michael Olbrich
2021-11-25 15:57 ` [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
2021-11-26  9:38   ` Philipp Zabel
2021-11-26 14:29     ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox