From c89e0cd92288f3be352aae449ec42eee9f53bbfd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Nov 2021 14:05:15 +0100 Subject: [PATCH] package/mpd: drop tidal option tidal option has been removed from mpd since version 0.22.10 and https://github.com/MusicPlayerDaemon/MPD/commit/97c43954e8df3f772899cda951ad5a7dd4a24f25 resulting in the following build failure since bump of meson to version 0.60.1 in commit 78d3f2ea03dfba07a73fe0405c2aa4778f063ce3: ../output-1/build/mpd-0.22.11/meson.build:1:0: ERROR: Unknown options: "tidal" Fixes: - http://autobuild.buildroot.org/results/b8c5879a02078f4962088dff5ae2ede1f0e6b805 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 6 ++++++ package/mpd/Config.in | 7 ------- package/mpd/mpd.mk | 7 ------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 40011a1890..5b48566f68 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -162,6 +162,12 @@ config BR2_OPENJDK_VERSION_LATEST OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +config BR2_PACKAGE_MPD_TIDAL + bool "mpd tidal option removed" + select BR2_LEGACY + help + tidal has been removed from mpd since version 0.22.10. + config BR2_PACKAGE_MROUTED_RSRR bool "RSRR for RSVP removed in mrouted v4.4" select BR2_LEGACY diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 7a2597558b..5e49e69442 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -58,13 +58,6 @@ config BR2_PACKAGE_MPD_SOUNDCLOUD help Enable soundcloud.com playlist support. -config BR2_PACKAGE_MPD_TIDAL - bool "tidal" - select BR2_PACKAGE_MPD_CURL - select BR2_PACKAGE_YAJL - help - Play songs from the commercial streaming service TIDAL. - comment "Converter plugins" config BR2_PACKAGE_MPD_LIBSAMPLERATE diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index fe6b8d539b..e105352b80 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -277,13 +277,6 @@ ifneq ($(BR2_PACKAGE_MPD_TCP),y) MPD_CONF_OPTS += -Dtcp=true endif -ifeq ($(BR2_PACKAGE_MPD_TIDAL),y) -MPD_DEPENDENCIES += yajl -MPD_CONF_OPTS += -Dtidal=enabled -else -MPD_CONF_OPTS += -Dtidal=disabled -endif - ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) MPD_DEPENDENCIES += tremor MPD_CONF_OPTS += -Dtremor=enabled