Revert "contrib: use speexdsp 1.2rc2"

This reverts commit 67066bf6dccc61ff15b6385dd80451a025a5217d and
1a2780cbbc0ab64dacfedd132f1d95aecf3df45d as there are still some
upstream issues to resolve.

diff --git a/contrib/src/speexdsp/SHA512SUMS b/contrib/src/speexdsp/SHA512SUMS
deleted file mode 100644 (file)
index f429f54..0000000
--- a/contrib/src/speexdsp/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-fe9b7f45c6459a8d403417995402a81c40211f7a4c23e6cdaa05ef7afde75d2cc3741b11387b4800d77a1aa0d6be646b4611912f480dd93c145e185affe68d3e  speexdsp-1.2rc2.tar.gz

diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 6c07a31a3dc442fc276188836f5fab358de4af29..3cc2b15bc899e7e5dfd19051c3fe75967480400f 100644 (file)
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -1,20 +1,25 @@
 # speexdsp
 
-SPEEXDSP_VERSION := 1.2rc2
-SPEEXDSP_URL := http://downloads.us.xiph.org/releases/speex/speexdsp-$(SPEEXDSP_VERSION).tar.gz
+SPEEXDSP_VERSION := git
+SPEEXDSP_HASH := HEAD
+SPEEXDSP_GITURL := http://git.xiph.org/?p=speexdsp.git;a=snapshot;h=$(SPEEXDSP_HASH);sf=tgz
 
 PKGS += speexdsp
 ifeq ($(call need_pkg,"speexdsp"),)
 PKGS_FOUND += speexdsp
 endif
 
-$(TARBALLS)/speexdsp-$(SPEEXDSP_VERSION).tar.gz:
-       $(call download,$(SPEEXDSP_URL))
+$(TARBALLS)/speexdsp-git.tar.gz:
+       $(call download,$(SPEEXDSP_GITURL))
 
 .sum-speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz
+       $(warning $@ not implemented)
+       touch $@
 
 speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz .sum-speexdsp
-       $(UNPACK)
+       rm -Rf $@-git $@
+       mkdir -p $@-git
+       $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
        $(MOVE)
 
 SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples