* [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.37 -> 0.3.40
@ 2021-11-26 15:49 Philipp Zabel
2021-11-26 15:49 ` [ptxdist] [PATCH v2 2/2] media-session: new package Philipp Zabel
2021-11-29 13:50 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2021-11-26 15:49 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>
---
Changes since v1:
- Add an option to build and install pw-cli
- Add an option to build and install pw-top
---
rules/pipewire.in | 11 +++++++++++
rules/pipewire.make | 30 ++++++++++++++----------------
2 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/rules/pipewire.in b/rules/pipewire.in
index c77dec87276e..6f8a75276b13 100644
--- a/rules/pipewire.in
+++ b/rules/pipewire.in
@@ -12,6 +12,9 @@ menuconfig PIPEWIRE
select GSTREAMER1 if PIPEWIRE_GSTREAMER
select GST_PLUGINS_BASE1 if PIPEWIRE_GSTREAMER
select LIBSNDFILE
+ select READLINE if PIPEWIRE_PW_CTL
+ select NCURSES if PIPEWIRE_PW_TOP
+ select NCURSES_WIDE_CHAR if PIPEWIRE_PW_TOP
select SYSTEMD if PIPEWIRE_SYSTEMD
select UDEV
select UDEV_LIBUDEV
@@ -30,6 +33,14 @@ config PIPEWIRE_GSTREAMER
bool
prompt "build and install gstreamer plugins"
+config PIPEWIRE_PW_CTL
+ bool
+ prompt "build and install pw-cli, requires readline"
+
+config PIPEWIRE_PW_TOP
+ bool
+ prompt "build and install pw-top, requires ncurses"
+
config PIPEWIRE_SYSTEMD
bool
diff --git a/rules/pipewire.make b/rules/pipewire.make
index 341f7141a6ec..e0c040e60257 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,12 +147,13 @@ $(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
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-cat)
+ifdef PTXCONF_PIPEWIRE_PW_CTL
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-cli)
+endif
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-dot)
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-dump)
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-link)
@@ -159,6 +163,10 @@ 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)
+ifdef PTXCONF_PIPEWIRE_PW_TOP
+ @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-top)
+endif
+ @$(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 +183,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 +202,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 +209,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 +223,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] 4+ messages in thread
* [ptxdist] [PATCH v2 2/2] media-session: new package
2021-11-26 15:49 [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
@ 2021-11-26 15:49 ` Philipp Zabel
2021-11-29 13:51 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-29 13:50 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2021-11-26 15:49 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>
---
Changes since v1:
- Drop erroneously copy&pasted variables
- Break long lines
- Make MEDIA_SESSION_SYSTEMD_UNIT(_USER) follow
PIPEWIRE_SYSTEMD_UNIT(_USER) without prompt.
---
...remove-session-managers-option-check.patch | 32 +++++++
patches/media-session-0.4.1/series | 1 +
rules/media-session.in | 32 +++++++
rules/media-session.make | 96 +++++++++++++++++++
4 files changed, 161 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..73fe521cc7b2
--- /dev/null
+++ b/rules/media-session.in
@@ -0,0 +1,32 @@
+## 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 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 PIPEWIRE_SYSTEMD_UNIT
+ select MEDIA_SESSION_SYSTEMD
+
+config MEDIA_SESSION_SYSTEMD_UNIT_USER
+ bool
+ default PIPEWIRE_SYSTEMD_UNIT_USER
+ select MEDIA_SESSION_SYSTEMD
+
+endif
diff --git a/rules/media-session.make b/rules/media-session.make
new file mode 100644
index 000000000000..e8496db8c153
--- /dev/null
+++ b/rules/media-session.make
@@ -0,0 +1,96 @@
+# -*-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
+# ----------------------------------------------------------------------------
+
+$(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] 4+ messages in thread
* Re: [ptxdist] [APPLIED] pipewire: version bump 0.3.37 -> 0.3.40
2021-11-26 15:49 [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
2021-11-26 15:49 ` [ptxdist] [PATCH v2 2/2] media-session: new package Philipp Zabel
@ 2021-11-29 13:50 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-11-29 13:50 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as df4236226aefd21ee90ea9331d0af0a988775ba4.
Michael
[sent from post-receive hook]
On Mon, 29 Nov 2021 14:50:59 +0100, Philipp Zabel <p.zabel@pengutronix.de> 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>
> Message-Id: <20211126154934.2091313-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/pipewire.in b/rules/pipewire.in
> index c77dec87276e..6f8a75276b13 100644
> --- a/rules/pipewire.in
> +++ b/rules/pipewire.in
> @@ -12,6 +12,9 @@ menuconfig PIPEWIRE
> select GSTREAMER1 if PIPEWIRE_GSTREAMER
> select GST_PLUGINS_BASE1 if PIPEWIRE_GSTREAMER
> select LIBSNDFILE
> + select READLINE if PIPEWIRE_PW_CTL
> + select NCURSES if PIPEWIRE_PW_TOP
> + select NCURSES_WIDE_CHAR if PIPEWIRE_PW_TOP
> select SYSTEMD if PIPEWIRE_SYSTEMD
> select UDEV
> select UDEV_LIBUDEV
> @@ -30,6 +33,14 @@ config PIPEWIRE_GSTREAMER
> bool
> prompt "build and install gstreamer plugins"
>
> +config PIPEWIRE_PW_CTL
> + bool
> + prompt "build and install pw-cli, requires readline"
> +
> +config PIPEWIRE_PW_TOP
> + bool
> + prompt "build and install pw-top, requires ncurses"
> +
> config PIPEWIRE_SYSTEMD
> bool
>
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index 341f7141a6ec..e0c040e60257 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,12 +147,13 @@ $(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
> @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-cat)
> +ifdef PTXCONF_PIPEWIRE_PW_CTL
> @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-cli)
> +endif
> @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-dot)
> @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-dump)
> @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-link)
> @@ -159,6 +163,10 @@ 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)
> +ifdef PTXCONF_PIPEWIRE_PW_TOP
> + @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-top)
> +endif
> + @$(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 +183,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 +202,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 +209,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 +223,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)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] media-session: new package
2021-11-26 15:49 ` [ptxdist] [PATCH v2 2/2] media-session: new package Philipp Zabel
@ 2021-11-29 13:51 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-11-29 13:51 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as 90cb7745825c21908f3bacd99f4deafbaefd0940.
Michael
[sent from post-receive hook]
On Mon, 29 Nov 2021 14:51:00 +0100, Philipp Zabel <p.zabel@pengutronix.de> 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>
> Message-Id: <20211126154934.2091313-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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..73fe521cc7b2
> --- /dev/null
> +++ b/rules/media-session.in
> @@ -0,0 +1,32 @@
> +## 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 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 PIPEWIRE_SYSTEMD_UNIT
> + select MEDIA_SESSION_SYSTEMD
> +
> +config MEDIA_SESSION_SYSTEMD_UNIT_USER
> + bool
> + default PIPEWIRE_SYSTEMD_UNIT_USER
> + select MEDIA_SESSION_SYSTEMD
> +
> +endif
> diff --git a/rules/media-session.make b/rules/media-session.make
> new file mode 100644
> index 000000000000..4013e210161c
> --- /dev/null
> +++ b/rules/media-session.make
> @@ -0,0 +1,94 @@
> +# -*-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=
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-29 13:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-26 15:49 [ptxdist] [PATCH v2 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
2021-11-26 15:49 ` [ptxdist] [PATCH v2 2/2] media-session: new package Philipp Zabel
2021-11-29 13:51 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-11-29 13:50 ` [ptxdist] [APPLIED] pipewire: version bump 0.3.37 -> 0.3.40 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox