summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@konsulko.com>2023-04-27 17:51:07 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-04-28 08:51:46 +0000
commit6d435b0bbfa3ab11e571a284c01f5735edcba49f (patch)
treea13066e0829239e6e3f174e191e71388afd30a1f /recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
parentaf93b8c62bdb3de9f0039649c8be16ae2311e3d3 (diff)
mpd: remove patches that were upstreamed
Latest meta-openembedded/meta-multimedia updates mpd to newer version which has these 3 patches already included, remove them locally. Bug-AGL: SPEC-4768 Change-Id: Ifbb07c01f8f5cbc75935b005da473bdce3139ff0 Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Diffstat (limited to 'recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch')
-rw-r--r--recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch b/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
deleted file mode 100644
index a01a04a02..000000000
--- a/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 493677ff81e708133f87e15157c5dd5131adad48 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@gmail.com>
-Date: Sat, 9 Jul 2022 00:53:52 +0200
-Subject: [PATCH] output/PipeWire: skip Cancel() if already drained
-
-Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/493677ff81e708133f87e15157c5dd5131adad48]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
----
-diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx b/src/output/plugins/PipeWireOutputPlugin.cxx
-index ccdf5c0e4..7184edfa5 100644
---- a/src/output/plugins/PipeWireOutputPlugin.cxx
-+++ b/src/output/plugins/PipeWireOutputPlugin.cxx
-@@ -892,6 +892,9 @@ PipeWireOutput::Cancel() noexcept
- const PipeWire::ThreadLoopLock lock(thread_loop);
- interrupted = false;
-
-+ if (drained)
-+ return;
-+
- ring_buffer->reset();
- }
-
---
-2.39.0
-