From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40
Date: Thu, 25 Nov 2021 16:57:23 +0100 [thread overview]
Message-ID: <YZ+yYxYkd1xcilRm@pengutronix.de> (raw)
In-Reply-To: <20211122133355.1685566-1-p.zabel@pengutronix.de>
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
next prev parent reply other threads:[~2021-11-25 15:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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 16:11 ` Michael Olbrich
2021-11-26 9:36 ` Philipp Zabel
2021-11-26 14:27 ` Michael Olbrich
2021-11-25 15:57 ` Michael Olbrich [this message]
2021-11-26 9:38 ` [ptxdist] [PATCH 1/2] pipewire: version bump 0.3.37 -> 0.3.40 Philipp Zabel
2021-11-26 14:29 ` 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=YZ+yYxYkd1xcilRm@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=p.zabel@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