[vlc-commits] contrib: use speex 1.2rc2

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <tmatth at videolan.org> | Sat Dec  6 17:40:25 2014 -0500| [b12194c98ac65afe4bd587e86f0e2b44b890be37] | committer: Tristan Matthews

contrib: use speex 1.2rc2

(cherry picked from commit b7c4173cb7cb5a4a8656abb4f1a59de6209562dd)

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

 contrib/src/speex/SHA512SUMS |    1 +
 contrib/src/speex/rules.mak  |   20 +++++---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/contrib/src/speex/SHA512SUMS b/contrib/src/speex/SHA512SUMS
new file mode 100644
index 0000000..addff26
--- /dev/null
+++ b/contrib/src/speex/SHA512SUMS
@@ -0,0 +1 @@
+557cf22ed7085dba94d92963cf4a4b5030a1f7f9936783ba427378d60dd7881a886687fb987b3c951120728009fb47054091e2d7d5e3dfcc6912b51ffdfbb97e  speex-1.2rc2.tar.gz
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index fd90cde..376dcbd 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -1,30 +1,20 @@
 # speex
 
-#SPEEX_VERSION := 1.2rc1
-#SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
-SPEEX_VERSION := git
-SPEEX_HASH := HEAD
-SPEEX_GITURL := http://git.xiph.org/?p=speex.git;a=snapshot;h=$(SPEEX_HASH);sf=tgz
+SPEEX_VERSION := 1.2rc2
+SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
 
 PKGS += speex
 ifeq ($(call need_pkg,"speex >= 1.0.5"),)
 PKGS_FOUND += speex
 endif
 
-#$(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
-#	$(call download,$(SPEEX_URL))
-
-$(TARBALLS)/speex-git.tar.gz:
-	$(call download,$(SPEEX_GITURL))
+$(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
+	$(call download,$(SPEEX_URL))
 
 .sum-speex: speex-$(SPEEX_VERSION).tar.gz
-	$(warning $@ not implemented)
-	touch $@
 
 speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
-	rm -Rf $@-git $@
-	mkdir -p $@-git
-	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
+	$(UNPACK)
 	$(MOVE)
 
 SPEEX_CONF := --disable-binaries