On Mon, 23 Dec 2024 16:58:40 +0100,
Lucas Raab <tuftedoce...@fastmail.fm> wrote:
>
> [1 <text/plain; us-ascii (7bit)>]
> Hello,
>
> Here's an update for mpd to 0.23.16 that's been working fine. Namely, it
> incorporates the patches to update the fmt version. Look/work fine to
> anyone else?
>
Tested on -current/amd64. No regression for playing flac via HTTP.
ok kirill@
> Thanks,
> Lucas
> [2 mpd.diff <text/plain; us-ascii (7bit)>]
> diff refs/heads/master refs/heads/mpd
> commit - fa99bbe6b1ef87e609f2909eecca3c82266e034e
> commit + e793789353f0181777db73fd4fb1a71a03a83fe9
> blob - 8141a68f8c9c4bfefe0768ba0fc7a9917b54265f
> blob + 8866838b1c21534e385579d842db3111c2382506
> --- audio/mpd/Makefile
> +++ audio/mpd/Makefile
> @@ -1,8 +1,7 @@
> BROKEN-hppa = no atomic ops
> COMMENT = Music Player Daemon
> -VER = 0.23.15
> +VER = 0.23.16
> DISTNAME = mpd-${VER}
> -REVISION = 0
> EXTRACT_SUFX = .tar.xz
> CATEGORIES = audio
> HOMEPAGE = https://www.musicpd.org/
> blob - 92ba5646a4fc8ba8c7d50fbd8a4d1234bf17c9ba
> blob + e678f2f6e1b067b947ffff31ee5567129be7acc0
> --- audio/mpd/distinfo
> +++ audio/mpd/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (mpd-0.23.15.tar.xz) = VQEyI5rRrPgsz4kFtWzBPcLIGkSJuW+6dzGzBJkHZho=
> -SIZE (mpd-0.23.15.tar.xz) = 778384
> +SHA256 (mpd-0.23.16.tar.xz) = lmjjbfgN5IVoPJYtAoRb8xTYoI5hQa96/v92QB4yssE=
> +SIZE (mpd-0.23.16.tar.xz) = 778572
> blob - e9abfde890530d1eb4bcb3fba7e7f7e96296f382 (mode 644)
> blob + /dev/null
> --- audio/mpd/patches/patch-src_Log_cxx
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Log: add missing include for std::back_inserter()
> -e380ae90ebb6325d1820b6f34e10bf3474710899
> -
> -Index: src/Log.cxx
> ---- src/Log.cxx.orig
> -+++ src/Log.cxx
> -@@ -23,6 +23,8 @@
> -
> - #include <fmt/format.h>
> -
> -+#include <iterator> // for std::back_inserter()
> -+
> - static constexpr Domain exception_domain("exception");
> -
> - void
> blob - d132d001a53068da56b52c7f7d9de9a128748c0b (mode 644)
> blob + /dev/null
> --- audio/mpd/patches/patch-src_lib_ffmpeg_LibFmt_hxx
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -lib/fmt: support build with libfmt-11.0.0
> -1402869715e3efca87942d79c3173a6b21a6925d
> -
> -Index: src/lib/ffmpeg/LibFmt.hxx
> ---- src/lib/ffmpeg/LibFmt.hxx.orig
> -+++ src/lib/ffmpeg/LibFmt.hxx
> -@@ -29,7 +29,7 @@ template<>
> - struct fmt::formatter<AVSampleFormat> : formatter<string_view>
> - {
> - template<typename FormatContext>
> -- 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 = "?";
> blob - ad104eeb4359d85043c8eccb9f8520a549dcf597 (mode 644)
> blob + /dev/null
> --- audio/mpd/patches/patch-src_lib_fmt_AudioFormatFormatter_hxx
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -lib/fmt: support build with libfmt-11.0.0
> -3648475f871c33daa9e598c102a16e5a1a4d4dfc
> -
> -Index: src/lib/fmt/AudioFormatFormatter.hxx
> ---- src/lib/fmt/AudioFormatFormatter.hxx.orig
> -+++ src/lib/fmt/AudioFormatFormatter.hxx
> -@@ -39,7 +39,7 @@ template<>
> - struct fmt::formatter<SampleFormat> : formatter<string_view>
> - {
> - template<typename FormatContext>
> -- auto format(const SampleFormat format, FormatContext &ctx) {
> -+ auto format(const SampleFormat format, FormatContext &ctx) const {
> - return
> formatter<string_view>::format(sample_format_to_string(format),
> - ctx);
> - }
> -@@ -49,7 +49,7 @@ template<>
> - struct fmt::formatter<AudioFormat> : formatter<string_view>
> - {
> - template<typename FormatContext>
> -- auto format(const AudioFormat &af, FormatContext &ctx) {
> -+ auto format(const AudioFormat &af, FormatContext &ctx) const {
> - return formatter<string_view>::format(ToString(af).c_str(),
> - ctx);
> - }
> blob - 338735471869520a58127d5c7a0b43b8c81f8be0 (mode 644)
> blob + /dev/null
> --- audio/mpd/patches/patch-src_lib_fmt_ExceptionFormatter_hxx
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -lib/fmt: support build with libfmt-11.0.0
> -1402869715e3efca87942d79c3173a6b21a6925d
> -
> -Index: src/lib/fmt/ExceptionFormatter.hxx
> ---- src/lib/fmt/ExceptionFormatter.hxx.orig
> -+++ src/lib/fmt/ExceptionFormatter.hxx
> -@@ -38,7 +38,7 @@ template<>
> - struct fmt::formatter<std::exception_ptr> : formatter<string_view>
> - {
> - template<typename FormatContext>
> -- auto format(std::exception_ptr e, FormatContext &ctx) {
> -+ auto format(std::exception_ptr e, FormatContext &ctx) const {
> - return formatter<string_view>::format(GetFullMessage(e), ctx);
> - }
> - };
> blob - 1884e24392cbac663735190d9fe33a47ad5ebf0c (mode 644)
> blob + /dev/null
> --- audio/mpd/patches/patch-src_lib_fmt_PathFormatter_hxx
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -lib/fmt: support build with libfmt-11.0.0
> -1402869715e3efca87942d79c3173a6b21a6925d
> -
> -Index: src/lib/fmt/PathFormatter.hxx
> ---- src/lib/fmt/PathFormatter.hxx.orig
> -+++ src/lib/fmt/PathFormatter.hxx
> -@@ -29,7 +29,7 @@ template<>
> - struct fmt::formatter<Path> : formatter<string_view>
> - {
> - template<typename FormatContext>
> -- auto format(Path path, FormatContext &ctx) {
> -+ auto format(Path path, FormatContext &ctx) const {
> - return formatter<string_view>::format(path.ToUTF8(), ctx);
> - }
> - };
--
wbr, Kirill
