Merge pull request #9792 from 4fury-c3440d8/no

updates.

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 \

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 <max@musicpd.org>
+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 <libsmbclient.h>
+ 
++#include <cerrno>
++#include <cstring>
+ #include <utility>
+ 
+ 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]]

multimedia/stream/mpd/files/add_StoragePlugin_prefix.patch

@@ -0,0 +1,36 @@
+From 85611aa456cddb38cd8163a35bac6b6fa5c8fd98 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max@musicpd.org>
+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<Storage>
+ CreateSmbclientStorageURI([[maybe_unused]] EventLoop &event_loop, const char *base)
+ {
+-	if (!StringStartsWithCaseASCII(base, "smb://"))
+-		return nullptr;
+-
+ 	SmbclientInit();
+ 
+ 	return std::make_unique<SmbclientStorage>(base);
+ }
+ 
++static constexpr const char *smbclient_prefixes[] = { "smb://", nullptr };
++
+ const StoragePlugin smbclient_storage_plugin = {
+ 	"smbclient",
++	smbclient_prefixes,
+ 	CreateSmbclientStorageURI,
+ };

multimedia/stream/mpd/files/add_missing_include.patch

@@ -0,0 +1,23 @@
+From 6a2e7bbc02c0f1b1ee404b13b5035d4027abd506 Mon Sep 17 00:00:00 2001
+From: Thomas Zander <thomas.e.zander@googlemail.com>
+Date: Sat, 16 Oct 2021 17:36:56 +0200
+Subject: [PATCH] protocol/ArgParser.cxx: Add missing #include <stdio.h>
+
+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 <stdio.h>
+ #include <stdlib.h>
+ 
+ static inline ProtocolError

multimedia/stream/mpd/files/gcc_pure_fix.patch

@@ -0,0 +1,47 @@
+From 3f2f3251cba7b9193f39027e204ea5e3248cbb7a Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max@musicpd.org>
+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,

multimedia/stream/mpd/pspec.xml

@@ -15,12 +15,13 @@
 		<Description>
 			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.
 		</Description>
-		<Archive sha1sum="51b069bcddd3a476fad0020cd4a253f0050bebb4" type="tarxz">
+		<Archive sha1sum="128707c716591e96768e3c53cf52c0c3f2241d45" type="tarxz">
-			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
 		</Archive>
 		<BuildDependencies>
 			<Dependency>meson</Dependency>
 			<Dependency>cmake</Dependency>
+			<Dependency>fmt-devel</Dependency>
 			<Dependency>curl-devel</Dependency>
 			<Dependency>flac-devel</Dependency>
 			<Dependency>yajl-devel</Dependency>
@@ -54,6 +55,7 @@
 			<Dependency>alsa-lib-devel</Dependency>
 			<Dependency>libshout-devel</Dependency>
 			<Dependency>liburing-devel</Dependency>
+			<Dependency>pipewire-devel</Dependency>
 			<Dependency>libmpcdec-devel</Dependency>
 			<Dependency>libgcrypt-devel</Dependency>
 			<Dependency>audiofile-devel</Dependency>
@@ -63,6 +65,7 @@
 			<Dependency>fluidsynth-devel</Dependency>
 			<Dependency>libmodplug-devel</Dependency>
 			<Dependency>libsndfile-devel</Dependency>
+			<Dependency>libopenmpt-devel</Dependency>
 			<Dependency>libmpdclient-devel</Dependency>
 			<Dependency>libsamplerate-devel</Dependency>
 			<Dependency>libchromaprint-devel</Dependency>
@@ -80,6 +83,12 @@
 			<Dependency>python3-sphinx-alabaster-theme</Dependency>
 			<Dependency>python3-sphinxcontrib-websupport</Dependency>
 		</BuildDependencies>
+		<Patches>
+			<Patch level="1">gcc_pure_fix.patch</Patch>
+			<Patch level="1">add_missing_include.patch</Patch>
+			<Patch level="1">FmtError_instead_of_FormatErrno.patch</Patch>
+			<Patch level="1">add_StoragePlugin_prefix.patch</Patch>
+		</Patches>
 	</Source>
 
 	<Package>
@@ -118,6 +127,7 @@
 			<Dependency>alsa-lib</Dependency>
 			<Dependency>libshout</Dependency>
 			<Dependency>liburing</Dependency>
+			<Dependency>pipewire</Dependency>
 			<Dependency>libmpcdec</Dependency>
 			<Dependency>libgcrypt</Dependency>
 			<Dependency>audiofile</Dependency>
@@ -128,6 +138,7 @@
 			<Dependency>fluidsynth</Dependency>
 			<Dependency>libmodplug</Dependency>
 			<Dependency>libsndfile</Dependency>
+			<Dependency>libopenmpt</Dependency>
 			<Dependency>libmpdclient</Dependency>
 			<Dependency>libsamplerate</Dependency>
 			<Dependency>libchromaprint</Dependency>
@@ -155,6 +166,13 @@
 	</Package>
 
 	<History>
+		<Update release="8">
+			<Date>2021-10-17</Date>
+			<Version>0.23</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="7">
 			<Date>2021-09-07</Date>
 			<Version>0.22.11</Version>

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()

programming/library/fmt/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>library</IsA>
         <Summary>Open-source formatting library for C++</Summary>
         <Description>{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams.</Description>
-        <Archive sha1sum="e5a93554711228e235774797f7bc84b0597a6de1" type="targz">https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz</Archive>
+        <Archive sha1sum="79338d262ac521f9ff159963603fce20f15094e5" type="targz">https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
         </BuildDependencies>
@@ -44,8 +44,15 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2021-10-17</Date>
+            <Version>8.0.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>uglyside@yandex.ru</Email>
+        </Update>
         <Update release="2">
-            <Date>3020-09-23</Date>
+            <Date>2020-09-23</Date>
             <Version>7.0.3</Version>
             <Comment>Major version bump.</Comment>
             <Name>Blue Devil</Name>

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("--disable-static")
-    
-    autotools.configure("--enable-static=no \
-                         --enable-shared=yes \
-                         --enable-nls")
 
 def build():
     autotools.make()
@@ -22,4 +17,3 @@ def build():
 def install():
     autotools.install()
 
-    pisitools.dodoc("AUTHORS", "README.md", "LICENSE")

programming/library/libconfuse/pspec.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>libconfuse</Name>
-        <Homepage>https://github.com/martinh/libconfuse</Homepage>
+        <Homepage>https://github.com/libconfuse/libconfuse</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-        <Summary>Configuration file parser library</Summary>
+        <Summary>Configuration file parser library.</Summary>
         <Description>libconfuse is a configuration file parser library.</Description>
-        <Archive sha1sum="571ce2dfc36f1bb97553b9e2753d232a502b5c3d" type="tarxz">https://github.com/martinh/libconfuse/releases/download/v3.2.2/confuse-3.2.2.tar.xz</Archive>
+        <Archive sha1sum="8d07f3877331b7e87309e4dcacb353ce5e2ea0bd" type="tarxz">https://github.com/libconfuse/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz</Archive>
     </Source>
 
     <Package>
         <Name>libconfuse</Name>
         <Files>
             <Path fileType="library">/usr/lib</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="doc">/usr/share/doc/confuse</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
     </Package>
@@ -39,6 +39,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2021-10-17</Date>
+            <Version>3.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>fury</Name>
+            <Email>uglyside@yandex.ru</Email>
+        </Update>
         <Update release="3">
             <Date>2020-03-01</Date>
             <Version>3.2.2</Version>