Skip to content

Commit 4b0f742

Browse files
committed
mpd: update to 0.23.16
Add patch to fix compilation with fmt 11.1. Remove upstreamed patch. Signed-off-by: Rosen Penev <[email protected]>
1 parent c25ee5a commit 4b0f742

File tree

3 files changed

+23
-75
lines changed

3 files changed

+23
-75
lines changed

sound/mpd/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=mpd
9-
PKG_VERSION:=0.23.15
10-
PKG_RELEASE:=3
9+
PKG_VERSION:=0.23.16
10+
PKG_RELEASE:=1
1111

1212
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1313
PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.23
14-
PKG_HASH:=550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
14+
PKG_HASH:=9668e36df80de485683c962d02845bf314d8a08e6141af7afeff76401e32b2c1
1515

1616
PKG_MAINTAINER:=
1717
PKG_LICENSE:=GPL-2.0-or-later

sound/mpd/patches/010-fmt.patch

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/src/client/Response.hxx
2+
+++ b/src/client/Response.hxx
3+
@@ -83,7 +83,7 @@ public:
4+
template<typename S, typename... Args>
5+
bool Fmt(const S &format_str, Args&&... args) noexcept {
6+
#if FMT_VERSION >= 90000
7+
- return VFmt(format_str,
8+
+ return VFmt(fmt::format_string<Args...>(format_str),
9+
fmt::make_format_args(args...));
10+
#elif FMT_VERSION >= 70000
11+
return VFmt(fmt::to_string_view(format_str),
12+
@@ -113,7 +113,7 @@ public:
13+
void FmtError(enum ack code,
14+
const S &format_str, Args&&... args) noexcept {
15+
#if FMT_VERSION >= 90000
16+
- return VFmtError(code, format_str,
17+
+ return VFmtError(code, fmt::format_string<Args...>(format_str),
18+
fmt::make_format_args(args...));
19+
#elif FMT_VERSION >= 70000
20+
return VFmtError(code, fmt::to_string_view(format_str),

sound/mpd/patches/040-lib-fmt-support-build-with-libfmt-11.0.0.patch

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)