From f327a9e60bc4da57cd33da220031043ced3d7af0 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Wed, 20 Dec 2023 19:27:02 +0100
Subject: [PATCH] mpd: 0.23.14 -> 0.23.15

---
 mpd/.signature                                |  7 +++---
 ...e3738a672f933560247b5527d365d17b1c02.patch | 25 -------------------
 mpd/Pkgfile                                   |  8 +++---
 3 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 mpd/50c1e3738a672f933560247b5527d365d17b1c02.patch

diff --git a/mpd/.signature b/mpd/.signature
index 5eef233be..15b01f1c6 100644
--- a/mpd/.signature
+++ b/mpd/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF340x6slP+KrqkETwoy7457+ZVAsiaI7Em0mC/Huje30jTzSIaNupvC7d48QzbAmG1jRtmjK+MZYd8SFKcpW4Hgo=
-SHA256 (Pkgfile) = 8f2c86f3f9a90aa6f42cb1943e98dc37f62256a1eb375e6d86b5862f4c5e3610
+RWSagIOpLGJF38gdw50sY23ereljDR5cE/eJiCAWEKa0zdyM1bvomkbxOZxGcJ3UtHFnuU7Q5WQYX3PjHkxYuFMPgWTZ2/mRlQ0=
+SHA256 (Pkgfile) = fe3c35e4511ea2f855cf969f7dd73d294aa3113b4caa80b798d4e190251cdd67
 SHA256 (.footprint) = fbed54c68de1c373369d75e82e5ae5c6fb470a1841286a16a135ce21deb42de9
-SHA256 (mpd-0.23.14.tar.xz) = 85b9a67426d528ae9fb849eb3b10faf52d4b18d22b1fd71088e6d9a388b509d2
-SHA256 (50c1e3738a672f933560247b5527d365d17b1c02.patch) = 9b387e124d18973e2cd367e4df3a442cb0861688015d2e407029cb680a100d95
+SHA256 (mpd-0.23.15.tar.xz) = 550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a
 SHA256 (mpd) = ec90dbf45d72c30b0837e2caed55df9c28b00416a92838012e1aea8cfe704ce3
diff --git a/mpd/50c1e3738a672f933560247b5527d365d17b1c02.patch b/mpd/50c1e3738a672f933560247b5527d365d17b1c02.patch
deleted file mode 100644
index 17b212af5..000000000
--- a/mpd/50c1e3738a672f933560247b5527d365d17b1c02.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 50c1e3738a672f933560247b5527d365d17b1c02 Mon Sep 17 00:00:00 2001
-From: skidoo23 <skidoo@web.de>
-Date: Tue, 21 Nov 2023 19:20:41 +0100
-Subject: [PATCH] decoder/ffmpeg: Fix build error with ffmpeg 6.1
-
-Closes https://github.com/MusicPlayerDaemon/MPD/issues/1898
----
- NEWS                             | 2 ++
- src/decoder/plugins/FfmpegIo.cxx | 3 +++
- 2 files changed, 5 insertions(+)
-
-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()
diff --git a/mpd/Pkgfile b/mpd/Pkgfile
index 08b0c8f5d..6cf0a6d48 100644
--- a/mpd/Pkgfile
+++ b/mpd/Pkgfile
@@ -5,10 +5,9 @@
 # Optional: alsa-lib audiofile avahi chromaprint dbus faad2 ffmpeg flac fluidsynth icu jack lame libcdio-paranoia libid3tag libisofs libmad libmikmod libmodplug libmpcdec libsamplerate libsndfile libsoxr liburing libvorbis mpg123 opus pipewire pulseaudio python3-sphinx samba twolame wavpack yajl zziplib
 
 name=mpd
-version=0.23.14
-release=2
+version=0.23.15
+release=1
 source=(https://www.musicpd.org/download/mpd/${version:0:4}/$name-$version.tar.xz
-  50c1e3738a672f933560247b5527d365d17b1c02.patch
   mpd)
 
 build() {
@@ -47,8 +46,6 @@ build() {
   prt-get isinst zziplib && PKGMK_MPD+=' -D zzip=enabled'
   # }}}
 
-  patch -Np1 -d $name-$version -i $SRC/50c1e3738a672f933560247b5527d365d17b1c02.patch
-
   meson setup $name-$version build $PKGMK_MPD \
     --prefix=/usr \
     --sysconfdir=/etc/mpd \
@@ -63,6 +60,7 @@ build() {
     -D pcre=enabled \
     -D sqlite=enabled \
     -D html_manual=false
+
   meson compile -C build -j ${JOBS-1}
   DESTDIR=$PKG meson install -C build