several changes to mpd Makefile

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

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index ad774263e2953e5867f03893e9000a580556da78..32307c2a777ac9755bddd213782ae2c46095da52 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007-2009 OpenWrt.org
+#
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
-PKG_VERSION:=0.14.2
+PKG_VERSION:=0.15.8
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
-PKG_MD5SUM:=66817a4b4c05454e6488f6b821f2a6a3
+PKG_MD5SUM:=824e1ce46c0f468865d9e5e403cdaf5d
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mpd
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2
+  # libvorbis and therewith libogg are needed for shout support
+  DEPENDS:=+libflac +BUILD_PATENTED:libfaad2 +BUILD_PATENTED:libmad +libvorbisidec +libpthread +glib2 +libmms +libcurl +libshout +alsa-lib +libvorbis
   TITLE:=Music Player Daemon
   URL:=http://www.musicpd.org/
 endef
@@ -35,45 +38,55 @@ define Package/mpd/conffiles
 /etc/mpd.conf
 endef
 
-ifndef CONFIG_PACKAGE_kmod-sound-core
-       EXTRA_CONFIG_PARAM:=--disable-alsa
-endif
+TARGET_CFLAGS += \
+       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
+       -I$(STAGING_DIR)/usr/lib/libiconv/include/
+
+TARGET_LDFLAGS += \
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+
+# oggflac is not compatible with tremor
+CONFIGURE_ARGS+= \
+       --$(if $(CONFIG_BUILD_PATENTED),enable-mad,disable-mad) \
+       --enable-alsa \
+       --enable-audiofile \
+       --disable-mpc \
+       --$(if $(CONFIG_BUILD_PATENTED),enable-aac,disable-aac) \
+       --disable-lsr \
+       --disable-ao \
+       --disable-mvp \
+       --disable-lame-encoder \
+       --disable-ffmpeg \
+       --enable-flac \
+       --enable-vorbis \
+       --disable-oggflac \
+       --disable-sqlite \
+       --enable-shout \
+       --enable-id3 \
+       --enable-lastfm \
+       --enable-mms \
+       --enable-curl \
+       --disable-oss \
+       --enable-aac \
+       --with-zeroconf=no \
+       --disable-libOggFLACtest \
+       --disable-test \
+       --with-tremor=yes \
+       --with-faad="$(STAGING_DIR)/usr" \
+
+# use gcc instead of g++ to avoid unnecessary linking against libstdc++
+TARGET_CXX=$(TARGET_CC)
+
+TARGET_CFLAGS+=-std=gnu99
+
 
 CONFIGURE_VARS += \
-       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"
-
-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 \
-               --enable-flac \
-               --with-tremor=$(STAGING_DIR)/usr/lib \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+       $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
+       $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
 
 define Package/mpd/install
        $(INSTALL_DIR) $(1)/etc