summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/musicpd/mpd_agldemo.inc
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-05-09 13:02:25 -0400
committerScott Murray <scott.murray@konsulko.com>2023-05-09 17:11:08 +0000
commitb481828bc0568ab4e4775169ff70fa0d3ae29cd4 (patch)
tree5025b7589022d3722ced8b9c7917a8faa77e28a9 /recipes-multimedia/musicpd/mpd_agldemo.inc
parentaf35a74ee956a0628c5e6f929bcb3ca87eb16c48 (diff)
mpd: Fix patch fuzz warning
The one remaining patch after the kirkstone 4.0.9 upgrade is actually also no longer required, but git was somehow managing to apply it with fuzz. From code inspection the result was some duplicated lines of code that would still work. Remove the patch to clean up the fuzz warning and get us back to using a clean upstream. Bug-AGL: SPEC-4768 Change-Id: Icb8b8b2fdd847c4fb81a1a7181589b5c8ccaebc0 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-multimedia/musicpd/mpd_agldemo.inc')
-rw-r--r--recipes-multimedia/musicpd/mpd_agldemo.inc10
1 files changed, 1 insertions, 9 deletions
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"