X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=sound%2Fmpd%2FMakefile;h=a5e1b9175734cadde50b43cfe342e74fcf952c90;hp=ce7cce00d9b44fdd340d2aa0b2fc47d4cc7167a2;hb=93ddc4bdb748884c3af8e3cf8acf26ecfc9b56b6;hpb=3357770546863d3cf5bf367e68f37a559b9fb143

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index ce7cce00d9..a5e1b91757 100644
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007 - 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,29 +9,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.13.0
-PKG_RELEASE:=2
+PKG_VERSION:=0.14.2
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.musicpd.org/uploads/files/
-PKG_MD5SUM:=0b33bdb9d706439949344073e90f812a
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/musicpd
+PKG_MD5SUM:=66817a4b4c05454e6488f6b821f2a6a3
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mpd
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +alsa-lib
+  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +libiconv +glib2
   TITLE:=Music Player Daemon
   URL:=http://www.musicpd.org/
 endef
 
 define Package/mpd/description
 	MPD is a music player supporting flac, mp3 and ogg files.
-	It is typically controlled over a network using one of it's many 
+	It is typically controlled over a network using one of it's many
 	clients including mpc(console), gmpc(gnome), phpmp(php) etc.
 endef
 
@@ -39,27 +36,35 @@ define Package/mpd/conffiles
 /etc/mpd.conf
 endef
 
-ifndef CONFIG_PACKAGE_kmod-soundcore
+ifndef CONFIG_PACKAGE_kmod-sound-core
 	EXTRA_CONFIG_PARAM:=--disable-alsa
 endif
 
+CONFIGURE_VARS += \
+	ID3TAG_LIBS="-L$(STAGING_DIR)/usr/lib -lz -lid3tag" \
+	ID3TAG_CFLAGS="-I$(STAGING_DIR)/usr/include" \
+	MAD_LIBS="-L$(STAGING_DIR)/usr/lib -lmad" \
+	MAD_CFLAGS="-I$(STAGING_DIR)/usr/include" \
+	OGGVORBIS_LIBS="-L$(STAGING_DIR)/usr/lib -lvorbisidec" \
+	OGGVORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include" \
+	GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
+	GLIB_LIBS="-L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -L$(STAGING_DIR)/usr/lib -lglib-2.0 -lgthread-2.0 -pthread"
+
 define Build/Configure
 	$(call Build/Configure/Default, \
-	        $(EXTRA_CONFIG_PARAM) \
-		--disable-shout \
-	        --disable-mod \
-	        --disable-audiofile \
-	        --disable-iconv \
-	        --disable-mpc \
-	        --disable-aac \
-	        --disable-oggvorbis \
-	        --disable-oggflac \
-	        --with-id3tag-includes="$(STAGING_DIR)/usr/include" \
-	        --with-id3tag-libraries="$(STAGING_DIR)/usr/lib" \
-	        --with-libFLAC-includes="$(STAGING_DIR)/usr/include" \
-	        --with-libFLAC-libraries="$(STAGING_DIR)/usr/lib" \
-	        --with-mad-includes="$(STAGING_DIR)/usr/include" \
-	        --with-mad-libraries="$(STAGING_DIR)/usr/lib" \
+		$(EXTRA_CONFIG_PARAM) \
+		--disable-mod \
+		--disable-audiofile \
+		--disable-mpc \
+		--disable-aac \
+		--disable-lsr \
+		--disable-ipv6 \
+		--disable-ao \
+		--disable-mvp \
+		--disable-lametest \
+		--disable-lame \
+		--disable-flac \
+		--with-tremor=$(STAGING_DIR)/usr/lib \
 	)
 endef