[package] enable flac support, reduce dependency list, libiconv is a dependency of glib2 (#4927)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15239 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-04-17 13:36:35 +00:00
parent ea19c6a8b5
commit 133f6ee470

View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mpd PKG_NAME:=mpd
PKG_VERSION:=0.14.2 PKG_VERSION:=0.14.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/musicpd PKG_SOURCE_URL:=@SF/musicpd
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/mpd define Package/mpd
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound
DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +libiconv +glib2 DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2
TITLE:=Music Player Daemon TITLE:=Music Player Daemon
URL:=http://www.musicpd.org/ URL:=http://www.musicpd.org/
endef endef
@ -43,6 +43,8 @@ endif
CONFIGURE_VARS += \ CONFIGURE_VARS += \
ID3TAG_LIBS="-L$(STAGING_DIR)/usr/lib -lz -lid3tag" \ ID3TAG_LIBS="-L$(STAGING_DIR)/usr/lib -lz -lid3tag" \
ID3TAG_CFLAGS="-I$(STAGING_DIR)/usr/include" \ ID3TAG_CFLAGS="-I$(STAGING_DIR)/usr/include" \
FLAC_LIBS="-L$(STAGING_DIR)/usr/lib -lFLAC" \
FLAC_CFLAGS="-I$(STAGING_DIR)/usr/include/FLAC" \
MAD_LIBS="-L$(STAGING_DIR)/usr/lib -lmad" \ MAD_LIBS="-L$(STAGING_DIR)/usr/lib -lmad" \
MAD_CFLAGS="-I$(STAGING_DIR)/usr/include" \ MAD_CFLAGS="-I$(STAGING_DIR)/usr/include" \
OGGVORBIS_LIBS="-L$(STAGING_DIR)/usr/lib -lvorbisidec" \ OGGVORBIS_LIBS="-L$(STAGING_DIR)/usr/lib -lvorbisidec" \
@ -63,7 +65,7 @@ define Build/Configure
--disable-mvp \ --disable-mvp \
--disable-lametest \ --disable-lametest \
--disable-lame \ --disable-lame \
--disable-flac \ --enable-flac \
--with-tremor=$(STAGING_DIR)/usr/lib \ --with-tremor=$(STAGING_DIR)/usr/lib \
) )
endef endef