diff --git a/multimedia/stream/mpd/actions.py b/multimedia/stream/mpd/actions.py index 3d3b6dc708..6ea1bfda51 100644 --- a/multimedia/stream/mpd/actions.py +++ b/multimedia/stream/mpd/actions.py @@ -39,7 +39,6 @@ def setup(): -Dfaad=enabled \ -Dflac=enabled \ -Dipv6=enabled \ - -Dupnp=enabled \ -Dcurl=enabled \ -Dalsa=enabled \ -Dopus=enabled \ @@ -84,6 +83,7 @@ def setup(): -Dcdio_paranoia=enabled \ -Dsolaris_output=enabled \ \ + -Dupnp=auto \ -Dzeroconf=auto \ \ -Dsndio=disabled \ diff --git a/multimedia/stream/mpd/files/FmtError_instead_of_FormatErrno.patch b/multimedia/stream/mpd/files/FmtError_instead_of_FormatErrno.patch new file mode 100644 index 0000000000..44b68a0671 --- /dev/null +++ b/multimedia/stream/mpd/files/FmtError_instead_of_FormatErrno.patch @@ -0,0 +1,34 @@ +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]] diff --git a/multimedia/stream/mpd/files/add_StoragePlugin_prefix.patch b/multimedia/stream/mpd/files/add_StoragePlugin_prefix.patch new file mode 100644 index 0000000000..76c70636aa --- /dev/null +++ b/multimedia/stream/mpd/files/add_StoragePlugin_prefix.patch @@ -0,0 +1,36 @@ +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, + }; diff --git a/multimedia/stream/mpd/files/add_missing_include.patch b/multimedia/stream/mpd/files/add_missing_include.patch new file mode 100644 index 0000000000..f237974598 --- /dev/null +++ b/multimedia/stream/mpd/files/add_missing_include.patch @@ -0,0 +1,23 @@ +From 6a2e7bbc02c0f1b1ee404b13b5035d4027abd506 Mon Sep 17 00:00:00 2001 +From: Thomas Zander +Date: Sat, 16 Oct 2021 17:36:56 +0200 +Subject: [PATCH] protocol/ArgParser.cxx: Add missing #include + +Fixes a build problem on platforms where stdio.h is not included +transitively. snprintf() is defined in stdio.h. +--- + src/protocol/ArgParser.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/protocol/ArgParser.cxx b/src/protocol/ArgParser.cxx +index 123182f72..72190d9de 100644 +--- a/src/protocol/ArgParser.cxx ++++ b/src/protocol/ArgParser.cxx +@@ -23,6 +23,7 @@ + #include "Chrono.hxx" + #include "util/NumberParser.hxx" + ++#include + #include + + static inline ProtocolError diff --git a/multimedia/stream/mpd/files/gcc_pure_fix.patch b/multimedia/stream/mpd/files/gcc_pure_fix.patch new file mode 100644 index 0000000000..220c769c0a --- /dev/null +++ b/multimedia/stream/mpd/files/gcc_pure_fix.patch @@ -0,0 +1,47 @@ +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, diff --git a/multimedia/stream/mpd/pspec.xml b/multimedia/stream/mpd/pspec.xml index 2b0fd285a1..3dfcd08bbb 100644 --- a/multimedia/stream/mpd/pspec.xml +++ b/multimedia/stream/mpd/pspec.xml @@ -15,12 +15,13 @@ Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol. - - https://www.musicpd.org/download/mpd/0.22/mpd-0.22.11.tar.xz + + http://www.musicpd.org/download/mpd/0.23/mpd-0.23.tar.xz meson cmake + fmt-devel curl-devel flac-devel yajl-devel @@ -54,6 +55,7 @@ alsa-lib-devel libshout-devel liburing-devel + pipewire-devel libmpcdec-devel libgcrypt-devel audiofile-devel @@ -63,6 +65,7 @@ fluidsynth-devel libmodplug-devel libsndfile-devel + libopenmpt-devel libmpdclient-devel libsamplerate-devel libchromaprint-devel @@ -80,6 +83,12 @@ python3-sphinx-alabaster-theme python3-sphinxcontrib-websupport + + gcc_pure_fix.patch + add_missing_include.patch + FmtError_instead_of_FormatErrno.patch + add_StoragePlugin_prefix.patch + @@ -118,6 +127,7 @@ alsa-lib libshout liburing + pipewire libmpcdec libgcrypt audiofile @@ -128,6 +138,7 @@ fluidsynth libmodplug libsndfile + libopenmpt libmpdclient libsamplerate libchromaprint @@ -155,6 +166,13 @@ + + 2021-10-17 + 0.23 + Version bump. + fury + uglyside@yandex.ru + 2021-09-07 0.22.11 diff --git a/programming/library/fmt/actions.py b/programming/library/fmt/actions.py index 7fa4d3b6a1..1db4930d24 100644 --- a/programming/library/fmt/actions.py +++ b/programming/library/fmt/actions.py @@ -9,7 +9,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import cmaketools def setup(): - cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib") + cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib -L") def build(): cmaketools.make() @@ -17,4 +17,4 @@ def build(): def install(): cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("README*", "LICENSE*") \ No newline at end of file + pisitools.dodoc("README*", "LICENSE*") diff --git a/programming/library/fmt/pspec.xml b/programming/library/fmt/pspec.xml index 87176fe21d..4be84d0410 100644 --- a/programming/library/fmt/pspec.xml +++ b/programming/library/fmt/pspec.xml @@ -13,7 +13,7 @@ library Open-source formatting library for C++ {fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams. - https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz + https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.tar.gz cmake @@ -44,8 +44,15 @@ + + 2021-10-17 + 8.0.1 + Version bump. + fury + uglyside@yandex.ru + - 3020-09-23 + 2020-09-23 7.0.3 Major version bump. Blue Devil @@ -59,4 +66,4 @@ bluedevil@sctzine.com - \ No newline at end of file + diff --git a/programming/library/libconfuse/actions.py b/programming/library/libconfuse/actions.py index 2f3b85860f..38cc9bbd4e 100644 --- a/programming/library/libconfuse/actions.py +++ b/programming/library/libconfuse/actions.py @@ -6,15 +6,10 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): - #shelltools.system("./autogen.sh") - - autotools.configure("--enable-static=no \ - --enable-shared=yes \ - --enable-nls") + autotools.configure("--disable-static") def build(): autotools.make() @@ -22,4 +17,3 @@ def build(): def install(): autotools.install() - pisitools.dodoc("AUTHORS", "README.md", "LICENSE") diff --git a/programming/library/libconfuse/pspec.xml b/programming/library/libconfuse/pspec.xml index bee2e65ed2..6acaca4a5f 100644 --- a/programming/library/libconfuse/pspec.xml +++ b/programming/library/libconfuse/pspec.xml @@ -1,25 +1,25 @@ - + libconfuse - https://github.com/martinh/libconfuse + https://github.com/libconfuse/libconfuse PisiLinux Community admins@pisilinux.org LGPLv2 library - Configuration file parser library + Configuration file parser library. libconfuse is a configuration file parser library. - https://github.com/martinh/libconfuse/releases/download/v3.2.2/confuse-3.2.2.tar.xz + https://github.com/libconfuse/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz libconfuse /usr/lib - /usr/share/doc + /usr/share/doc/confuse /usr/share/locale @@ -39,6 +39,13 @@ + + 2021-10-17 + 3.3 + Version bump. + fury + uglyside@yandex.ru + 2020-03-01 3.2.2 @@ -61,4 +68,4 @@ ertugrulerata@gmail.com - \ No newline at end of file +