0.23.14 & ffmpeg6.1 patch

3 files changed, 39 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a308d08331c5..92faf50470e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = mpd-smbclient
 	pkgdesc = Flexible, powerful, server-side application for playing music (with buggy smbclient plugin enabled, don't complain upstream!)
-	pkgver = 0.23.13
+	pkgver = 0.23.14
 	pkgrel = 1
 	url = https://www.musicpd.org/
 	arch = x86_64
 	arch = aarch64
+	license = BSD-2-Clause
 	license = GPL2
 	makedepends = alsa-lib
 	makedepends = audiofile
@@ -68,25 +69,28 @@ pkgbase = mpd-smbclient
 	provides = mpd
 	conflicts = mpd
 	backup = etc/mpd-smbclient.conf
-	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.13.tar.xz
-	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.13.tar.xz.sig
+	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.14.tar.xz
+	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.14.tar.xz.sig
 	source = mpd.conf
 	source = mpd.sysusers
 	source = mpd.tmpfiles
 	source = mpd.service.override
+	source = mpd-0.23.14-ffmpeg6.1.patch
 	validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
-	sha512sums = 1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d
+	sha512sums = 4d97b22c37ca8c0939830cd6497023d868005a123f866db594716027c590e2d1dffb65bbd3af41404dcc7c0249466192e457ae1ba80f1f95ff044516be4c99ae
 	sha512sums = SKIP
 	sha512sums = 25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1
 	sha512sums = 6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18
 	sha512sums = db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d
 	sha512sums = c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c
-	b2sums = 02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26
+	sha512sums = b3ed83f321df78a88f4f11be28262e6204e80132cab1242a5f2c3cddb9d0e1a9172d0feef41e287b7706f40218b5b1ed69877a14b0394b52e8e59b512d3b66ef
+	b2sums = c048f128111d1d65775c317182b91d113339a5b09d3005c320cc3b14a79b7c1da0d1ba3d53f6bf348a3a404ceea33c1ad2427225f4a1f3d1cde4a921e71d6e1c
 	b2sums = SKIP
 	b2sums = 0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf
 	b2sums = 4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb
 	b2sums = d7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a
 	b2sums = 753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513
+	b2sums = d4223d1e84bafd7af79d7b2e5409b8590f300e104896c5b4bda2b56d3c103b617487969ab0a484a70628fb23fc363b476090b26eac46d00c5a798429baf0124a
 
 pkgname = mpd-smbclient
 	depends = gcc-libs
diff --git a/PKGBUILD b/PKGBUILD
index 5f4e8990cf96..decc87e7029a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,12 +9,15 @@
 
 _pkgname=mpd
 pkgname=${_pkgname}-smbclient
-pkgver=0.23.13
+pkgver=0.23.14
 pkgrel=1
 pkgdesc="Flexible, powerful, server-side application for playing music (with buggy smbclient plugin enabled, don't complain upstream!)"
 arch=('x86_64' 'aarch64')
 url="https://www.musicpd.org/"
-license=(GPL2)
+license=(
+  BSD-2-Clause
+  GPL2
+)
 depends=(
   gcc-libs
   glibc
@@ -87,21 +90,28 @@ source=(
   ${_pkgname}.sysusers
   ${_pkgname}.tmpfiles
   ${_pkgname}.service.override
+  ${_pkgname}-0.23.14-ffmpeg6.1.patch  # backport of https://github.com/MusicPlayerDaemon/MPD/commit/50c1e3738a672f933560247b5527d365d17b1c02.patch
 )
-sha512sums=('1ef2b3a2089aa6078a455e43a2fb9097dc0d5b27b170e6d64e416d5e82349a794eb0acf8db72a975ad024083e872e4a1bd0e0fd51302d327d373b61f01bb819d'
+sha512sums=('4d97b22c37ca8c0939830cd6497023d868005a123f866db594716027c590e2d1dffb65bbd3af41404dcc7c0249466192e457ae1ba80f1f95ff044516be4c99ae'
             'SKIP'
             '25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
             '6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
             'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d'
-            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c')
-b2sums=('02907f08cc504d0fbf703179b333b301c7ad8fc8535d85305faa7962dd7faa164f4492286902cb48eaf3db2a1445b541b1261c18a89ca8a73e80016af9581e26'
+            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c'
+            'b3ed83f321df78a88f4f11be28262e6204e80132cab1242a5f2c3cddb9d0e1a9172d0feef41e287b7706f40218b5b1ed69877a14b0394b52e8e59b512d3b66ef')
+b2sums=('c048f128111d1d65775c317182b91d113339a5b09d3005c320cc3b14a79b7c1da0d1ba3d53f6bf348a3a404ceea33c1ad2427225f4a1f3d1cde4a921e71d6e1c'
         'SKIP'
         '0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
         '4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
         'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a'
-        '753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513')
+        '753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513'
+        'd4223d1e84bafd7af79d7b2e5409b8590f300e104896c5b4bda2b56d3c103b617487969ab0a484a70628fb23fc363b476090b26eac46d00c5a798429baf0124a')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max@blarg.de>
 
+prepare() {
+  patch -Np1 -d ${_pkgname}-$pkgver -i ../${_pkgname}-0.23.14-ffmpeg6.1.patch
+}
+
 build() {
   local _meson_options=(
     -D smbclient=enabled
diff --git a/mpd-0.23.14-ffmpeg6.1.patch b/mpd-0.23.14-ffmpeg6.1.patch
new file mode 100644
index 000000000000..e9f523350628
--- /dev/null
+++ b/mpd-0.23.14-ffmpeg6.1.patch
@@ -0,0 +1,14 @@
+diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
+index 5b5c8b40e3..3c3323ce8a 100644
+--- a/src/decoder/plugins/FfmpegIo.cxx
++++ b/src/decoder/plugins/FfmpegIo.cxx
+@@ -26,6 +26,9 @@
+ 
+ extern "C" {
+ #include <libavutil/mem.h>
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100)
++#include <libavutil/error.h>
++#endif
+ }
+ 
+ AvioStream::~AvioStream()