From b2afc3a7d363fbfaafffecceddf251a6e5f5cd8e Mon Sep 17 00:00:00 2001
From: lraab <lraab@openbsd.org>
Date: Mon, 23 Dec 2024 16:55:25 +0000
Subject: [PATCH] audio/mpd: update to 0.23.16

ok landry@, kirill@
---
 audio/mpd/Makefile                            |  3 +--
 audio/mpd/distinfo                            |  4 ++--
 audio/mpd/patches/patch-src_Log_cxx           | 15 ------------
 .../patches/patch-src_lib_ffmpeg_LibFmt_hxx   | 15 ------------
 ...patch-src_lib_fmt_AudioFormatFormatter_hxx | 24 -------------------
 .../patch-src_lib_fmt_ExceptionFormatter_hxx  | 15 ------------
 .../patch-src_lib_fmt_PathFormatter_hxx       | 15 ------------
 7 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 audio/mpd/patches/patch-src_Log_cxx
 delete mode 100644 audio/mpd/patches/patch-src_lib_ffmpeg_LibFmt_hxx
 delete mode 100644 audio/mpd/patches/patch-src_lib_fmt_AudioFormatFormatter_hxx
 delete mode 100644 audio/mpd/patches/patch-src_lib_fmt_ExceptionFormatter_hxx
 delete mode 100644 audio/mpd/patches/patch-src_lib_fmt_PathFormatter_hxx

diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile
index 8141a68f8c9..8866838b1c2 100644
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@@ -1,8 +1,7 @@
 BROKEN-hppa =		no atomic ops
 COMMENT =		Music Player Daemon
-VER =			0.23.15
+VER =			0.23.16
 DISTNAME =		mpd-${VER}
-REVISION =		0
 EXTRACT_SUFX =		.tar.xz
 CATEGORIES =		audio
 HOMEPAGE =		https://www.musicpd.org/
diff --git a/audio/mpd/distinfo b/audio/mpd/distinfo
index 92ba5646a4f..e678f2f6e1b 100644
--- a/audio/mpd/distinfo
+++ b/audio/mpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.23.15.tar.xz) = VQEyI5rRrPgsz4kFtWzBPcLIGkSJuW+6dzGzBJkHZho=
-SIZE (mpd-0.23.15.tar.xz) = 778384
+SHA256 (mpd-0.23.16.tar.xz) = lmjjbfgN5IVoPJYtAoRb8xTYoI5hQa96/v92QB4yssE=
+SIZE (mpd-0.23.16.tar.xz) = 778572
diff --git a/audio/mpd/patches/patch-src_Log_cxx b/audio/mpd/patches/patch-src_Log_cxx
deleted file mode 100644
index e9abfde8905..00000000000
--- a/audio/mpd/patches/patch-src_Log_cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-Log: add missing include for std::back_inserter()
-e380ae90ebb6325d1820b6f34e10bf3474710899
-
-Index: src/Log.cxx
---- src/Log.cxx.orig
-+++ src/Log.cxx
-@@ -23,6 +23,8 @@
- 
- #include <fmt/format.h>
- 
-+#include <iterator> // for std::back_inserter()
-+
- static constexpr Domain exception_domain("exception");
- 
- void
diff --git a/audio/mpd/patches/patch-src_lib_ffmpeg_LibFmt_hxx b/audio/mpd/patches/patch-src_lib_ffmpeg_LibFmt_hxx
deleted file mode 100644
index d132d001a53..00000000000
--- a/audio/mpd/patches/patch-src_lib_ffmpeg_LibFmt_hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-lib/fmt: support build with libfmt-11.0.0
-1402869715e3efca87942d79c3173a6b21a6925d
-
-Index: src/lib/ffmpeg/LibFmt.hxx
---- src/lib/ffmpeg/LibFmt.hxx.orig
-+++ src/lib/ffmpeg/LibFmt.hxx
-@@ -29,7 +29,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/audio/mpd/patches/patch-src_lib_fmt_AudioFormatFormatter_hxx b/audio/mpd/patches/patch-src_lib_fmt_AudioFormatFormatter_hxx
deleted file mode 100644
index ad104eeb435..00000000000
--- a/audio/mpd/patches/patch-src_lib_fmt_AudioFormatFormatter_hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/fmt: support build with libfmt-11.0.0
-3648475f871c33daa9e598c102a16e5a1a4d4dfc
-
-Index: src/lib/fmt/AudioFormatFormatter.hxx
---- src/lib/fmt/AudioFormatFormatter.hxx.orig
-+++ src/lib/fmt/AudioFormatFormatter.hxx
-@@ -39,7 +39,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);
- 	}
-@@ -49,7 +49,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/audio/mpd/patches/patch-src_lib_fmt_ExceptionFormatter_hxx b/audio/mpd/patches/patch-src_lib_fmt_ExceptionFormatter_hxx
deleted file mode 100644
index 33873547186..00000000000
--- a/audio/mpd/patches/patch-src_lib_fmt_ExceptionFormatter_hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-lib/fmt: support build with libfmt-11.0.0
-1402869715e3efca87942d79c3173a6b21a6925d
-
-Index: src/lib/fmt/ExceptionFormatter.hxx
---- src/lib/fmt/ExceptionFormatter.hxx.orig
-+++ src/lib/fmt/ExceptionFormatter.hxx
-@@ -38,7 +38,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/audio/mpd/patches/patch-src_lib_fmt_PathFormatter_hxx b/audio/mpd/patches/patch-src_lib_fmt_PathFormatter_hxx
deleted file mode 100644
index 1884e24392c..00000000000
--- a/audio/mpd/patches/patch-src_lib_fmt_PathFormatter_hxx
+++ /dev/null
@@ -1,15 +0,0 @@
-lib/fmt: support build with libfmt-11.0.0
-1402869715e3efca87942d79c3173a6b21a6925d
-
-Index: src/lib/fmt/PathFormatter.hxx
---- src/lib/fmt/PathFormatter.hxx.orig
-+++ src/lib/fmt/PathFormatter.hxx
-@@ -29,7 +29,7 @@ template<>
- 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);
- 	}
- };