[packages] apr: update to v1.3.9

[openwrt/svn-archive/archive.git] / sound / mpd / Makefile

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index d35d9bdab257c511314fa6f0ede2edd16f4c04ac..30165ce1fe1ec0bddcad8051c9cb77b0c4dec563 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 - 2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.14.2
+PKG_VERSION:=0.15.1
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
-PKG_MD5SUM:=66817a4b4c05454e6488f6b821f2a6a3
+PKG_MD5SUM:=eec9f5642d4a9c59a0df0a458def3505
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mpd
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2
+  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2 +libmms +libcurl
   TITLE:=Music Player Daemon
   URL:=http://www.musicpd.org/
 endef
@@ -40,32 +40,34 @@ ifndef CONFIG_PACKAGE_kmod-sound-core
 endif
 
 CONFIGURE_VARS += \
-       ID3TAG_LIBS="-L$(STAGING_DIR)/usr/lib -lz -lid3tag" \
-       ID3TAG_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-       FLAC_LIBS="-L$(STAGING_DIR)/usr/lib -lFLAC" \
+       CURL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto -lcurl" \
+       CURL_CFLAGS="-I$(STAGING_DIR)/usr/include" \
+       ID3TAG_LIBS="$(TARGET_LDFLAGS) -lz -lid3tag" \
+       ID3TAG_CFLAGS="$(TARGET_CPPFLAGS)" \
+       FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \
        FLAC_CFLAGS="-I$(STAGING_DIR)/usr/include/FLAC" \
-       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" \
+       MAD_LIBS="$(TARGET_LDFLAGS) -lmad" \
+       MAD_CFLAGS="$(TARGET_CPPFLAGS)" \
+       OGGVORBIS_LIBS="$(TARGET_LDLFAGS) -lvorbisidec" \
+       OGGVORBIS_CFLAGS="$(TARGET_CPPFLAGS)" \
        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"
+       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-mod \
                --disable-audiofile \
                --disable-mpc \
                --disable-aac \
                --disable-lsr \
-               --disable-ipv6 \
                --disable-ao \
                --disable-mvp \
                --disable-lametest \
-               --disable-lame \
+               --disable-lame-encoder \
                --enable-flac \
-               --with-tremor=$(STAGING_DIR)/usr/lib \
+               --enable-lastfm \
+               --enable-mms \
+               --with-tremor="$(STAGING_DIR)/usr/lib" \
        )
 endef