From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] mpd: Update to 0.22.6
Date: Fri, 09 Apr 2021 21:10:20 +0200
Message-ID: <20210409191022.2911348-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4958571431458597488=="
List-Id: <development.lists.ipfire.org>

--===============4958571431458597488==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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(a)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 c49d33498..85501238b 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 f7abccf2c..3112575ad 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 0.19.19
+VER        =3D 0.22.6
=20
 THISAPP    =3D mpd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/${THISAPP}
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D mpd
-PAK_VER    =3D 20
+PAK_VER    =3D 21
=20
 DEPS       =3D alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libi=
d3tag libvorbis opus soxr
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 6e4fca9a9c26dad08b61bac9a91802db
+$(DL_FILE)_MD5 =3D 774a6250870730f3d55eb1445ab751dd
=20
 install : $(TARGET)
=20
@@ -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=3D/usr \
-			--disable-ipv6 \
-			--sysconfdir=3D/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=3D/usr 		\
+				--sysconfdir=3D/etc	\
+				--libdir=3D/usr/lib	\
+				-D ipv6=3Ddisabled 	\
+				-D sqlite=3Ddisabled	\
+				-D smbclient=3Ddisabled	\
+				-D id3tag=3Denabled	\
+				-D vorbis=3Denabled	\
+				-D expat=3Denabled	\
+				-D ffmpeg=3Denabled	\
+				-D flac=3Denabled		\
+				-D lame=3Denabled		\
+				-D upnp=3Denabled		\
+				-D icu=3Ddisabled		\
+				builddir/
+	cd $(DIR_APP) && ninja -C builddir/
+	cd $(DIR_APP) && ninja -C builddir/ install
=20
 	#install initscripts
 	$(call INSTALL_INITSCRIPT,mpd)
--=20
2.31.1


--===============4958571431458597488==--