X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fspeex%2FMakefile;h=733251c18424976de4d99ee1bfca54c87da24d8a;hp=cf720dca1c82001c03977462b0890f8f72bf27e7;hb=acdb0e81d9f354161b53b74d9e4ca280a7762bf0;hpb=72ccd5bd4aee6ece340ab7c4caba10695611b6b6

diff --git a/libs/speex/Makefile b/libs/speex/Makefile
index cf720dca1c..733251c184 100644
--- a/libs/speex/Makefile
+++ b/libs/speex/Makefile
@@ -9,16 +9,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=speex
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.2beta1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://us.speex.org/download 
-PKG_MD5SUM:=734892c8ca5e7e835828048a1289a0cc
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/
+PKG_MD5SUM:=aac2e4ba42122b885c787ea280acb3d9
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DEPENDS:=libnotimpl
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,23 +26,28 @@ define Package/libspeex
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Open source speech compression codec library
-  DESCRIPTION:=\
-	Open source patent-free speech compression codec library.\\\
-	Speex is an Open Source/Free Software patent-free audio compression \\\
-	format designed for speech. The Speex Project aims to lower the \\\
-	barrier of entry for voice applications by providing a free \\\
-	alternative to expensive proprietary speech codecs. Moreover, Speex \\\
-	is well-adapted to Internet applications and provides useful features \\\
-	that are not present in most other codecs.\\\
-	\\\
-	This package contains the shared codec library, needed by other programs.
   URL:=http://www.speex.org/
 endef
 
+define Package/libspeex/description
+	Open source patent-free speech compression codec library.
+	Speex is an Open Source/Free Software patent-free audio compression 
+	format designed for speech. The Speex Project aims to lower the 
+	barrier of entry for voice applications by providing a free 
+	alternative to expensive proprietary speech codecs. Moreover, Speex 
+	is well-adapted to Internet applications and provides useful features 
+	that are not present in most other codecs.
+	
+	This package contains the shared codec library, needed by other programs.
+endef
+
+TARGET_LDFLAGS:=$(TARGET_LDFLAGS) -lnotimpl
+
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--enable-shared \
 		--enable-static \
+		--enable-fixed-point \
 		--disable-oggtest \
 	)
 endef
@@ -55,25 +60,16 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-	$(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
-	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/speex \
-		$(STAGING_DIR)/usr/lib/libspeex.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/
+	mkdir -p $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libspeex/install
-	install -d -m0755 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
 endef