CVS commit: pkgsrc/audio/musicpd

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/musicpd
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 17 May 2023 10:45:41 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed May 17 10:45:41 UTC 2023

Modified Files:
        pkgsrc/audio/musicpd: distinfo
Added Files:
        pkgsrc/audio/musicpd/patches: patch-src_SongPrint.cxx
            patch-src_TagPrint.cxx patch-src_TimePrint.cxx
            patch-src_command_FileCommands.cxx
            patch-src_command_PlayerCommands.cxx
            patch-src_command_TagCommands.cxx

Log Message:
musicpd: fix build with fmtlib 10


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/musicpd/patches/patch-src_SongPrint.cxx \
    pkgsrc/audio/musicpd/patches/patch-src_TagPrint.cxx \
    pkgsrc/audio/musicpd/patches/patch-src_TimePrint.cxx \
    pkgsrc/audio/musicpd/patches/patch-src_command_FileCommands.cxx \
    pkgsrc/audio/musicpd/patches/patch-src_command_PlayerCommands.cxx \
    pkgsrc/audio/musicpd/patches/patch-src_command_TagCommands.cxx

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.145 pkgsrc/audio/musicpd/distinfo:1.146
--- pkgsrc/audio/musicpd/distinfo:1.145 Sun Jan 22 13:12:42 2023
+++ pkgsrc/audio/musicpd/distinfo       Wed May 17 10:45:41 2023
@@ -1,9 +1,15 @@
-$NetBSD: distinfo,v 1.145 2023/01/22 13:12:42 wiz Exp $
+$NetBSD: distinfo,v 1.146 2023/05/17 10:45:41 wiz Exp $
 
 BLAKE2s (mpd-0.23.12.tar.xz) = a47a41a84d8b8923ca0952d8d5b3cce225dd6b42d3d48262a4bbbcbaa9af7656
 SHA512 (mpd-0.23.12.tar.xz) = 54495b839d86b47ae6e2f6cf4e1baebd0e8eb924742e9db42cc7462ffc4b6f650b83f3eaea291fe905ff5f1975cf875537ffd23a111724013ce58e6df26ce36e
 Size (mpd-0.23.12.tar.xz) = 774708 bytes
 SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
+SHA1 (patch-src_SongPrint.cxx) = 83694e6e9f62ed775b6b369e6340f1f094f6797d
+SHA1 (patch-src_TagPrint.cxx) = 2491669683562e66c6d74b9de24e06633a27dfe5
+SHA1 (patch-src_TimePrint.cxx) = c50ae3b8cc5f61c5dbbd39b3b4beced91a37ecff
+SHA1 (patch-src_command_FileCommands.cxx) = 744cd47833dfea74b8fe92b62917375fff9c62ae
+SHA1 (patch-src_command_PlayerCommands.cxx) = 6c0346252279f833113ba5bcabbd40aea26f41a2
+SHA1 (patch-src_command_TagCommands.cxx) = ef7f0d87867d0ac9a033713d0345d1fab362c804
 SHA1 (patch-src_decoder_plugins_meson.build) = 8033d6e19da05f472f14f3562a5dfc2f410da98b
 SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233

Added files:

