From 3371610551913ed13e9f4fa079d77b595c466957 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 23 Dec 2007 21:35:46 +0000
Subject: [PATCH 1/1] fix icecast compile (untested)

SVN-Revision: 9878
---
 net/icecast/Makefile         | 23 ++++++++++++++++----
 net/icecast/libvorbisidec.mk | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 net/icecast/libvorbisidec.mk

diff --git a/net/icecast/Makefile b/net/icecast/Makefile
index 2511afcaed..62a92192fa 100644
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@@ -21,6 +21,9 @@ 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
@@ -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
diff --git a/net/icecast/libvorbisidec.mk b/net/icecast/libvorbisidec.mk
new file mode 100644
index 0000000000..6438b12bdb
--- /dev/null
+++ b/net/icecast/libvorbisidec.mk
@@ -0,0 +1,42 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvorbisidec
+PKG_VERSION:=1.2.0-dave
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
+PKG_MD5SUM:=cb8e51aab92ef164f8e0e8853f7164fa
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PATCH_DIR=./patches-libvorbisidec
+
+include $(INCLUDE_DIR)/package.mk
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--disable-shared \
+		--enable-static \
+	)
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+endef
+
+define Build/InstallDev
+	true
+endef
+
+$(eval $(call Build/DefaultTargets))
-- 
2.30.2