X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=sound%2Fmpd%2FMakefile;h=b86f867f383710256ffbb897659dc48d3b097347;hb=d3a7097b715f030369e88d9db293e3177bb1c5d8;hp=e0732468bc8e236010effb2c33ed1241418dd78f;hpb=14b27859b1914cdfda6e075cec5a795cd8069d03;p=packages.git

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index e0732468b..b86f867f3 100644
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007-2009 OpenWrt.org
+#
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,75 +8,88 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.15.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.15.8
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
-PKG_MD5SUM:=eec9f5642d4a9c59a0df0a458def3505
+PKG_MD5SUM:=824e1ce46c0f468865d9e5e403cdaf5d
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/mpd
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2 +libmms +libcurl
   TITLE:=Music Player Daemon
   URL:=http://www.musicpd.org/
+# libvorbis and therewith libogg are needed for shout support
+  DEPENDS:= \
+	+AUDIO_SUPPORT:alsa-lib \
+	+libaudiofile \
+	+BUILD_PATENTED:libfaad2 +BUILD_PATENTED:libmad \
+	+glib2 +libcurl +libflac +libmms +libpthread +libshout \
+	+libvorbis +libvorbisidec +libid3tag
 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
-	clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+ MPD is a music player supporting flac, mp3 and ogg files. It is
+ typically controlled over a network using one of it's many clients
+ including mpc(console), gmpc(gnome), phpmp(php), etc...
 endef
 
 define Package/mpd/conffiles
+/etc/avahi/services/mpd.service
 /etc/mpd.conf
 endef
 
-ifndef CONFIG_PACKAGE_kmod-sound-core
-	EXTRA_CONFIG_PARAM:=--disable-alsa
-endif
+# oggflac is not compatible with tremor
+CONFIGURE_ARGS += \
+	$(call autoconf_bool,CONFIG_BUILD_PATENTED,mad) \
+	$(call autoconf_bool,CONFIG_AUDIO_SUPPORT,alsa) \
+	--enable-audiofile \
+	--disable-mpc \
+	$(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \
+	--disable-lsr \
+	--disable-ao \
+	--disable-mvp \
+	--disable-lame-encoder \
+	--disable-ffmpeg \
+	--enable-flac \
+	--enable-vorbis \
+	--disable-oggflac \
+	--disable-cue \
+	--disable-jack \
+	--disable-modplug \
+	--disable-pulse \
+	--disable-sidplay \
+	--disable-sqlite \
+	--enable-shout \
+	--enable-id3 \
+	--enable-lastfm \
+	--enable-mms \
+	--enable-curl \
+	--disable-oss \
+	--with-zeroconf=no \
+	--disable-libOggFLACtest \
+	--disable-test \
+	--with-tremor=yes \
+	--with-faad="$(STAGING_DIR)/usr" \
 
 CONFIGURE_VARS += \
-	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_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/FLAC" \
 	FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \
-	FLAC_CFLAGS="-I$(STAGING_DIR)/usr/include/FLAC" \
-	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="$(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"
+	$(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
+	$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		$(EXTRA_CONFIG_PARAM) \
-		--disable-audiofile \
-		--disable-mpc \
-		--disable-aac \
-		--disable-lsr \
-		--disable-ipv6 \
-		--disable-ao \
-		--disable-mvp \
-		--disable-lametest \
-		--disable-lame-encoder \
-		--enable-flac \
-		--enable-lastfm \
-		--enable-mms \
-		--with-tremor="$(STAGING_DIR)/usr/lib" \
-	)
-endef
+TARGET_CFLAGS += -std=gnu99
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+# use gcc instead of g++ to avoid unnecessary linking against libstdc++
+TARGET_CXX:=$(TARGET_CC)
 
 define Package/mpd/install
 	$(INSTALL_DIR) $(1)/etc
@@ -85,6 +98,8 @@ define Package/mpd/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mpd $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/mpd.init $(1)/etc/init.d/mpd
+	$(INSTALL_DIR) $(1)/etc/avahi/services
+	$(INSTALL_DATA) ./files/mpd.service $(1)/etc/avahi/services/
 endef
 
 $(eval $(call BuildPackage,mpd))