From 941760df41be4320e198ed8826e544afe19cb568 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 6 Oct 2009 02:18:40 +0000
Subject: [PATCH] [packages] mpd: update to v0.15.4, cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17941 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 sound/mpd/Makefile | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 30165ce1f..9d307f8d8 100644
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.15.1
-PKG_RELEASE:=2
+PKG_VERSION:=0.15.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
-PKG_MD5SUM:=eec9f5642d4a9c59a0df0a458def3505
+PKG_MD5SUM:=addbbcbbf8a24a2ce80db1ba5a1f91ca
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -35,8 +35,22 @@ define Package/mpd/conffiles
 /etc/mpd.conf
 endef
 
-ifndef CONFIG_PACKAGE_kmod-sound-core
-	EXTRA_CONFIG_PARAM:=--disable-alsa
+CONFIGURE_ARGS+= \
+	--disable-audiofile \
+	--disable-mpc \
+	--disable-aac \
+	--disable-lsr \
+	--disable-ao \
+	--disable-mvp \
+	--disable-lametest \
+	--disable-lame-encoder \
+	--enable-flac \
+	--enable-lastfm \
+	--enable-mms \
+	--with-tremor="$(STAGING_DIR)/usr/lib" \
+
+ifeq ($(CONFIG_PACKAGE_kmod-sound-core),)
+	CONFIGURE_ARGS+= --disable-alsa
 endif
 
 CONFIGURE_VARS += \
@@ -53,24 +67,6 @@ CONFIGURE_VARS += \
 	GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
 	GLIB_LIBS="$(TARGET_LDLFAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -lglib-2.0 -lgthread-2.0 -pthread"
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		$(EXTRA_CONFIG_PARAM) \
-		--disable-audiofile \
-		--disable-mpc \
-		--disable-aac \
-		--disable-lsr \
-		--disable-ao \
-		--disable-mvp \
-		--disable-lametest \
-		--disable-lame-encoder \
-		--enable-flac \
-		--enable-lastfm \
-		--enable-mms \
-		--with-tremor="$(STAGING_DIR)/usr/lib" \
-	)
-endef
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-- 
2.11.0