diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch deleted file mode 100644 index 37aa448e95..0000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2fbfeeb9c4ff7aa9ba4b95604ee0fb14ecec763 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 17 May 2023 17:54:09 -0700 -Subject: [PATCH] SndfileDecoderPlugin: Fix type mismatch for std::span - -Fixes -../git/src/decoder/plugins/SndfileDecoderPlugin.cxx:231:25: error: non-constant-expression cannot be narrowed from type 'sf_count_t' (aka 'long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] - std::span{buffer, num_frames * frame_size}, - ^~~~~~~~~~~~~~~~~~~~~~~ -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/decoder/plugins/SndfileDecoderPlugin.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx -index ad3908847..a3cb87ca9 100644 ---- a/src/decoder/plugins/SndfileDecoderPlugin.cxx -+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx -@@ -228,7 +228,7 @@ sndfile_stream_decode(DecoderClient &client, InputStream &is) - break; - - cmd = client.SubmitAudio(is, -- std::span{buffer, num_frames * frame_size}, -+ std::span{buffer, static_cast(num_frames * frame_size)}, - 0); - if (cmd == DecoderCommand::SEEK) { - sf_count_t c = client.GetSeekFrame(); diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch deleted file mode 100644 index ebbea2b358..0000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/181b96dd2d71bc8f2668776719d344466f258b5d] - -Signed-off-by: Wang Mingyu - -From 181b96dd2d71bc8f2668776719d344466f258b5d Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Mon, 15 May 2023 20:52:21 +0200 -Subject: [PATCH] command/player, SongPrint: use AudioFormatFormatter() - -libfmt version 10 apparently doesn't know how to format a -`StringBuffer`, failing the MPD build. Since we have a formatter -specialization for `AudioFormat`, let's use that - it's better and -easier to use. - -Closes https://github.com/MusicPlayerDaemon/MPD/issues/1807 ---- - src/SongPrint.cxx | 5 +++-- - src/command/PlayerCommands.cxx | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx -index 98d544cc38..835669d276 100644 ---- a/src/SongPrint.cxx -+++ b/src/SongPrint.cxx -@@ -8,6 +8,7 @@ - #include "TagPrint.hxx" - #include "client/Response.hxx" - #include "fs/Traits.hxx" -+#include "lib/fmt/AudioFormatFormatter.hxx" - #include "time/ChronoUtil.hxx" - #include "util/StringBuffer.hxx" - #include "util/UriUtil.hxx" -@@ -77,7 +78,7 @@ song_print_info(Response &r, const LightSong &song, bool base) noexcept - time_print(r, "Last-Modified", song.mtime); - - if (song.audio_format.IsDefined()) -- r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format)); -+ r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format); - - tag_print_values(r, song.tag); - -@@ -100,7 +101,7 @@ song_print_info(Response &r, const DetachedSong &song, bool base) noexcept - time_print(r, "Last-Modified", song.GetLastModified()); - - if (const auto &f = song.GetAudioFormat(); f.IsDefined()) -- r.Fmt(FMT_STRING("Format: {}\n"), ToString(f)); -+ r.Fmt(FMT_STRING("Format: {}\n"), f); - - tag_print_values(r, song.GetTag()); - -diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx -index 5108b9d3c4..0b5a917020 100644 ---- a/src/command/PlayerCommands.cxx -+++ b/src/command/PlayerCommands.cxx -@@ -13,6 +13,7 @@ - #include "Partition.hxx" - #include "Instance.hxx" - #include "IdleFlags.hxx" -+#include "lib/fmt/AudioFormatFormatter.hxx" - #include "util/StringBuffer.hxx" - #include "util/ScopeExit.hxx" - #include "util/Exception.hxx" -@@ -170,7 +171,7 @@ handle_status(Client &client, [[maybe_unused]] Request args, Response &r) - - if (player_status.audio_format.IsDefined()) - r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"), -- ToString(player_status.audio_format)); -+ player_status.audio_format); - } - - #ifdef ENABLE_DATABASE diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch deleted file mode 100644 index 0c9d979107..0000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Backport -[https://github.com/MusicPlayerDaemon/MPD/commit/f869593ac8913e52c711e974257bd6dc0d5dbf26] - -Signed-off-by: Wang Mingyu - -From f869593ac8913e52c711e974257bd6dc0d5dbf26 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Mon, 15 May 2023 20:59:58 +0200 -Subject: [PATCH] TimePrint: minor fixup for libfmt 10 - -libfmt version 10 has difficulties formatting a `StringBuffer`, and we -need to help it by explicitly invoking the `c_str()` method. ---- - src/TimePrint.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx -index 5bf05f6238..d47f3178bb 100644 ---- a/src/TimePrint.cxx -+++ b/src/TimePrint.cxx -@@ -20,5 +20,5 @@ time_print(Response &r, const char *name, - return; - } - -- r.Fmt(FMT_STRING("{}: {}\n"), name, s); -+ r.Fmt(FMT_STRING("{}: {}\n"), name, s.c_str()); - } diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb similarity index 94% rename from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb rename to meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb index 0c309ded00..310b5f7c3c 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb @@ -20,11 +20,8 @@ DEPENDS += " \ SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ file://mpd.conf.in \ - file://minor-fixup-for-libfmt10.patch \ - file://fix-build-error-when-fmt-updated.patch \ - file://0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch \ " -SRCREV = "b1422fbda40a1831d397fb161e7a555443c2a072" +SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}"