diff --git a/mpd-fmt11.patch b/mpd-fmt11.patch new file mode 100644 index 0000000..ae7d7bc --- /dev/null +++ b/mpd-fmt11.patch @@ -0,0 +1,79 @@ +From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 5 Jul 2024 14:27:45 +0000 +Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0 + +Upstream libfmt commit fmtlib/fmt@d707292 +now requires the format function to be const. + +Adjust the function prototype so it is const and can compile. + +Signed-off-by: Rudi Heitbaum +--- + src/lib/ffmpeg/LibFmt.hxx | 2 +- + src/lib/fmt/AudioFormatFormatter.hxx | 4 ++-- + src/lib/fmt/ExceptionFormatter.hxx | 2 +- + src/lib/fmt/PathFormatter.hxx | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx +index aa068711f3..dee83ed2d5 100644 +--- a/src/lib/ffmpeg/LibFmt.hxx ++++ b/src/lib/ffmpeg/LibFmt.hxx +@@ -13,7 +13,7 @@ template<> + struct fmt::formatter : formatter + { + template +- auto format(const AVSampleFormat format, FormatContext &ctx) { ++ auto format(const AVSampleFormat format, FormatContext &ctx) const { + const char *name = av_get_sample_fmt_name(format); + if (name == nullptr) + name = "?"; +diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx +index e0ffb62160..8da98efd41 100644 +--- a/src/lib/fmt/AudioFormatFormatter.hxx ++++ b/src/lib/fmt/AudioFormatFormatter.hxx +@@ -13,7 +13,7 @@ template<> + struct fmt::formatter : formatter + { + template +- auto format(const SampleFormat format, FormatContext &ctx) { ++ auto format(const SampleFormat format, FormatContext &ctx) const { + return formatter::format(sample_format_to_string(format), + ctx); + } +@@ -23,7 +23,7 @@ template<> + struct fmt::formatter : formatter + { + template +- auto format(const AudioFormat &af, FormatContext &ctx) { ++ auto format(const AudioFormat &af, FormatContext &ctx) const { + return formatter::format(ToString(af).c_str(), + ctx); + } +diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx +index 3f342df672..f08b3bb228 100644 +--- a/src/lib/fmt/ExceptionFormatter.hxx ++++ b/src/lib/fmt/ExceptionFormatter.hxx +@@ -12,7 +12,7 @@ template<> + struct fmt::formatter : formatter + { + template +- auto format(std::exception_ptr e, FormatContext &ctx) { ++ auto format(std::exception_ptr e, FormatContext &ctx) const { + return formatter::format(GetFullMessage(e), ctx); + } + }; +diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx +index e5ae89dec5..add06df81b 100644 +--- a/src/lib/fmt/PathFormatter.hxx ++++ b/src/lib/fmt/PathFormatter.hxx +@@ -13,7 +13,7 @@ template T> + struct fmt::formatter : formatter + { + template +- auto format(Path path, FormatContext &ctx) { ++ auto format(Path path, FormatContext &ctx) const { + return formatter::format(path.ToUTF8(), ctx); + } + }; diff --git a/mpd.changes b/mpd.changes index a462f42..51b4dbc 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,10 +1,15 @@ ------------------------------------------------------------------- -Sat Apr 27 21:55:37 UTC 2024 - Илья Индиго <13ilya@gmail.com> +Wed Nov 6 04:50:58 UTC 2024 - Илья Индиго + +- Added mpd-fmt11.patch for (fixed build with fmt 11.2). + +------------------------------------------------------------------- +Sat Apr 27 21:55:37 UTC 2024 - Илья Индиго - Fixed privileges of /run/mpd directory (rpm -qlv mpd | grep /run). ------------------------------------------------------------------- -Sun Feb 4 17:45:03 UTC 2024 - Илья Индиго +Sun Feb 4 17:45:03 UTC 2024 - Илья Индиго - Provided user(mpd). @@ -27,7 +32,7 @@ Tue Aug 29 12:36:00 UTC 2023 - llyyr cause mpd to pull in ffmpeg-4 on installation. ------------------------------------------------------------------- -Tue May 23 22:00:59 UTC 2023 - Илья Индиго +Tue May 23 22:00:59 UTC 2023 - Илья Индиго - Updated to 0.23.13 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.13/NEWS @@ -43,7 +48,7 @@ Tue May 23 22:00:59 UTC 2023 - Илья Индиго * supported libfmt 10 ------------------------------------------------------------------- -Wed Jan 18 12:20:43 UTC 2023 - Илья Индиго +Wed Jan 18 12:20:43 UTC 2023 - Илья Индиго - Updated to 0.23.12 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS @@ -63,7 +68,7 @@ Sat Dec 3 21:28:47 UTC 2022 - Dirk Müller - add keyring ------------------------------------------------------------------- -Mon Oct 17 07:12:07 UTC 2022 - Илья Индиго +Mon Oct 17 07:12:07 UTC 2022 - Илья Индиго - Updated to 0.23.10 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.10/NEWS @@ -91,7 +96,7 @@ Mon Aug 8 08:19:19 UTC 2022 - Cor Blom - Added fix-build-ffmpeg5.patch to fix build with ffmpeg 5.1 ------------------------------------------------------------------- -Mon Aug 1 16:04:57 UTC 2022 - Илья Индиго +Mon Aug 1 16:04:57 UTC 2022 - Илья Индиго - Updated to 0.23.8 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.8/NEWS @@ -118,7 +123,7 @@ Mon Aug 1 16:04:57 UTC 2022 - Илья Индиго * don't force initial volume=100% ------------------------------------------------------------------- -Wed Jun 1 14:58:09 UTC 2022 - Илья Индиго +Wed Jun 1 14:58:09 UTC 2022 - Илья Индиго - Updated to 0.23.7 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.7/NEWS @@ -130,7 +135,7 @@ Wed Jun 1 14:58:09 UTC 2022 - Илья Индиго * software: update volume of disabled outputs ------------------------------------------------------------------- -Tue Mar 29 21:26:09 UTC 2022 - Илья Индиго +Tue Mar 29 21:26:09 UTC 2022 - Илья Индиго - Updated to 0.23.6 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.6/NEWS @@ -164,7 +169,7 @@ Thu Dec 2 18:29:33 UTC 2021 - Mia Herkt * GCC 12 build fixes ------------------------------------------------------------------- -Fri Nov 12 23:12:23 UTC 2021 - Илья Индиго +Fri Nov 12 23:12:23 UTC 2021 - Илья Индиго - Updated to 0.23.4 * Changed file mpd-user.conf​ (disabled pid_file). @@ -180,7 +185,7 @@ Fri Nov 12 23:12:23 UTC 2021 - Илья Индиго * ignore the "pid_file" setting if started as systemd service ------------------------------------------------------------------- -Sat Nov 6 02:02:33 UTC 2021 - Илья Индиго +Sat Nov 6 02:02:33 UTC 2021 - Илья Индиго - Updated to 0.23.3 * Add patch mpd-service.patch. @@ -237,7 +242,7 @@ Sat Nov 6 02:02:33 UTC 2021 - Илья Индиго and "Location" ------------------------------------------------------------------- -Wed Sep 1 07:24:21 UTC 2021 - Илья Индиго +Wed Sep 1 07:24:21 UTC 2021 - Илья Индиго - Updated to 0.22.11 * https://github.com/MusicPlayerDaemon/MPD/blob/v0.22.11/NEWS @@ -248,7 +253,7 @@ Wed Sep 1 07:24:21 UTC 2021 - Илья Индиго * support double-precision samples (by converting to single precision) ------------------------------------------------------------------- -Tue Aug 17 07:55:08 UTC 2021 - Илья Индиго +Tue Aug 17 07:55:08 UTC 2021 - Илья Индиго - Updated to 0.22.10 * https://github.com/MusicPlayerDaemon/MPD/blob/v0.22.10/NEWS @@ -269,7 +274,7 @@ Tue Aug 17 07:55:08 UTC 2021 - Илья Индиго * mixer: alsa: fix yet more rounding errors. ------------------------------------------------------------------- -Sun Jun 27 11:12:37 UTC 2021 - Илья Индиго +Sun Jun 27 11:12:37 UTC 2021 - Илья Индиго - Updated to 0.22.9 * https://github.com/MusicPlayerDaemon/MPD/blob/v0.22.9/NEWS @@ -287,7 +292,7 @@ Sun May 30 15:39:04 UTC 2021 - Fabian Niepelt * fix crash bug in "albumart" command (0.22.7 regression) ------------------------------------------------------------------- -Fri May 21 06:04:21 UTC 2021 - Илья Индиго +Fri May 21 06:04:21 UTC 2021 - Илья Индиго - Update to 0.22.7 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.7/NEWS @@ -319,7 +324,7 @@ Fri Feb 19 23:49:35 UTC 2021 - Dirk Müller - pulse: fix deadlock with "always_on" ------------------------------------------------------------------- -Sat Jan 23 11:49:19 UTC 2021 - Илья Индиго +Sat Jan 23 11:49:19 UTC 2021 - Илья Индиго - Update to 0.22.4 * refresh mpd-conf.patch @@ -334,7 +339,7 @@ Sat Jan 23 11:49:19 UTC 2021 - Илья Индиго * output: moveoutput: fix always_on and tag lost on move ------------------------------------------------------------------- -Mon Nov 9 06:24:26 UTC 2020 - Илья Индиго +Mon Nov 9 06:24:26 UTC 2020 - Илья Индиго - Update to 0.22.3 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.3/NEWS @@ -347,7 +352,7 @@ Mon Nov 9 06:24:26 UTC 2020 - Илья Индиго * ffmpeg: support sample formats other than 16 bit ------------------------------------------------------------------- -Wed Oct 28 22:04:23 UTC 2020 - Илья Индиго +Wed Oct 28 22:04:23 UTC 2020 - Илья Индиго - Update to 0.22.2 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.2/NEWS @@ -370,7 +375,7 @@ Wed Oct 28 22:04:23 UTC 2020 - Илья Индиго * save on shutdown ------------------------------------------------------------------- -Wed Sep 30 01:36:05 UTC 2020 - Илья Индиго +Wed Sep 30 01:36:05 UTC 2020 - Илья Индиго - Refresh spec-file via spec-cleaner and manual optimizations * Removed unnecessary constructions and comments. @@ -487,7 +492,7 @@ Tue Jul 7 06:32:18 UTC 2020 - Paolo Stivanin * upnp: fix crash during shutdown ------------------------------------------------------------------- -Mon Jun 22 10:33:14 UTC 2020 - Илья Индиго +Mon Jun 22 10:33:14 UTC 2020 - Илья Индиго - Update to 0.21.24 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.24/NEWS @@ -501,7 +506,7 @@ Mon Jun 22 10:33:14 UTC 2020 - Илья Индиго * fix unit test failure ------------------------------------------------------------------- -Sat Apr 25 18:01:18 UTC 2020 - Илья Индиго +Sat Apr 25 18:01:18 UTC 2020 - Илья Индиго - Update to 0.21.23 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.23/NEWS @@ -517,7 +522,7 @@ Sat Apr 25 18:01:18 UTC 2020 - Илья Индиго * player: drain: outputs at end of song in "single" mode ------------------------------------------------------------------- -Sat Apr 4 22:04:54 UTC 2020 - Илья Индиго +Sat Apr 4 22:04:54 UTC 2020 - Илья Индиго - Update to 0.21.22 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.22/NEWS @@ -528,7 +533,7 @@ Sat Apr 4 22:04:54 UTC 2020 - Илья Индиго * fix build failures with uClibc-ng ------------------------------------------------------------------- -Fri Mar 27 15:53:58 UTC 2020 - Илья Индиго +Fri Mar 27 15:53:58 UTC 2020 - Илья Индиго - Update to 0.21.21 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.21/NEWS @@ -540,7 +545,7 @@ Fri Mar 27 15:53:58 UTC 2020 - Илья Индиго * raise default "max_connections" value to 100 ------------------------------------------------------------------- -Thu Feb 27 06:59:18 UTC 2020 - Илья Индиго +Thu Feb 27 06:59:18 UTC 2020 - Илья Индиго - Update to 0.21.20 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.20/NEWS @@ -551,7 +556,7 @@ Thu Feb 27 06:59:18 UTC 2020 - Илья Индиго * fix backwards seeking on ARM (and other non-x86 CPUs) ------------------------------------------------------------------- -Mon Jan 20 07:42:18 UTC 2020 - Илья Индиго +Mon Jan 20 07:42:18 UTC 2020 - Илья Индиго - Update to 0.21.19 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.19/NEWS @@ -563,7 +568,7 @@ Mon Jan 20 07:42:18 UTC 2020 - Илья Индиго * fix build failure with Android NDK r20 ------------------------------------------------------------------- -Sat Dec 28 10:42:29 UTC 2019 - Илья Индиго +Sat Dec 28 10:42:29 UTC 2019 - Илья Индиго - Update to 0.21.18 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.18/NEWS @@ -577,7 +582,7 @@ Sat Dec 28 10:42:29 UTC 2019 - Илья Индиго * reduce unnecessary CPU wakeups ------------------------------------------------------------------- -Wed Dec 18 15:55:55 UTC 2019 - Илья Индиго +Wed Dec 18 15:55:55 UTC 2019 - Илья Индиго - Update to 0.21.17 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.17/NEWS @@ -592,7 +597,7 @@ Wed Dec 18 15:55:55 UTC 2019 - Илья Индиго * fix build failure with -Ddatabase=false ------------------------------------------------------------------- -Wed Oct 16 11:36:22 UTC 2019 - Илья Индиго +Wed Oct 16 11:36:22 UTC 2019 - Илья Индиго - Update to 0.21.16 * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.16/NEWS @@ -607,7 +612,7 @@ Wed Oct 16 11:36:22 UTC 2019 - Илья Индиго * fix crash when music_directory is not a directory ------------------------------------------------------------------- -Tue Oct 8 08:02:09 UTC 2019 - Илья Индиго +Tue Oct 8 08:02:09 UTC 2019 - Илья Индиго - Refresh spec-file via spec-cleaner and manual optimizations * specified the correct license GPL-2.0-or-later @@ -651,7 +656,7 @@ Tue Oct 8 08:02:09 UTC 2019 - Илья Индиго * include command name in error responses ------------------------------------------------------------------- -Tue Jul 23 07:42:13 UTC 2019 - Илья Индиго +Tue Jul 23 07:42:13 UTC 2019 - Илья Индиго - Remove patch GCC9-buildfix.patch (upsteamed) diff --git a/mpd.spec b/mpd.spec index b307710..6454969 100644 --- a/mpd.spec +++ b/mpd.spec @@ -34,6 +34,7 @@ Source5: %{name}.tmpfiles.d Source9: %{name}.keyring Patch0: %{name}-conf.patch Patch1: %{name}-sndfile.patch +Patch2: %{name}-fmt11.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: group(audio)