From ff0dd2d12f0345db53cd9e4e6d93526dc45a0f08 Mon Sep 17 00:00:00 2001 From: Pacien TRAN-GIRARD Date: Sat, 16 Jul 2022 21:52:37 +0200 Subject: [PATCH] mpd-full: remove partial BUILD_PATENTED on ffmpeg This removes the guard "CONFIG_BUILD_PATENTED" for the ffmpeg build feature for mpd-full. ffmpeg was already unconditionally registered as a dependency (at line 51). The ffmpeg package already handles whether or not to include patented codecs internally using the same config flag, so guarding its use as a dependency here does not appear necessary anymore. (For reference: guard "BUILD_PATENTED" was introduced in 44eb12f for ffmpeg, then partially removed by 326c973). Signed-off-by: Pacien TRAN-GIRARD (cherry picked from commit f3fe7de8dc5c00f7b0356b9d63b42fd70a52e900) --- sound/mpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index 41b53788f..30fa973fa 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -181,7 +181,7 @@ ifeq ($(BUILD_VARIANT),full) -Dupnp=npupnp \ -Dmms=enabled \ -Dsoundcloud=enabled \ - -Dffmpeg=$(if $(CONFIG_BUILD_PATENTED),en,dis)abled \ + -Dffmpeg=enabled \ -Dmad=$(if $(CONFIG_BUILD_PATENTED),dis,en)abled \ -Dtremor=disabled \ -Dvorbis=enabled \