commit: d6e4b2a3de4e36b0ea71e777afabb3f37e0ddb92 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 11 04:22:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 11 04:23:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e4b2a3
media-video/pipewire: make modemmanager, readline optional Signed-off-by: Sam James <sam <AT> gentoo.org> ...0-pulse-server-also-advance-read-pointer-in-underrun.patch | 11 ++--------- media-video/pipewire/metadata.xml | 1 + media-video/pipewire/pipewire-0.3.60.ebuild | 10 +++++++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch index 255a3143e93f..99e752391885 100644 --- a/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch +++ b/media-video/pipewire/files/pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch @@ -1,3 +1,5 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908 + From b720da771efa950cf380101bed42d5d5ee177908 Mon Sep 17 00:00:00 2001 From: Wim Taymans <[email protected]> Date: Thu, 10 Nov 2022 16:13:33 +0100 @@ -8,12 +10,6 @@ So that we ask for more data from the client. Also retested with #2799 that caused this regression. Fixes #2821 ---- - src/modules/module-protocol-pulse/pulse-server.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c -index b18273e98..07f664ba1 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -1433,10 +1433,11 @@ static void stream_process(void *data) @@ -31,6 +27,3 @@ index b18273e98..07f664ba1 100644 pd.playing_for = size; } pw_log_debug("%p: [%s] underrun read:%u avail:%d max:%u", --- -2.38.1 - diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index f5b7e177d5f3..af21a7316abc 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -22,6 +22,7 @@ <flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag> <flag name="jack-sdk">Use PipeWire as JACK replacement</flag> <flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag> + <flag name="modemmanager">Combined with USE=bluetooth, allows PipeWire to perform telephony on mobile devices.</flag> <flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag> <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag> <flag name="system-service">Install systemd unit files for running as a system service. Not recommended.</flag> diff --git a/media-video/pipewire/pipewire-0.3.60.ebuild b/media-video/pipewire/pipewire-0.3.60.ebuild index ac164c770bbb..ca8bc505b0d0 100644 --- a/media-video/pipewire/pipewire-0.3.60.ebuild +++ b/media-video/pipewire/pipewire-0.3.60.ebuild @@ -39,7 +39,7 @@ LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" IUSE="bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 -pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf" +modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -54,6 +54,7 @@ pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf" # When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally. REQUIRED_USE=" jack-sdk? ( !jack-client ) + modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus ) @@ -74,7 +75,6 @@ BDEPEND=" RDEPEND=" acct-group/audio media-libs/alsa-lib - sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] bluetooth? ( @@ -105,6 +105,7 @@ RDEPEND=" !media-sound/jack2 ) lv2? ( media-libs/lilv ) + modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) @@ -112,6 +113,7 @@ RDEPEND=" !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) + readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( @@ -209,7 +211,8 @@ multilib_src_configure() { $(meson_native_use_feature bluetooth bluez5) $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - $(meson_native_use_feature bluetooth bluez5-backend-native-mm) + # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379 + $(meson_native_use_feature modemmanager bluez5-backend-native-mm) $(meson_native_use_feature bluetooth bluez5-backend-ofono) $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) $(meson_native_use_feature bluetooth bluez5-codec-aac) @@ -235,6 +238,7 @@ multilib_src_configure() { $(meson_native_use_feature lv2) $(meson_native_use_feature v4l v4l2) -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature readline) $(meson_native_use_feature ssl raop) -Dvideoconvert=enabled # Matches upstream -Dvideotestsrc=enabled # Matches upstream
