From 4bad4d736c39ae8234087d7502a82d7591d51dc9 Mon Sep 17 00:00:00 2001
From: Adolf Belka <adolf.belka@ipfire.org>
Date: Fri, 9 Apr 2021 21:10:20 +0200
Subject: [PATCH] mpd: Update to 0.22.6

- Update from 0.19.19 to 0.22.6
- Update rootfile
- Required update of libupnp
- Autotools no longer available
   Build changed to meson
   Meson build required addition of pkgconfig file for libid3tag
- Changelog is too large to include here.
   Full details can be found in the NEWS file in the source tarball

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/packages/mpd | 12 +++--------
 lfs/mpd                       | 39 ++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/config/rootfiles/packages/mpd b/config/rootfiles/packages/mpd
index c49d33498f..85501238ba 100644
--- a/config/rootfiles/packages/mpd
+++ b/config/rootfiles/packages/mpd
@@ -1,16 +1,10 @@
 etc/rc.d/init.d/mpd
 usr/bin/mpd
-var/log/mpd.error.log
-var/log/mpd.log
 #usr/share/doc/mpd
 #usr/share/doc/mpd/AUTHORS
 #usr/share/doc/mpd/COPYING
 #usr/share/doc/mpd/NEWS
-#usr/share/doc/mpd/COMMANDS
-#usr/share/doc/mpd/README
 #usr/share/doc/mpd/README.md
-#usr/share/doc/mpd/TODO
-#usr/share/doc/mpd/UPGRADING
-#usr/share/doc/mpd/mpdconf.example
-#usr/share/man/man1/mpd.1
-#usr/share/man/man5/mpd.conf.5
+#usr/share/icons/hicolor/scalable/apps/mpd.svg
+var/log/mpd.error.log
+var/log/mpd.log
diff --git a/lfs/mpd b/lfs/mpd
index f7abccf2c2..3112575ad4 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.19.19
+VER        = 0.22.6
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db
+$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd
 
 install : $(TARGET)
 
@@ -78,22 +78,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure \
-			--prefix=/usr \
-			--disable-ipv6 \
-			--sysconfdir=/etc \
-			--disable-sqlite \
-			--disable-smbclient \
-			--enable-id3 \
-			--enable-vorbis \
-			--enable-expat \
-			--enable-ffmpeg \
-			--enable-flac \
-			--enable-lame-encoder \
-			--enable-upnp \
-			--disable-icu
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && meson	--prefix=/usr 		\
+				--sysconfdir=/etc	\
+				--libdir=/usr/lib	\
+				-D ipv6=disabled 	\
+				-D sqlite=disabled	\
+				-D smbclient=disabled	\
+				-D id3tag=enabled	\
+				-D vorbis=enabled	\
+				-D expat=enabled	\
+				-D ffmpeg=enabled	\
+				-D flac=enabled		\
+				-D lame=enabled		\
+				-D upnp=enabled		\
+				-D icu=disabled		\
+				builddir/
+	cd $(DIR_APP) && ninja -C builddir/
+	cd $(DIR_APP) && ninja -C builddir/ install
 
 	#install initscripts
 	$(call INSTALL_INITSCRIPT,mpd)
-- 
2.39.2