CVS commit: pkgsrc/audio/musicpd

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Jan  6 04:48:03 UTC 2025

Modified Files:
        pkgsrc/audio/musicpd: Makefile distinfo
Added Files:
        pkgsrc/audio/musicpd/patches: patch-src_client_Response.hxx

Log Message:
audio/musicpd: Update to 0.23.16

ver 0.23.16 (2024/12/03)
* database
  - fix integer overflows with 64-bit inode numbers
* filter
  - ffmpeg: fix for filters producing no output
* support libfmt 11
* support ICU 76


To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.152 -r1.153 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/musicpd/patches/patch-src_client_Response.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/Makefile
diff -u pkgsrc/audio/musicpd/Makefile:1.321 pkgsrc/audio/musicpd/Makefile:1.322
--- pkgsrc/audio/musicpd/Makefile:1.321 Sun Dec 29 15:09:39 2024
+++ pkgsrc/audio/musicpd/Makefile       Mon Jan  6 04:48:03 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.321 2024/12/29 15:09:39 adam Exp $
+# $NetBSD: Makefile,v 1.322 2025/01/06 04:48:03 pho Exp $
 
-DISTNAME=      mpd-0.23.15
+DISTNAME=      mpd-0.23.16
 PKGNAME=       ${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=   14
 CATEGORIES=    audio
 MASTER_SITES=  https://www.musicpd.org/download/mpd/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/audio/musicpd/distinfo
diff -u pkgsrc/audio/musicpd/distinfo:1.152 pkgsrc/audio/musicpd/distinfo:1.153
--- pkgsrc/audio/musicpd/distinfo:1.152 Mon Jul 15 10:06:15 2024
+++ pkgsrc/audio/musicpd/distinfo       Mon Jan  6 04:48:03 2025
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.152 2024/07/15 10:06:15 adam Exp $
+$NetBSD: distinfo,v 1.153 2025/01/06 04:48:03 pho 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
+BLAKE2s (mpd-0.23.16.tar.xz) = 85ca3326b4940412138abb1101350579df6dde3f0306ec054d44cf9b1e4c8882
+SHA512 (mpd-0.23.16.tar.xz) = 1b7042cbe8543270b26c1a9e4f35d80d68e03682e4d1e039af8f52527753830972de2a763e5dfb7bde28f4c9d0308a397becd4a206d17e7a5b2fa97f48b69d20
+Size (mpd-0.23.16.tar.xz) = 778572 bytes
 SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
-SHA1 (patch-src_Log.cxx) = 03b6dd6a5edf520bbe82390a367b642ff5784ff8
+SHA1 (patch-src_client_Response.hxx) = 627abb1ebf0d96ad2e7be06b2c55ab8ea837c201
 SHA1 (patch-src_decoder_plugins_meson.build) = 8033d6e19da05f472f14f3562a5dfc2f410da98b
-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

Added files:

Index: pkgsrc/audio/musicpd/patches/patch-src_client_Response.hxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_client_Response.hxx:1.1
--- /dev/null   Mon Jan  6 04:48:03 2025
+++ pkgsrc/audio/musicpd/patches/patch-src_client_Response.hxx  Mon Jan  6 04:48:03 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_client_Response.hxx,v 1.1 2025/01/06 04:48:03 pho Exp $
+
+Fix build with fmtlib-11. In this function S can be a type created by
+fmtlib macro FMT_STRING(), which is actually a lambda function and cannot
+be converted directly to fmt::string_view.
+
+https://github.com/MusicPlayerDaemon/MPD/issues/2173
+
+--- src/client/Response.hxx.orig       2025-01-06 04:21:57.888848307 +0000
++++ src/client/Response.hxx
+@@ -83,7 +83,7 @@ public:
+       template<typename S, typename... Args>
+       bool Fmt(const S &format_str, Args&&... args) noexcept {
+ #if FMT_VERSION >= 90000
+-              return VFmt(format_str,
++              return VFmt(fmt::format_string<Args...>(format_str),
+                           fmt::make_format_args(args...));
+ #elif FMT_VERSION >= 70000
+               return VFmt(fmt::to_string_view(format_str),
+@@ -113,7 +113,7 @@ public:
+       void FmtError(enum ack code,
+                     const S &format_str, Args&&... args) noexcept {
+ #if FMT_VERSION >= 90000
+-              return VFmtError(code, format_str,
++              return VFmtError(code, fmt::format_string<Args...>(format_str),
+                                fmt::make_format_args(args...));
+ #elif FMT_VERSION >= 70000
+               return VFmtError(code, fmt::to_string_view(format_str),