CVS commit: pkgsrc/audio/musicpd

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Jul 14 23:20:52 UTC 2024

Modified Files:
        pkgsrc/audio/musicpd: distinfo
Added Files:
        pkgsrc/audio/musicpd/patches: patch-src_lib_ffmpeg_LibFmt.hxx
            patch-src_lib_fmt_AudioFormatFormatter.hxx
            patch-src_lib_fmt_ExceptionFormatter.hxx
            patch-src_lib_fmt_PathFormatter.hxx

Log Message:
fix the build since fmtlib 11 import.

taken from upstream commit:
   https://github.com/MusicPlayerDaemon/MPD/commit/1402869715e3efca87942d79c3173a6b21a6925d

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 <rudi%heitbaum.com@localhost>


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx \
    pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx \
    pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx \
    pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/musicpd/distinfo
diff -u pkgsrc/audio/musicpd/distinfo:1.150 pkgsrc/audio/musicpd/distinfo:1.151
--- pkgsrc/audio/musicpd/distinfo:1.150 Sat Dec 30 10:16:49 2023
+++ pkgsrc/audio/musicpd/distinfo       Sun Jul 14 23:20:51 2024
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.150 2023/12/30 10:16:49 wiz Exp $
+$NetBSD: distinfo,v 1.151 2024/07/14 23:20:51 mrg Exp $
 
 BLAKE2s (mpd-0.23.15.tar.xz) = 4dbe77472beed2be4d4290c5ba9082114680ec46baa1ac27d1997a0bfdb1cf93
 SHA512 (mpd-0.23.15.tar.xz) = 12329dbd0c1994c1bd95b88ce2a62a4c1d691b655e9e4fac7e9ef7066d0be3422b26fad3ea6ca144ba9b21add0a7c492c4f74fd2b68a1539bff2e0d2714db709
 Size (mpd-0.23.15.tar.xz) = 778384 bytes
 SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
 SHA1 (patch-src_decoder_plugins_meson.build) = 8033d6e19da05f472f14f3562a5dfc2f410da98b
+SHA1 (patch-src_lib_ffmpeg_LibFmt.hxx) = 91fcac12d2f957507140bb56c02438323bb0f11b
+SHA1 (patch-src_lib_fmt_AudioFormatFormatter.hxx) = 2dbe1792bf73cf893ac334c90ba820de9d76f171
+SHA1 (patch-src_lib_fmt_ExceptionFormatter.hxx) = cd870f84d6159d787c9b33394cdab9cad5c97a15
+SHA1 (patch-src_lib_fmt_PathFormatter.hxx) = 9f0f34326c58e5d74139342e71cfe3e2dc371174
 SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233

Added files:

Index: pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx:1.1
--- /dev/null   Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx        Sun Jul 14 23:20:52 2024
@@ -0,0 +1,11 @@
+--- src/lib/ffmpeg/LibFmt.hxx.orig     2023-12-20 07:21:57.000000000 -0800
++++ src/lib/ffmpeg/LibFmt.hxx  2024-07-14 16:13:04.359461264 -0700
+@@ -29,7 +29,7 @@
+ 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 = "?";
Index: pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx:1.1
--- /dev/null   Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx     Sun Jul 14 23:20:52 2024
@@ -0,0 +1,20 @@
+--- src/lib/fmt/AudioFormatFormatter.hxx.orig  2023-12-20 07:21:57.000000000 -0800
++++ src/lib/fmt/AudioFormatFormatter.hxx       2024-07-14 16:13:04.360021663 -0700
+@@ -39,7 +39,7 @@
+ 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 @@
+ 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);
+       }
Index: pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx:1.1
--- /dev/null   Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx       Sun Jul 14 23:20:52 2024
@@ -0,0 +1,11 @@
+--- src/lib/fmt/ExceptionFormatter.hxx.orig    2023-12-20 07:21:57.000000000 -0800
++++ src/lib/fmt/ExceptionFormatter.hxx 2024-07-14 16:13:04.360506262 -0700
+@@ -38,7 +38,7 @@
+ 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);
+       }
+ };
Index: pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx:1.1
--- /dev/null   Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx    Sun Jul 14 23:20:52 2024
@@ -0,0 +1,11 @@
+--- src/lib/fmt/PathFormatter.hxx.orig 2023-12-20 07:21:57.000000000 -0800
++++ src/lib/fmt/PathFormatter.hxx      2024-07-14 16:14:38.192993397 -0700
+@@ -29,7 +29,7 @@
+ 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);
+       }
+ };