Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 audio-players/mpd/DETAILS              |    2 
 audio-players/mpd/HISTORY              |    4 +
 audio-players/mpd/patches/fmt-11.patch |   79 
---------------------------------
 audio-players/mpd/patches/icu-76.patch |   49 --------------------
 4 files changed, 5 insertions(+), 129 deletions(-)

New commits:
commit f5725a7a3321a76696d060583497a2028db608b0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    audio-players/mpd: version 0.23.16

diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 113db26..bfd1647 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,6 +1,6 @@
 . "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=mpd
-         VERSION=0.23.15
+         VERSION=0.23.16
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    
SOURCE_URL[0]=http://www.musicpd.org/download/${SPELL}/${VERSION:0:4}/${SOURCE}
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 2739348..5e50c93 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,7 @@
+2024-12-03 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 0.23.16
+       * patches/fmt-11.patch, patches/icu-76.patch: removed, applied in 
upstream
+
 2024-10-27 Pavel Vinogradov <public AT sourcemage.org>
        * patches/icu-76.patch: added to build with ICU 76
 
diff --git a/audio-players/mpd/patches/fmt-11.patch 
b/audio-players/mpd/patches/fmt-11.patch
deleted file mode 100644
index f6d8c7d..0000000
--- a/audio-players/mpd/patches/fmt-11.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi AT heitbaum.com>
-Date: Fri, 5 Jul 2024 14:27:45 +0000
-Subject: [PATCH] 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 AT heitbaum.com>
----
- src/lib/ffmpeg/LibFmt.hxx            | 2 +-
- src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
- src/lib/fmt/ExceptionFormatter.hxx   | 2 +-
- src/lib/fmt/PathFormatter.hxx        | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
-index aa068711f3..dee83ed2d5 100644
---- a/src/lib/ffmpeg/LibFmt.hxx
-+++ b/src/lib/ffmpeg/LibFmt.hxx
-@@ -13,7 +13,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 = "?";
-diff --git a/src/lib/fmt/AudioFormatFormatter.hxx 
b/src/lib/fmt/AudioFormatFormatter.hxx
-index e0ffb62160..8da98efd41 100644
---- a/src/lib/fmt/AudioFormatFormatter.hxx
-+++ b/src/lib/fmt/AudioFormatFormatter.hxx
-@@ -13,7 +13,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);
-       }
-@@ -23,7 +23,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);
-       }
-diff --git a/src/lib/fmt/ExceptionFormatter.hxx 
b/src/lib/fmt/ExceptionFormatter.hxx
-index 3f342df672..f08b3bb228 100644
---- a/src/lib/fmt/ExceptionFormatter.hxx
-+++ b/src/lib/fmt/ExceptionFormatter.hxx
-@@ -12,7 +12,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);
-       }
- };
-diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
-index e5ae89dec5..add06df81b 100644
---- a/src/lib/fmt/PathFormatter.hxx
-+++ b/src/lib/fmt/PathFormatter.hxx
-@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
- struct fmt::formatter<T> : 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);
-       }
- };
diff --git a/audio-players/mpd/patches/icu-76.patch 
b/audio-players/mpd/patches/icu-76.patch
deleted file mode 100644
index f82fc4d..0000000
--- a/audio-players/mpd/patches/icu-76.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1a063fee7ec1077e248ff97ebf1f92c5c5941a67 Mon Sep 17 00:00:00 2001
-From: Michael Cho <michael AT michaelcho.dev>
-Date: Sat, 26 Oct 2024 10:29:53 -0400
-Subject: [PATCH] meson.build: support building with ICU 76
-
-ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer
-add `icu-uc` when linking to shared libraries. This results in failure:
-```
-src/lib/icu/libicu.a.p/Converter.cxx.o: undefined reference to symbol 
'ucnv_fromUnicode_76'
-```
-
-[^1]: 
https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56
----
- src/lib/icu/meson.build | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build
-index 3ecc0a517f..e6cf8cdcea 100644
---- a/src/lib/icu/meson.build
-+++ b/src/lib/icu/meson.build
-@@ -1,5 +1,7 @@
--icu_dep = dependency('icu-i18n', version: '>= 50', required: 
get_option('icu'))
--conf.set('HAVE_ICU', icu_dep.found())
-+icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required: 
get_option('icu'))
-+icu_uc_dep = dependency('icu-uc', version: '>= 50', required: 
get_option('icu'))
-+have_icu = icu_i18n_dep.found() and icu_uc_dep.found()
-+conf.set('HAVE_ICU', have_icu)
- 
- icu_sources = [
-   'Canonicalize.cxx',
-@@ -13,7 +15,7 @@ if is_windows
- endif
- 
- iconv_dep = []
--if icu_dep.found()
-+if have_icu
-   icu_sources += [
-     'Init.cxx',
-     'Util.cxx',
-@@ -31,7 +33,8 @@ icu = static_library(
-   icu_sources,
-   include_directories: inc,
-   dependencies: [
--    icu_dep,
-+    icu_i18n_dep,
-+    icu_uc_dep,
-     iconv_dep,
-     fmt_dep,
-   ],