From 48d52263cc7a7d388162857593e337b2b8d8c5fb Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 26 Dec 2009 01:03:46 +0100
Subject: [PATCH] Updated mpc (0.19) and mpd (0.15.6).

---
 config/rootfiles/packages/mpc | 2 +-
 doc/packages-list.txt         | 7 ++++---
 lfs/mpc                       | 8 ++++----
 lfs/mpd                       | 6 +++---
 make.sh                       | 1 +
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/config/rootfiles/packages/mpc b/config/rootfiles/packages/mpc
index 1e3cac2a25..044b3141e7 100644
--- a/config/rootfiles/packages/mpc
+++ b/config/rootfiles/packages/mpc
@@ -4,7 +4,7 @@ usr/bin/mpc
 #usr/share/doc/mpc/COPYING
 #usr/share/doc/mpc/NEWS
 #usr/share/doc/mpc/README
-#usr/share/doc/mpc/mpc-bashrc
+#usr/share/doc/mpc/mpc-completion.bash
 #usr/share/doc/mpc/mpd-m3u-handler.sh
 #usr/share/doc/mpc/mpd-pls-handler.sh
 #usr/share/doc/mpc/mppledit
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4b2b625aa8..fe7ec1fe06 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -178,6 +178,7 @@
 * libid3tag-0.15.1b
 * libidn-0.6.14
 * libmad-0.15.1b
+* libmpdclient-2.1
 * libnet-1.1.2.1
 * libnl-1.1
 * libogg-1.1.4
@@ -226,8 +227,8 @@
 * mldonkey-3.0.0
 * module-init-tools-3.5
 * motion-3.2.11
-* mpc-0.17
-* mpd-0.15.3
+* mpc-0.19
+* mpd-0.15.6
 * mpeg2dec-0.4.0b
 * mpfire-ipfire
 * mtd-CVS-20070507
@@ -338,7 +339,7 @@
 * udev-096-klibc
 * unzip552
 * urlgrabber-3.1.0
-* usb_modeswitch-1.0.5
+* usb_modeswitch-1.0.6
 * usbutils-0.72
 * util-linux-2.12r
 * v4l-dvb-9defbd461e5f-kmod-2.6.27.42-ipfire
diff --git a/lfs/mpc b/lfs/mpc
index 5ae7567e58..0cd871e950 100644
--- a/lfs/mpc
+++ b/lfs/mpc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.17
+VER        = 0.19
 
 THISAPP    = mpc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpc
-PAK_VER    = 3
+PAK_VER    = 4
 
-DEPS       = "mpd"
+DEPS       = "mpd libmpdclient"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3f642c2c2ad7a57a9be7a03351c8c558
+$(DL_FILE)_MD5 = 9ab2967d9ec719b06a86f3b4121be654
 
 install : $(TARGET)
 
diff --git a/lfs/mpd b/lfs/mpd
index ce2bd66074..d755406c7f 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.15.3
+VER        = 0.15.6
 
 THISAPP    = mpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "alsa ffmpeg-libs glib lame libshout libogg libid3tag libvorbis"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 40f01c53333885f86aace5a37ae55bd1
+$(DL_FILE)_MD5 = e0b7a11f86f8f021a92c49a96032ff39
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index ea2a75f845..49f394c3d2 100755
--- a/make.sh
+++ b/make.sh
@@ -589,6 +589,7 @@ buildipfire() {
   ipfiremake icecast
   ipfiremake icegenerator
   ipfiremake mpd
+  ipfiremake libmpdclient
   ipfiremake mpc
   ipfiremake git
   ipfiremake squidclamav
-- 
2.39.2