diff --git a/mpd-0.23.15.tar.xz b/mpd-0.23.15.tar.xz deleted file mode 100644 index a9a4cd7..0000000 --- a/mpd-0.23.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a -size 778384 diff --git a/mpd-0.23.15.tar.xz.sig b/mpd-0.23.15.tar.xz.sig deleted file mode 100644 index ccd9e16..0000000 Binary files a/mpd-0.23.15.tar.xz.sig and /dev/null differ diff --git a/mpd-0.23.16.tar.xz b/mpd-0.23.16.tar.xz new file mode 100644 index 0000000..abbb447 --- /dev/null +++ b/mpd-0.23.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9668e36df80de485683c962d02845bf314d8a08e6141af7afeff76401e32b2c1 +size 778572 diff --git a/mpd-0.23.16.tar.xz.sig b/mpd-0.23.16.tar.xz.sig new file mode 100644 index 0000000..c55f1de Binary files /dev/null and b/mpd-0.23.16.tar.xz.sig differ diff --git a/mpd-fmt11.patch b/mpd-fmt11.patch deleted file mode 100644 index ae7d7bc..0000000 --- a/mpd-fmt11.patch +++ /dev/null @@ -1,79 +0,0 @@ -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-icu76.patch b/mpd-icu76.patch deleted file mode 100644 index 9acadcf..0000000 --- a/mpd-icu76.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Pdpru mpd-0.23.15.orig/meson.build mpd-0.23.15/meson.build ---- mpd-0.23.15.orig/meson.build 2023-12-20 18:21:57.000000000 +0300 -+++ mpd-0.23.15/meson.build 2024-11-23 00:40:07.712091468 +0300 -@@ -135,6 +135,7 @@ if get_option('buildtype') != 'debug' - ] - test_ldflags += [ - '-Wl,--gc-sections', -+ '-licuuc', - ] - endif - diff --git a/mpd.changes b/mpd.changes index 0746dcf..0faebd1 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Dec 11 12:29:03 UTC 2024 - Илья Индиго + +- Updated to 0.23.16 + * Removed files mpd-fmt11.patch and mpd-icu76.patch. + * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.16/NEWS + * database: fixed integer overflows with 64-bit inode numbers + * filter: ffmpeg: fixed for filters producing no output + * supported libfmt 11 and ICU 76 + ------------------------------------------------------------------- Fri Nov 22 21:56:28 UTC 2024 - Илья Индиго diff --git a/mpd.spec b/mpd.spec index 485c368..06fe39a 100644 --- a/mpd.spec +++ b/mpd.spec @@ -20,7 +20,7 @@ %bcond_with faad %bcond_without mpd_iso9660 Name: mpd -Version: 0.23.15 +Version: 0.23.16 Release: 0 Summary: Music Player Daemon License: GPL-2.0-or-later @@ -34,8 +34,6 @@ Source5: %{name}.tmpfiles.d Source9: %{name}.keyring Patch0: %{name}-conf.patch Patch1: %{name}-sndfile.patch -Patch2: %{name}-fmt11.patch -Patch3: %{name}-icu76.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: group(audio) @@ -66,7 +64,7 @@ BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(libcdio) >= 2.0.0 +BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgme)