X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Ficecast%2FMakefile;h=62a92192fac65757b421c613340b82614bda029a;hp=72103b4901c3e588f42bb6f4aeced3f10e267806;hb=3371610551913ed13e9f4fa079d77b595c466957;hpb=d85961b5ffc35f9b5e8caa42da83613da118fec5

diff --git a/net/icecast/Makefile b/net/icecast/Makefile
index 72103b4901..62a92192fa 100644
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@@ -15,19 +15,22 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/
 PKG_MD5SUM:=35256fbc4a93571662af2ed18fbbfcc5
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
+TREMOR_BUILD_DIR=$(PKG_BUILD_DIR)/libvorbisidec-1.2.0-dave
+TREMOR_DIR=$(TREMOR_BUILD_DIR)/ipkg-install/usr
+
 define Package/icecast
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libcurl +libvorbisidec +libxml2 +libxslt
   TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
   URL:=http://www.icecast.org/
+  SUBMENU:=multimedia
 endef
 
 define Package/icecast/description
@@ -39,23 +42,35 @@ define Package/icecast/description
 	interaction.
 endef
 
+define Build/Prepare
+	$(Build/Prepare/Default)
+	$(SUBMAKE) -f libvorbisidec.mk \
+		BUILD_DIR="$(PKG_BUILD_DIR)" \
+		V=99 \
+		prepare
+endef
 
 define Build/Configure
+	$(MAKE) -f libvorbisidec.mk \
+		BUILD_DIR="$(PKG_BUILD_DIR)" \
+		V=99 \
+		compile
+	$(SED) 's,-lvorbisidec,$(TREMOR_DIR)/lib/libvorbisidec.a,g' $(PKG_BUILD_DIR)/configure
 	$(call Build/Configure/Default, \
 		--enable-yp \
 		--with-curl="yes" \
 		--with-curl-config="$(STAGING_DIR)/usr/bin/curl-config" \
-		--with-ogg="$(STAGING_DIR)/usr" \
+		--with-ogg="$(TREMOR_DIR)" \
 		--with-speex="no" \
 		--with-theora="no" \
-		--with-vorbis="$(STAGING_DIR)/usr" \
+		--with-vorbis="$(TREMOR_DIR)" \
 		--with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" \
 		, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 " \
+		CPPFLAGS="-I$(TREMOR_DIR)/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 " \
 	)
 endef
 
-define Build/Compile	
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
@@ -65,7 +80,7 @@ define Package/icecast/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/icecast $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/share/icecast
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(1)/usr/share/icecast/
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(1)/usr/share/icecast/