Index: pkgsrc/audio/musicpd/patches/patch-src_SongPrint.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_SongPrint.cxx:1.1
--- /dev/null   Wed May 17 10:45:41 2023
+++ pkgsrc/audio/musicpd/patches/patch-src_SongPrint.cxx        Wed May 17 10:45:41 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_SongPrint.cxx,v 1.1 2023/05/17 10:45:41 wiz Exp $
+
+Fix build with fmtlib 10.
+https://github.com/MusicPlayerDaemon/MPD/commit/181b96dd2d71bc8f2668776719d344466f258b5d
+
+--- src/SongPrint.cxx.orig     2023-01-17 17:54:47.000000000 +0000
++++ src/SongPrint.cxx
+@@ -24,6 +24,7 @@
+ #include "TagPrint.hxx"
+ #include "client/Response.hxx"
+ #include "fs/Traits.hxx"
++#include "lib/fmt/AudioFormatFormatter.hxx"
+ #include "time/ChronoUtil.hxx"
+ #include "util/StringBuffer.hxx"
+ #include "util/UriUtil.hxx"
+@@ -93,7 +94,7 @@ song_print_info(Response &r, const Light
+               time_print(r, "Last-Modified", song.mtime);
+ 
+       if (song.audio_format.IsDefined())
+-              r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format));
++              r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format);
+ 
+       tag_print_values(r, song.tag);
+ 
+@@ -116,7 +117,7 @@ song_print_info(Response &r, const Detac
+               time_print(r, "Last-Modified", song.GetLastModified());
+ 
+       if (const auto &f = song.GetAudioFormat(); f.IsDefined())
+-              r.Fmt(FMT_STRING("Format: {}\n"), ToString(f));
++              r.Fmt(FMT_STRING("Format: {}\n"), f);
+ 
+       tag_print_values(r, song.GetTag());
+ 
Index: pkgsrc/audio/musicpd/patches/patch-src_TagPrint.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_TagPrint.cxx:1.1
--- /dev/null   Wed May 17 10:45:41 2023
+++ pkgsrc/audio/musicpd/patches/patch-src_TagPrint.cxx Wed May 17 10:45:41 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_TagPrint.cxx,v 1.1 2023/05/17 10:45:41 wiz Exp $
+
+Fix build with fmtlib 10. Remove after 0.23.13.
+
+--- src/TagPrint.cxx.orig      2023-01-17 17:54:47.000000000 +0000
++++ src/TagPrint.cxx
+@@ -37,7 +37,7 @@ tag_print_types(Response &r) noexcept
+ void
+ tag_print(Response &r, TagType type, StringView value) noexcept
+ {
+-      r.Fmt(FMT_STRING("{}: {}\n"), tag_item_names[type], value);
++      r.Fmt(FMT_STRING("{}: {}\n"), tag_item_names[type], std::string(value));
+ }
+ 
+ void
Index: pkgsrc/audio/musicpd/patches/patch-src_TimePrint.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_TimePrint.cxx:1.1
--- /dev/null   Wed May 17 10:45:41 2023
+++ pkgsrc/audio/musicpd/patches/patch-src_TimePrint.cxx        Wed May 17 10:45:41 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_TimePrint.cxx,v 1.1 2023/05/17 10:45:41 wiz Exp $
+
+Fix build with fmtlib 10. Remove after 0.23.13.
+
+--- src/TimePrint.cxx.orig     2023-01-17 17:54:47.000000000 +0000
++++ src/TimePrint.cxx
+@@ -36,5 +36,5 @@ time_print(Response &r, const char *name
+               return;
+       }
+ 
+-      r.Fmt(FMT_STRING("{}: {}\n"), name, s);
++      r.Fmt(FMT_STRING("{}: {}\n"), std::string(name), std::string(s));
+ }
Index: pkgsrc/audio/musicpd/patches/patch-src_command_FileCommands.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_command_FileCommands.cxx:1.1
--- /dev/null   Wed May 17 10:45:41 2023
+++ pkgsrc/audio/musicpd/patches/patch-src_command_FileCommands.cxx     Wed May 17 10:45:41 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_command_FileCommands.cxx,v 1.1 2023/05/17 10:45:41 wiz Exp $
+
+Fix build with fmtlib 10. Remove after 0.23.13.
+
+--- src/command/FileCommands.cxx.orig  2023-01-17 17:54:47.000000000 +0000
++++ src/command/FileCommands.cxx
+@@ -132,7 +132,7 @@ public:
+ 
+       void OnPair(StringView key, StringView value) noexcept override {
+               if (IsValidName(key) && IsValidValue(value))
+-                      response.Fmt(FMT_STRING("{}: {}\n"), key, value);
++                      response.Fmt(FMT_STRING("{}: {}\n"), std::string(key), std::string(value));
+       }
+ };
+ 
Index: pkgsrc/audio/musicpd/patches/patch-src_command_PlayerCommands.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_command_PlayerCommands.cxx:1.1
--- /dev/null   Wed May 17 10:45:41 2023
+++ pkgsrc/audio/musicpd/patches/patch-src_command_PlayerCommands.cxx   Wed May 17 10:45:41 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_command_PlayerCommands.cxx,v 1.1 2023/05/17 10:45:41 wiz Exp $
+
+Fix build with fmtlib 10.
+https://github.com/MusicPlayerDaemon/MPD/commit/181b96dd2d71bc8f2668776719d344466f258b5d
+
+--- src/command/PlayerCommands.cxx.orig        2023-01-17 17:54:47.000000000 +0000
++++ src/command/PlayerCommands.cxx
+@@ -28,6 +28,7 @@
+ #include "Partition.hxx"
+ #include "Instance.hxx"
+ #include "IdleFlags.hxx"
++#include "lib/fmt/AudioFormatFormatter.hxx"
+ #include "util/StringBuffer.hxx"
+ #include "util/ScopeExit.hxx"
+ #include "util/Exception.hxx"
+@@ -185,7 +186,7 @@ handle_status(Client &client, [[maybe_un
+ 
+               if (player_status.audio_format.IsDefined())
+                       r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"),
+-                            ToString(player_status.audio_format));
++                            player_status.audio_format);
+       }
+ 
+ #ifdef ENABLE_DATABASE
Index: pkgsrc/audio/musicpd/patches/patch-src_command_TagCommands.cxx
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_command_TagCommands.cxx:1.1
--- /dev/null   Wed May 17 10:45:41 2023
+++ pkgsrc/audio/musicpd/patches/patch-src_command_TagCommands.cxx      Wed May 17 10:45:41 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_command_TagCommands.cxx,v 1.1 2023/05/17 10:45:41 wiz Exp $
+
+Fix build with fmtlib 10. Remove after 0.23.13.
+
+--- src/command/TagCommands.cxx.orig   2023-01-17 17:54:47.000000000 +0000
++++ src/command/TagCommands.cxx
+@@ -36,7 +36,7 @@ handle_addtagid(Client &client, Request 
+       const TagType tag_type = tag_name_parse_i(tag_name);
+       if (tag_type == TAG_NUM_OF_ITEM_TYPES) {
+               r.FmtError(ACK_ERROR_ARG, FMT_STRING("Unknown tag type: {}"),
+-                         tag_name);
++                         std::string(tag_name));
+               return CommandResult::ERROR;
+       }
+ 
+@@ -58,7 +58,7 @@ handle_cleartagid(Client &client, Reques
+               if (tag_type == TAG_NUM_OF_ITEM_TYPES) {
+                       r.FmtError(ACK_ERROR_ARG,
+                                  FMT_STRING("Unknown tag type: {}"),
+-                                 tag_name);
++                                 std::string(tag_name));
+                       return CommandResult::ERROR;
+               }
+       }

Prev by Date: CVS commit: pkgsrc/lang/clisp
Next by Date: CVS commit: pkgsrc/graphics/exiv2
Previous by Thread: CVS commit: pkgsrc/lang/clisp
Next by Thread: CVS commit: pkgsrc/graphics/exiv2
Indexes:

Home | Main Index | Thread Index | Old Index