mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
mpd: update to 0.23.16 and addon (2)
This commit is contained in:
parent
302bbbdb44
commit
a248cc46d2
@ -3,9 +3,9 @@
|
|||||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="mpd"
|
PKG_NAME="mpd"
|
||||||
PKG_VERSION="0.23.15"
|
PKG_VERSION="0.23.16"
|
||||||
PKG_SHA256="550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a"
|
PKG_SHA256="9668e36df80de485683c962d02845bf314d8a08e6141af7afeff76401e32b2c1"
|
||||||
PKG_REV="1"
|
PKG_REV="2"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="https://www.musicpd.org"
|
PKG_SITE="https://www.musicpd.org"
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rudi Heitbaum <rudi@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@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);
|
|
||||||
}
|
|
||||||
};
|
|
Loading…
x
Reference in New Issue
Block a user