[vlc-commits] contrib: speexdsp: fix build with android-ndk10c

[Thomas Guillem]

vlc/vlc-2.2 | branch: master | Thomas Guillem <tom at gllm.fr> | Mon Oct 20 14:50:27 2014 +0200| [405088e9f4161dac27dc6d15d101fe722983be42] | committer: Jean-Baptiste Kempf

contrib: speexdsp: fix build with android-ndk10c

In android-ndk10c, there is a "arm_neon.h" for all archs. The arm_neon.h for
x86* contains correspondence between neon and sse. In speexdsp, There is a
conflict between resample_sse.h and resample_neon.h. So disable neon if arch is
known to don't have neon.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit ef98e81ff014175fd7494c8313de8883d15834b3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=405088e9f4161dac27dc6d15d101fe722983be42
---

 contrib/src/speexdsp/rules.mak |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 9b58675..bf06849 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -23,6 +23,9 @@ speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz .sum-speexdsp
 	$(MOVE)
 
 SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples
+ifndef HAVE_NEON
+SPEEXDSP_CONF += --disable-neon
+endif
 ifndef HAVE_FPU
 SPEEXDSP_CONF += --enable-fixed-point
 ifeq ($(ARCH),arm)