From: Jan Palus Date: Tue, 19 Oct 2021 13:01:15 +0000 (+0200) Subject: up to 0.23.1 X-Git-Tag: auto/th/mpd-0.23.1-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmpd.git;a=commitdiff_plain;h=299bf32 up to 0.23.1 --- diff --git a/mpd.spec b/mpd.spec index 58f5287..7be099e 100644 --- a/mpd.spec +++ b/mpd.spec @@ -9,18 +9,16 @@ Summary: Music Player Daemon Summary(pl.UTF-8): Music Player Daemon - demon odtwarzający muzykę Name: mpd -Version: 0.23 +Version: 0.23.1 Release: 1 License: GPL v2+ Group: Applications/Multimedia Source0: https://www.musicpd.org/download/mpd/0.23/%{name}-%{version}.tar.xz -# Source0-md5: 103db74cc275ec0f7e5b7503cfd80131 +# Source0-md5: 30e0f123416c904a098c2c053e284d07 Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.sysconfig Source4: %{name}.tmpfiles -Patch0: smb.patch -Patch1: pipewire-graph-samplerate.patch URL: http://www.musicpd.org/ BuildRequires: OpenAL-devel BuildRequires: adplug-devel @@ -173,8 +171,6 @@ Dokumentacja do Music Player Daemon (MPD). %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %meson build \ diff --git a/pipewire-graph-samplerate.patch b/pipewire-graph-samplerate.patch deleted file mode 100644 index e62d56c..0000000 --- a/pipewire-graph-samplerate.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d5be8c74b009cdfc16b2b637aa9c4edb11cf105d Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Mon, 18 Oct 2021 16:45:21 +0200 -Subject: [PATCH] output/pipewire: attempt to change the graph sample rate - -Requires PipeWire 0.3.32. - -Closes https://github.com/MusicPlayerDaemon/MPD/issues/1283 ---- - NEWS | 1 + - src/output/plugins/PipeWireOutputPlugin.cxx | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx b/src/output/plugins/PipeWireOutputPlugin.cxx -index 6579c93b6..db7c36823 100644 ---- a/src/output/plugins/PipeWireOutputPlugin.cxx -+++ b/src/output/plugins/PipeWireOutputPlugin.cxx -@@ -383,6 +383,13 @@ PipeWireOutput::Open(AudioFormat &audio_format) - if (target != nullptr && target_id == PW_ID_ANY) - pw_properties_setf(props, PW_KEY_NODE_TARGET, "%s", target); - -+#ifdef PW_KEY_NODE_RATE -+ /* ask PipeWire to change the graph sample rate to ours -+ (requires PipeWire 0.3.32) */ -+ pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", -+ audio_format.sample_rate); -+#endif -+ - const PipeWire::ThreadLoopLock lock(thread_loop); - - stream = pw_stream_new_simple(pw_thread_loop_get_loop(thread_loop), diff --git a/smb.patch b/smb.patch deleted file mode 100644 index e10b2f3..0000000 --- a/smb.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 3f2f3251cba7b9193f39027e204ea5e3248cbb7a Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Fri, 15 Oct 2021 09:39:23 +0200 -Subject: [PATCH] neighbor/smbclient: use [[gnu::pure]] - -Fixes part 1 of https://github.com/MusicPlayerDaemon/MPD/issues/1279 ---- - src/neighbor/plugins/SmbclientNeighborPlugin.cxx | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx -index f759e4e756..97e40e941c 100644 ---- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx -+++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx -@@ -45,12 +45,12 @@ class SmbclientNeighborExplorer final : public NeighborExplorer { - - Server(const Server &) = delete; - -- gcc_pure -+ [[gnu::pure]] - bool operator==(const Server &other) const noexcept { - return name == other.name; - } - -- [[nodiscard]] gcc_pure -+ [[nodiscard]] [[gnu::pure]] - NeighborInfo Export() const noexcept { - return { "smb://" + name + "/", comment }; - } -@@ -169,7 +169,7 @@ ReadServers(SmbclientContext &ctx, const char *uri, - uri); - } - --gcc_pure -+[[gnu::pure]] - static NeighborExplorer::List - DetectServers(SmbclientContext &ctx) noexcept - { -@@ -178,7 +178,7 @@ DetectServers(SmbclientContext &ctx) noexcept - return list; - } - --gcc_pure -+[[gnu::pure]] - static NeighborExplorer::List::iterator - FindBeforeServerByURI(NeighborExplorer::List::iterator prev, - NeighborExplorer::List::iterator end, -From 466b5cb08d5385f54dda07b4eead668b39685a83 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Fri, 15 Oct 2021 09:40:27 +0200 -Subject: [PATCH] neighbor/smbclient: FmtError() instead of FormatErrno() - -Fixes part 2 of https://github.com/MusicPlayerDaemon/MPD/issues/1279 ---- - src/neighbor/plugins/SmbclientNeighborPlugin.cxx | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx -index 97e40e941..144059f50 100644 ---- a/src/neighbor/plugins/SmbclientNeighborPlugin.cxx -+++ b/src/neighbor/plugins/SmbclientNeighborPlugin.cxx -@@ -33,6 +33,8 @@ - - #include - -+#include -+#include - #include - - class SmbclientNeighborExplorer final : public NeighborExplorer { -@@ -165,8 +167,8 @@ ReadServers(SmbclientContext &ctx, const char *uri, - ReadServers(ctx, handle, list); - ctx.CloseDirectory(handle); - } else -- FormatErrno(smbclient_domain, "smbc_opendir('%s') failed", -- uri); -+ FmtError(smbclient_domain, "smbc_opendir('{}') failed: {}", -+ uri, strerror(errno)); - } - - [[gnu::pure]] -From 85611aa456cddb38cd8163a35bac6b6fa5c8fd98 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Fri, 15 Oct 2021 10:23:58 +0200 -Subject: [PATCH] storage/smbclient: add StoragePlugin.prefixes - -Should have been part of commit -ef24cfa523b73848ba04d73154de1f95eb45a3b5 - -Closes https://github.com/MusicPlayerDaemon/MPD/issues/1279 ---- - src/storage/plugins/SmbclientStorage.cxx | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/storage/plugins/SmbclientStorage.cxx b/src/storage/plugins/SmbclientStorage.cxx -index 72eb4820c2..a033f3d7f8 100644 ---- a/src/storage/plugins/SmbclientStorage.cxx -+++ b/src/storage/plugins/SmbclientStorage.cxx -@@ -186,15 +186,15 @@ SmbclientDirectoryReader::GetInfo([[maybe_unused]] bool follow) - static std::unique_ptr - CreateSmbclientStorageURI([[maybe_unused]] EventLoop &event_loop, const char *base) - { -- if (!StringStartsWithCaseASCII(base, "smb://")) -- return nullptr; -- - SmbclientInit(); - - return std::make_unique(base); - } - -+static constexpr const char *smbclient_prefixes[] = { "smb://", nullptr }; -+ - const StoragePlugin smbclient_storage_plugin = { - "smbclient", -+ smbclient_prefixes, - CreateSmbclientStorageURI, - };