X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-multimedia%2Fmusicpd%2Fmpd_agldemo.inc;h=34120aea986a7d6652f9ad044b6544944a480a3f;hb=901bef8b6697196a19337d8f6647ebb6fd54f24e;hp=8bbd5919626309265ad50a8556100d34f12d14d9;hpb=3d520839afffc7096d599f07210a63bd4b21c427;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-multimedia/musicpd/mpd_agldemo.inc b/recipes-multimedia/musicpd/mpd_agldemo.inc
index 8bbd59196..34120aea9 100644
--- a/recipes-multimedia/musicpd/mpd_agldemo.inc
+++ b/recipes-multimedia/musicpd/mpd_agldemo.inc
@@ -5,14 +5,13 @@ 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"
+SRC_URI += "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"
+UNKNOWN_CONFIGURE_OPT_IGNORE = "build.c_std build.cpp_std"
 
 # This also needs to be pushed upstream.
 PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
@@ -20,10 +19,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 \