diff options
| -rw-r--r-- | recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch | 34 | ||||
| -rw-r--r-- | recipes-multimedia/musicpd/mpd_agldemo.inc | 10 |
2 files changed, 1 insertions, 43 deletions
diff --git a/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch b/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch deleted file mode 100644 index 429e46508..000000000 --- a/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6b430ba271f6d45b3f58c256cb8fede3b04f3b7a Mon Sep 17 00:00:00 2001 -From: Max Kellermann <max.kellermann@gmail.com> -Date: Sat, 9 Jul 2022 00:21:27 +0200 -Subject: [PATCH] output/PipeWire: activate stream in Drain() - -Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/6b430ba271f6d45b3f58c256cb8fede3b04f3b7a] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - ---- -diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx b/src/output/plugins/PipeWireOutputPlugin.cxx -index 524ab3d87..ccdf5c0e4 100644 ---- a/src/output/plugins/PipeWireOutputPlugin.cxx -+++ b/src/output/plugins/PipeWireOutputPlugin.cxx -@@ -866,6 +866,17 @@ PipeWireOutput::Drain() - { - const PipeWire::ThreadLoopLock lock(thread_loop); - -+ if (drained) -+ return; -+ -+ if (!active) { -+ /* there is data in the ring_buffer, but the stream is -+ not yet active; activate it now to ensure it is -+ played before this method returns */ -+ active = true; -+ pw_stream_set_active(stream, true); -+ } -+ - drain_requested = true; - AtScopeExit(this) { drain_requested = false; }; - --- -2.39.0 - diff --git a/recipes-multimedia/musicpd/mpd_agldemo.inc b/recipes-multimedia/musicpd/mpd_agldemo.inc index e096e30ae..513aa5096 100644 --- a/recipes-multimedia/musicpd/mpd_agldemo.inc +++ b/recipes-multimedia/musicpd/mpd_agldemo.inc @@ -5,15 +5,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # in the upstream recipe. DEPENDS:remove = "curl" -SRC_URI += "file://0001-output-PipeWire-activate-stream-in-Drain.patch \ - file://mpd-volatiles.conf \ -" - -# The older meson in poky dunfell complains about the use of the -# build.{c_std,cpp_std} options even though they work, so we need to -# flag them to be ignored in the unknown configure option QA test. -# This can be removed after upgrading to Yocto Project 3.5. -UNKNOWN_CONFIGURE_OPT_IGNORE = "build.c_std build.cpp_std" +SRC_URI += "file://mpd-volatiles.conf" # This also needs to be pushed upstream. PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" |