X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibvorbisidec%2FMakefile;h=24a3ebf9a3e2e330f146f7c846b604cdd299bd90;hb=fa543750e84e5bd2e0535db795d03b2dc4caf15e;hp=b32b8149ee261fba36d9c2825905a71abf54a0fc;hpb=ff1c3c19b8fd49635ac381d7dbd38d23c6586438;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile
index b32b8149ee..24a3ebf9a3 100644
--- a/libs/libvorbisidec/Makefile
+++ b/libs/libvorbisidec/Makefile
@@ -9,16 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvorbisidec
-PKG_VERSION:=1.2.0-dave
+PKG_VERSION:=1.0.2+svn14261
 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_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec/
+PKG_MD5SUM:=bc617d4af1cd74b38d7c51451dd6eff0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,15 +24,20 @@ define Package/libvorbisidec
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A fixed-point Ogg/Vorbis decoder library
-  DESCRIPTION:=\
-	libvorbisidec is "tremor", a fixed-point implementation of libvorbis.\\\
-	It also has libogg built-in. It is suitable as a replacement for \\\
-	libvorbis and libogg in tremor-aware applications.\\\
-	Tremor is a decoder only. 
   URL:=http://wiki.xiph.org/index.php/Tremor
 endef
 
+define Package/libvorbisidec/description
+	libvorbisidec is "tremor", a fixed-point implementation of libvorbis.
+	It also has libogg built-in. It is suitable as a replacement for 
+	libvorbis and libogg in tremor-aware applications.
+	Tremor is a decoder only.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Configure
+	(cd $(PKG_BUILD_DIR); ./autogen.sh );
 	$(call Build/Configure/Default, \
 		--enable-shared \
 		--enable-static \
@@ -48,16 +51,10 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/tremor \
-		$(STAGING_DIR)/usr/lib/libvorbisidec.{a,so*}
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libvorbisidec/install