From d6ea52ed1aea9adcd5617ea20c6ac475c07cd040 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Tue, 22 Nov 2011 16:09:14 +0100
Subject: [PATCH] New speex version

---
 submodules/build/builder-iphone-os.mk | 9 +++++----
 submodules/externals/speex            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 201493d16..c04473289 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -81,12 +81,13 @@ LIBILBC_SRC_DIR:=$(BUILDER_SRC_DIR)/libilbc-rfc3951
 LIBILBC_BUILD_DIR:=$(BUILDER_BUILD_DIR)/libilbc-rfc3951
 
 ifneq (,$(findstring arm,$(host)))
-	SPEEX_CONFIGURE_OPTION := --enable-fixed-point --disable-float-api 
-	#SPEEX_CONFIGURE_OPTION := --enable-arm5e-asm --enable-fixed-point
+	#SPEEX_CONFIGURE_OPTION := --enable-fixed-point --disable-float-api
+	CFLAGS := $(CFLAGS) -marm 
+	SPEEX_CONFIGURE_OPTION := --disable-float-api --enable-arm5e-asm --enable-fixed-point
 endif
 
 ifneq (,$(findstring armv7,$(host)))
-	SPEEX_CONFIGURE_OPTION := --enable-fixed-point --disable-float-api 
+	SPEEX_CONFIGURE_OPTION += --enable-armv7neon-asm 
 endif
 
 prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host)
@@ -196,7 +197,7 @@ $(BUILDER_SRC_DIR)/$(speex_dir)/configure:
 $(BUILDER_BUILD_DIR)/$(speex_dir)/Makefile: $(BUILDER_SRC_DIR)/$(speex_dir)/configure
 	mkdir -p $(BUILDER_BUILD_DIR)/$(speex_dir)
 	cd $(BUILDER_BUILD_DIR)/$(speex_dir)/\
-	&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) CFLAGS="$(CFLAGS) -O2" \
 	$(BUILDER_SRC_DIR)/$(speex_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-ogg  $(SPEEX_CONFIGURE_OPTION)
 
 build-speex: $(BUILDER_BUILD_DIR)/$(speex_dir)/Makefile
diff --git a/submodules/externals/speex b/submodules/externals/speex
index 418ee578c..06a869e4a 160000
--- a/submodules/externals/speex
+++ b/submodules/externals/speex
@@ -1 +1 @@
-Subproject commit 418ee578c1f0870ff5bd348f0d2f432bb8f9d17a
+Subproject commit 06a869e4a71941d24bacbf08289a6319c920973c