mpd: Fix patch fuzz warning

[AGL/meta-agl-demo.git] / recipes-multimedia / musicpd / mpd_agldemo.inc

diff --git a/recipes-multimedia/musicpd/mpd_agldemo.inc b/recipes-multimedia/musicpd/mpd_agldemo.inc
index 8bbd591..513aa50 100644 (file)
--- a/recipes-multimedia/musicpd/mpd_agldemo.inc
+++ b/recipes-multimedia/musicpd/mpd_agldemo.inc
@@ -5,14 +5,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 # in the upstream recipe.
 DEPENDS:remove = "curl"
 
-SRC_URI += "file://0001-Tweaks-to-allow-building-with-older-meson.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_WHITELIST = "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"
@@ -20,10 +13,10 @@ PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
 # Prune the default configuration a bit to remove various streaming/server
 # options that are not required.
 PACKAGECONFIG = " \
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "aac", "", d)} \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \
     bzip2 \
     daemon \
-    ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg aac", "", d)} \
+    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \
     flac \
     libsamplerate \
     mpg123 \