X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fspeex%2FMakefile;h=24ce114d5616c190a3f1a098f9d05dd16b2d8062;hp=b8525713026e7bdecc7d59354b60211ae3d6b6be;hb=cdf7694d508ce5b447e48e48ca91a1dbcd8aadb3;hpb=91255a638d57424935f70331d7b9ed82e1466bff

diff --git a/libs/speex/Makefile b/libs/speex/Makefile
index b852571302..24ce114d56 100644
--- a/libs/speex/Makefile
+++ b/libs/speex/Makefile
@@ -1,25 +1,21 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 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:=speex
-PKG_VERSION:=1.2beta1
-PKG_RELEASE:=1
+PKG_VERSION:=1.2beta3.2
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/
-PKG_MD5SUM:=aac2e4ba42122b885c787ea280acb3d9
-PKG_CAT:=zcat
+PKG_MD5SUM:=b47396952c5fdd54b6468316c3bd339f
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILD_DEPENDS:=libnotimpl
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,20 +23,41 @@ 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
 
-TARGET_LDFLAGS:=$(TARGET_LDFLAGS) -lnotimpl
+define Package/libspeexdsp
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Open source speech compression codec library output to DSP
+  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_CFLAGS += $(FPIC)
+
+define Package/libspeexdsp/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 dsp library, needed by other programs.
+endef
 
 define Build/Configure
 	$(call Build/Configure/Default, \
@@ -48,6 +65,9 @@ define Build/Configure
 		--enable-static \
 		--enable-fixed-point \
 		--disable-oggtest \
+		--disable-float-api \
+		--disable-vbr \
+		--with-ogg=$(STAGING_DIR)/usr \
 	)
 endef
 
@@ -59,19 +79,14 @@ 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/
-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
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speexdsp.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libspeex/install
@@ -79,4 +94,11 @@ define Package/libspeex/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
 endef
 
+define Package/libspeexdsp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libspeex))
+$(eval $(call BuildPackage,libspeexdsp))
+