[1/2] mpd: Update to version 0.23.17

Message ID 20250221122127.1634470-1-adolf.belka@ipfire.org
State New
Headers
Series [1/2] mpd: Update to version 0.23.17 |

Commit Message

Adolf Belka Feb. 21, 2025, 12:21 p.m. UTC
  - Update from version 0.23.15 to 0.23.17
- Update of rootfile not required
- Patch no longer needed as the fixes to work with fmt-11.0.x have been included in the
   source tarball.
- This version includes the fix to work with fmt-11.1.x
- Changelog
    0.23.17
	* protocol
	  - "albumart" tries to send larger chunks if available
	  - explicitly disallow "idle" and "noidle" in command lists
	* storage
	  - nfs: require libnfs 4.0 or later
	* database
	  - inotify: trigger update after symlink was created
	* decoder
	  - ffmpeg: prefer over sndfile and audiofile for its DTS-WAV support
	* support libfmt 11.1
    0.23.16
	* database
	  - fix integer overflows with 64-bit inode numbers
	* filter
	  - ffmpeg: fix for filters producing no output
	* support libfmt 11
	* support ICU 76

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/mpd                                       |  9 ++-
 ...format_function_const_for_fmt-11.0.0.patch | 57 -------------------
 2 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 src/patches/mpd-0.23.15_make_format_function_const_for_fmt-11.0.0.patch
  

Patch

diff --git a/lfs/mpd b/lfs/mpd
index 40b34b910..7ec2d7df1 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@  include Config
 
 SUMMARY    = Music Player Daemon
 
-VER        = 0.23.15
+VER        = 0.23.17
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -34,7 +34,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 42
+PAK_VER    = 43
 # SUP_ARCH   = aarch64 x86_64
 
 DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt
@@ -49,7 +49,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 78036078b850afab900b5d50e44ce83cbbf900369f5028d4177fdbfc4128dd3c35c59a773528a1fcfcc0179d0e579566b827fe87ef780a88082dc3b7f70cd5e7
+$(DL_FILE)_BLAKE2 = 3a789244ebe38a181e0e63e32b7a3a6dd0b5f8ea081355d61dda82ba7d5788bbe5f4bf55abb3e5036be54442373d857442fc12f4b66bd9ee0c8e7051bf1f70af
 
 install : $(TARGET)
 
@@ -82,7 +82,6 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpd-0.23.15_make_format_function_const_for_fmt-11.0.0.patch
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && meson setup \
 				--prefix=/usr \
diff --git a/src/patches/mpd-0.23.15_make_format_function_const_for_fmt-11.0.0.patch b/src/patches/mpd-0.23.15_make_format_function_const_for_fmt-11.0.0.patch
deleted file mode 100644
index beea45484..000000000
--- a/src/patches/mpd-0.23.15_make_format_function_const_for_fmt-11.0.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@ 
-diff -Naur mpd-0.23.15.orig/src/lib/ffmpeg/LibFmt.hxx mpd-0.23.15/src/lib/ffmpeg/LibFmt.hxx
---- mpd-0.23.15.orig/src/lib/ffmpeg/LibFmt.hxx	2023-12-20 16:21:57.000000000 +0100
-+++ mpd-0.23.15/src/lib/ffmpeg/LibFmt.hxx	2024-07-15 23:04:27.093307051 +0200
-@@ -29,7 +29,7 @@
- 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 -Naur mpd-0.23.15.orig/src/lib/fmt/AudioFormatFormatter.hxx mpd-0.23.15/src/lib/fmt/AudioFormatFormatter.hxx
---- mpd-0.23.15.orig/src/lib/fmt/AudioFormatFormatter.hxx	2023-12-20 16:21:57.000000000 +0100
-+++ mpd-0.23.15/src/lib/fmt/AudioFormatFormatter.hxx	2024-07-15 23:05:48.519267115 +0200
-@@ -39,7 +39,7 @@
- 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 @@
- 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 -Naur mpd-0.23.15.orig/src/lib/fmt/ExceptionFormatter.hxx mpd-0.23.15/src/lib/fmt/ExceptionFormatter.hxx
---- mpd-0.23.15.orig/src/lib/fmt/ExceptionFormatter.hxx	2023-12-20 16:21:57.000000000 +0100
-+++ mpd-0.23.15/src/lib/fmt/ExceptionFormatter.hxx	2024-07-15 23:06:21.330325382 +0200
-@@ -38,7 +38,7 @@
- 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 -Naur mpd-0.23.15.orig/src/lib/fmt/PathFormatter.hxx mpd-0.23.15/src/lib/fmt/PathFormatter.hxx
---- mpd-0.23.15.orig/src/lib/fmt/PathFormatter.hxx	2023-12-20 16:21:57.000000000 +0100
-+++ mpd-0.23.15/src/lib/fmt/PathFormatter.hxx	2024-07-15 23:07:13.908687683 +0200
-@@ -29,7 +29,7 @@
- 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);
- 	}
- };