Revert "python-six: Removal of python2 & 3 addon versions of six"

[people/pmueller/ipfire-2.x.git] / lfs / mpd

diff --git a/lfs/mpd b/lfs/mpd
index 2beb422fad568bfd66dca182debaa8e3b73bf3e3..0a8b533d8a236201a7f7672e9dfe8257aaf09606 100644 (file)
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  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,7 +24,7 @@
 
 include Config
 
-VER        = 0.19.19
+VER        = 0.22.6
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,9 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 17
+PAK_VER    = 22
+SUP_ARCH   = aarch64 x86_64 i586
 
-DEPS       = "alsa faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus"
+DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db
+$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd
 
 install : $(TARGET)
 
@@ -77,22 +78,24 @@ $(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 \
-                       --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
+       $(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=disabled        \
+                               -D icu=disabled         \
+                               builddir/
+       cd $(DIR_APP) && ninja -C builddir/
+       cd $(DIR_APP) && ninja -C builddir/ install
 
        #install initscripts
        $(call INSTALL_INITSCRIPT,mpd)