Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d113816cab04fe9a5b40379913278ef3904deca8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d113816cab04fe9a5b40379913278ef3904deca8)
  • Date: Sun, 10 Jul 2022 22:29:53 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

audio-players/mpd/DETAILS | 2
audio-players/mpd/HISTORY | 4 +
audio-players/mpd/patches/fmt-v9.patch | 42
-----------------
audio-players/mpd/patches/pipewire-nullptr-check.patch | 30 ------------
4 files changed, 5 insertions(+), 73 deletions(-)

New commits:
commit d113816cab04fe9a5b40379913278ef3904deca8
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

audio-players/mpd: version 0.23.8

diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 04d576b..221c28d 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=mpd
- VERSION=0.23.7
+ VERSION=0.23.8
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://www.musicpd.org/download/${SPELL}/${VERSION:0:4}/${SOURCE}
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index f0887d5..75ef32c 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,7 @@
+2022-07-10 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.23.8
+ * patches/{pipewire-nullptr-check,fmt-v9}.patch: dropped, fixed by
upstream
+
2022-07-06 Pavel Vinogradov <public AT sourcemage.org>
* patches/pipewire-nullptr-check.patch: added fix preventing mpd from
crashing
when output is pipewire >= 0.3.53
diff --git a/audio-players/mpd/patches/fmt-v9.patch
b/audio-players/mpd/patches/fmt-v9.patch
deleted file mode 100644
index 9a2b834..0000000
--- a/audio-players/mpd/patches/fmt-v9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/client/Response.hxx b/src/client/Response.hxx
---- a/src/client/Response.hxx
-+++ b/src/client/Response.hxx
-@@ -82,7 +82,10 @@ public:
-
- template<typename S, typename... Args>
- bool Fmt(const S &format_str, Args&&... args) noexcept {
--#if FMT_VERSION >= 70000
-+#if FMT_VERSION >= 90000
-+ return VFmt(fmt::detail::to_string_view(format_str),
-+
fmt::make_format_args<fmt::v9::buffer_context<fmt::v9::char_t<S>>>(args...));
-+#elif FMT_VERSION >= 70000
- return VFmt(fmt::to_string_view(format_str),
- fmt::make_args_checked<Args...>(format_str,
- args...));
-@@ -109,7 +112,10 @@ public:
- template<typename S, typename... Args>
- void FmtError(enum ack code,
- const S &format_str, Args&&... args) noexcept {
--#if FMT_VERSION >= 70000
-+#if FMT_VERSION >= 90000
-+ return VFmtError(code,
fmt::detail::to_string_view(format_str),
-+
fmt::make_format_args<fmt::v9::buffer_context<fmt::v9::char_t<S>>>(args...));
-+#elif FMT_VERSION >= 70000
- return VFmtError(code, fmt::to_string_view(format_str),
- fmt::make_args_checked<Args...>(format_str,
- args...));
-diff --git a/src/Log.hxxb/src/Log.hxx
---- a/src/Log.hxx
-+++ b/src/Log.hxx
-@@ -45,7 +45,10 @@ void
- LogFmt(LogLevel level, const Domain &domain,
- const S &format_str, Args&&... args) noexcept
- {
--#if FMT_VERSION >= 70000
-+#if FMT_VERSION >= 90000
-+ return LogVFmt(level, domain, fmt::detail::to_string_view(format_str),
-+
fmt::make_format_args<fmt::v9::buffer_context<fmt::v9::char_t<S>>>(args...));
-+#elif FMT_VERSION >= 70000
- return LogVFmt(level, domain, fmt::to_string_view(format_str),
- fmt::make_args_checked<Args...>(format_str,
- args...));
diff --git a/audio-players/mpd/patches/pipewire-nullptr-check.patch
b/audio-players/mpd/patches/pipewire-nullptr-check.patch
deleted file mode 100644
index 4d7bad2..0000000
--- a/audio-players/mpd/patches/pipewire-nullptr-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2ee57f9b0d8d08c554392e6b832a335593a7555d Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann AT gmail.com>
-Date: Mon, 4 Jul 2022 19:19:31 +0200
-Subject: [PATCH] output/PipeWire: add nullptr check, fixing crash with
- PipeWire 0.3.53
-
-Since PipeWire 0.3.53, control names can apparently be nulled, leading
-to crashes in applications assertion that the string cannot be
-nullptr.
-
-Closes https://github.com/MusicPlayerDaemon/MPD/issues/1558
----
- NEWS | 2 ++
- src/output/plugins/PipeWireOutputPlugin.cxx | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx
b/src/output/plugins/PipeWireOutputPlugin.cxx
-index 18821b1059..c752820d01 100644
---- a/src/output/plugins/PipeWireOutputPlugin.cxx
-+++ b/src/output/plugins/PipeWireOutputPlugin.cxx
-@@ -235,7 +235,8 @@ class PipeWireOutput final : AudioOutput {
- [[maybe_unused]] uint32_t id,
- const struct pw_stream_control *control)
noexcept {
- auto &o = *(PipeWireOutput *)data;
-- if (StringIsEqual(control->name, "Channel Volumes"))
-+ if (control->name != nullptr &&
-+ StringIsEqual(control->name, "Channel Volumes"))
- o.ControlInfo(control);
- }
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d113816cab04fe9a5b40379913278ef3904deca8), Pavel Vinogradov, 07/10/2022

Archive powered by MHonArc 2.6.24.

Top of Page