From: Sebastian Kemper <redacted>
Date: Sun, 30 Jul 2017 15:41:07 +0000 (+0200)
Subject: libs/speex and libs/speexdsp: fix configure params
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6890d65ebd61072bb43775115a3bea53364ae711;p=openwrt-packages.git

libs/speex and libs/speexdsp: fix configure params

- Remove ogg params from speex configure as it doesn't know about them.

- Remove --enable-sse=no from both speex and speexdsp. The configure
  scripts do actually not add items to our CFLAGS like previously
  assumed.

- When --disable-float-api is used VBR needs to be disabled as well, as
  VBR has not been implemented with fixed-point math in speex (yet). So
  add --disable-vbr when --disable-float-api is used.

- In speexdsp 1.2rc2 optimizations for NEON were added. Unfortunately
  the ASM does not work for 64bit ARM. So force NEON optimizations off
  when compiling for AARCH64.

Signed-off-by: Sebastian Kemper <redacted>
---

diff --git a/libs/speex/Makefile b/libs/speex/Makefile
index 60575854f..01538ebe1 100644
--- a/libs/speex/Makefile
+++ b/libs/speex/Makefile
@@ -60,9 +60,6 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-binaries \
-	--disable-oggtest \
-	--enable-sse=no \
-	--with-ogg=$(STAGING_DIR)/usr \
-	$(if $(CONFIG_SOFT_FLOAT),--enable-fixed-point --disable-float-api)
+	$(if $(CONFIG_SOFT_FLOAT),--enable-fixed-point --disable-float-api --disable-vbr)
 
 $(eval $(call BuildPackage,libspeex))
diff --git a/libs/speexdsp/Makefile b/libs/speexdsp/Makefile
index 508c8789b..5b94e14b7 100644
--- a/libs/speexdsp/Makefile
+++ b/libs/speexdsp/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--disable-examples \
-	--enable-sse=no \
+	$(if $(CONFIG_aarch64),--disable-neon) \
 	$(if $(CONFIG_SOFT_FLOAT),--enable-fixed-point --disable-float-api)
 
 $(eval $(call BuildPackage,libspeexdsp))