X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmpd;h=3112575ad45ce2e434f4e2373d4aa89557386e31;hb=4bad4d736c39ae8234087d7502a82d7591d51dc9;hp=7b2c54d0ad5bd1c437bb4132474324ae2f605df5;hpb=4537ec169c8e996a46e77909a698277413f95787;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/mpd b/lfs/mpd
index 7b2c54d0ad..3112575ad4 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,17 @@
 
 include Config
 
-VER        = 0.16.5
+VER        = 0.22.6
 
 THISAPP    = mpd-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 14
+PAK_VER    = 21
 
-DEPS       = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis"
+DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f7564cff12035f6a1112cce770655df7
+$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd
 
 install : $(TARGET)
 
@@ -77,12 +77,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-					--disable-ipv6 \
-					--sysconfdir=/etc \
-					--disable-sqlite
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	$(UPDATE_AUTOMAKE)
+	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)
+
 	@rm -rf $(DIR_APP)
 	touch /var/log/mpd.error.log
 	touch /var/log/mpd.log