CVS commit: pkgsrc/audio/musicpd

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul 15 10:06:15 UTC 2024

Modified Files:
        pkgsrc/audio/musicpd: distinfo
        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
Added Files:
        pkgsrc/audio/musicpd/patches: patch-src_Log.cxx

Log Message:
musicpd: fix patches; fix build with fmtlib 11


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/musicpd/patches/patch-src_Log.cxx
cvs rdiff -u -r1.1 -r1.2 \
    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.151 pkgsrc/audio/musicpd/distinfo:1.152
--- pkgsrc/audio/musicpd/distinfo:1.151 Sun Jul 14 23:20:51 2024
+++ pkgsrc/audio/musicpd/distinfo       Mon Jul 15 10:06:15 2024
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.151 2024/07/14 23:20:51 mrg Exp $
+$NetBSD: distinfo,v 1.152 2024/07/15 10:06:15 adam 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_Log.cxx) = 03b6dd6a5edf520bbe82390a367b642ff5784ff8
 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_lib_ffmpeg_LibFmt.hxx) = c61d87f1e43b4cdd2160b0fdbc05496e5f6533f0
+SHA1 (patch-src_lib_fmt_AudioFormatFormatter.hxx) = 91af56ddb362c177b3a79a49dc2b7d3118fa7339
+SHA1 (patch-src_lib_fmt_ExceptionFormatter.hxx) = 631175bc5bbcc18803d5b17f4690936854a30c5e
+SHA1 (patch-src_lib_fmt_PathFormatter.hxx) = a8004c78de4716347fc8cfe91bb809f2c73e9728
 SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233

Index: pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx
diff -u pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx:1.1 pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx:1.2
--- pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx:1.1    Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_ffmpeg_LibFmt.hxx        Mon Jul 15 10:06:15 2024
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_lib_ffmpeg_LibFmt.hxx,v 1.2 2024/07/15 10:06:15 adam Exp $
+
 --- 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 @@
Index: pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx
diff -u pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx:1.1 pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx:1.2
--- pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx:1.1 Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_AudioFormatFormatter.hxx     Mon Jul 15 10:06:15 2024
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_lib_fmt_AudioFormatFormatter.hxx,v 1.2 2024/07/15 10:06:15 adam Exp $
+
 --- 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 @@
Index: pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx
diff -u pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx:1.1 pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx:1.2
--- pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx:1.1   Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_ExceptionFormatter.hxx       Mon Jul 15 10:06:15 2024
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_lib_fmt_ExceptionFormatter.hxx,v 1.2 2024/07/15 10:06:15 adam Exp $
+
 --- 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 @@
Index: pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx
diff -u pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx:1.1 pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx:1.2
--- pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx:1.1        Sun Jul 14 23:20:52 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_lib_fmt_PathFormatter.hxx    Mon Jul 15 10:06:15 2024
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_lib_fmt_PathFormatter.hxx,v 1.2 2024/07/15 10:06:15 adam Exp $
+
 --- 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 @@

Added files:

Index: pkgsrc/audio/musicpd/patches/patch-src_Log.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_Log.cxx:1.1
--- /dev/null   Mon Jul 15 10:06:15 2024
+++ pkgsrc/audio/musicpd/patches/patch-src_Log.cxx      Mon Jul 15 10:06:15 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Log.cxx,v 1.1 2024/07/15 10:06:15 adam Exp $
+
+Fix build with fmtlib 11.
+
+--- src/Log.cxx.orig   2024-07-15 09:58:53.526175404 +0000
++++ src/Log.cxx
+@@ -21,6 +21,7 @@
+ #include "lib/fmt/ExceptionFormatter.hxx"
+ #include "util/Domain.hxx"
+ 
++#include <iterator>
+ #include <fmt/format.h>
+ 
+ static constexpr Domain exception_domain("exception");