contrib: use speexdsp 1.2rc3

[vlc] / contrib / src / speexdsp / rules.mak

diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 224481378b50f52f9eff51bbbf3755a7bbbaee4d..f02a7e82644c49f0564784e62cadf73f9dc24929 100644 (file)
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -1,30 +1,30 @@
 # speexdsp
 
-SPEEXDSP_VERSION := git
-SPEEXDSP_HASH := HEAD
-SPEEXDSP_GITURL := http://git.xiph.org/?p=speexdsp.git;a=snapshot;h=$(SPEEXDSP_HASH);sf=tgz
+SPEEXDSP_VERSION := 1.2rc3
+SPEEXDSP_URL := http://downloads.us.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz
 
 PKGS += speexdsp
 ifeq ($(call need_pkg,"speexdsp"),)
 PKGS_FOUND += speexdsp
 endif
 
-$(TARBALLS)/speexdsp-git.tar.gz:
-       $(call download,$(SPEEXDSP_GITURL))
+$(TARBALLS)/speexdsp-$(SPEEXDSP_VERSION).tar.gz:
+       $(call download,$(SPEEXDSP_URL))
 
 .sum-speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz
-       $(warning $@ not implemented)
-       touch $@
 
 speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz .sum-speexdsp
-       rm -Rf $@-git $@
-       mkdir -p $@-git
-       $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
-       $(APPLY) $(SRC)/speexdsp/neon.patch
-       $(APPLY) $(SRC)/speexdsp/includedir.patch
+       $(UNPACK)
        $(MOVE)
 
-SPEEXDSP_CONF := --enable-resample-full-sinc-table
+SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples
+ifeq ($(ARCH),aarch64)
+# old neon, not compatible with aarch64
+SPEEXDSP_CONF += --disable-neon
+endif
+ifndef HAVE_NEON
+SPEEXDSP_CONF += --disable-neon
+endif
 ifndef HAVE_FPU
 SPEEXDSP_CONF += --enable-fixed-point
 ifeq ($(ARCH),arm)