webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

mpd: Patch mpd to deal with format function being const in fmt-11.0.0 onwards

Browse Source 
- Commit has been made in mpd but no release has yet been made with the change. When the
   next version release of mpd occurs this patch can be removed.
- The patch changes all format calls to be const . Without this patch mpd will not build
   with fmt-11.0.0 or newer.
- Update of rootfile not required.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2024-07-16 13:00:05 +02:00
committed by Michael Tremer
parent 6c0e02c80d
commit a893eebb91
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lfs/mpd
View File

@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/${THISAPP} DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd PROG = mpd
PAK_VER = 38 PAK_VER = 39
# SUP_ARCH = aarch64 x86_64 # SUP_ARCH = aarch64 x86_64
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt
@@ -82,6 +82,7 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) @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) $(UPDATE_AUTOMAKE)
cd $(DIR_APP) && meson setup \ cd $(DIR_APP) && meson setup \
--prefix=/usr \ --prefix=/usr \

57
src/patches/mpd-0.23.15_make_format_function_const_for_fmt-11.0.0.patch Normal file
View File

@@ -0,0 +1,57 @@
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);
}
};