[vlc-commits] speex: use git (last updated july 2009, 1 year more recent than 1.2rc1)

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 22 15:25:32 2012 -0500| [c1ca5dbcda400b3cd226783d24185d4e28092be6] | committer: Rafaël Carré

speex: use git (last updated july 2009, 1 year more recent than 1.2rc1)

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

 contrib/src/speex/SHA512SUMS   |    1 -
 contrib/src/speex/no-ogg.patch |   50 ++++++++++++++++++++-------------------
 contrib/src/speex/rules.mak    |   15 +++++++++--
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/contrib/src/speex/SHA512SUMS b/contrib/src/speex/SHA512SUMS
deleted file mode 100644
index ac07bfe..0000000
--- a/contrib/src/speex/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813  speex-1.2rc1.tar.gz
diff --git a/contrib/src/speex/no-ogg.patch b/contrib/src/speex/no-ogg.patch
index 3190872..a8f40f0 100644
--- a/contrib/src/speex/no-ogg.patch
+++ b/contrib/src/speex/no-ogg.patch
@@ -1,5 +1,6 @@
---- speex/configure.ac.orig	2011-11-20 22:56:33.351403106 -0500
-+++ speex/configure.ac	2011-11-20 22:58:02.835846814 -0500
+diff -ur speex.orig/configure.ac speex/configure.ac
+--- speex.orig/configure.ac	2012-01-22 15:23:09.767731000 -0500
++++ speex/configure.ac	2012-01-22 15:24:03.891731001 -0500
 @@ -112,7 +112,7 @@
  
  AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
@@ -9,37 +10,38 @@
  AC_SUBST(src)
  
  AC_CHECK_LIB(m, sin)
---- speex/src/Makefile.am.orig	2011-11-20 23:02:04.065043016 -0500
-+++ speex/src/Makefile.am	2011-11-20 23:02:11.637080565 -0500
-@@ -5,7 +5,7 @@
- # Disable automatic dependency tracking if using other tools than gcc and gmake
- #AUTOMAKE_OPTIONS = no-dependencies
+diff -ur speex.orig/libspeex/Makefile.am speex/libspeex/Makefile.am
+--- speex.orig/libspeex/Makefile.am	2012-01-22 15:23:09.759731001 -0500
++++ speex/libspeex/Makefile.am	2012-01-22 15:23:40.799730998 -0500
+@@ -11,7 +11,7 @@
  
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
+ EXTRA_DIST=echo_diagnostic.m
+ 
+-INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
++INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@
+ 
+ lib_LTLIBRARIES = libspeex.la libspeexdsp.la
+ 
+diff -ur speex.orig/src/Makefile.am speex/src/Makefile.am
+--- speex.orig/src/Makefile.am	2012-01-22 15:23:09.775731000 -0500
++++ speex/src/Makefile.am	2012-01-22 15:23:30.351731024 -0500
+@@ -11,7 +11,7 @@
+   VPSY_LIB=
+ endif
+ 
+-INCLUDES = -I$(top_builddir) @OGG_CFLAGS@
++INCLUDES = -I$(top_builddir)
  
  man_MANS = speexenc.1 speexdec.1
  
-@@ -18,8 +18,8 @@
+@@ -24,8 +24,8 @@
  
  speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
  speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
 -	$(OGG_LIBS)  @FFT_LIBS@	
-+	@FFT_LIBS@	
++	@FFT_LIBS@
  
  speexdec_SOURCES = speexdec.c wav_io.c
- speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
+ speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(VPSY_LIB) \
 -	$(OGG_LIBS)  @FFT_LIBS@
 +	@FFT_LIBS@
- 
---- speex/libspeex/Makefile.am.orig	2011-11-20 23:04:54.033885844 -0500
-+++ speex/libspeex/Makefile.am	2011-11-20 23:05:00.889919836 -0500
-@@ -4,7 +4,7 @@
- 
- EXTRA_DIST=echo_diagnostic.m
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@
- 
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 50d5bdf..4eeac6f 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -1,7 +1,9 @@
 # speex
 
-SPEEX_VERSION := 1.2rc1
-SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
+#SPEEX_VERSION := 1.2rc1
+#SPEEX_URL := http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
+SPEEX_VERSION := git
+SPEEX_GITURL := http://git.xiph.org/?p=speex.git;a=snapshot;h=HEAD;sf=tgz
 
 PKGS += speex
 ifeq ($(call need_pkg,"speex >= 1.0.5"),)
@@ -11,10 +13,17 @@ endif
 $(TARBALLS)/speex-$(SPEEX_VERSION).tar.gz:
 	$(call download,$(SPEEX_URL))
 
+$(TARBALLS)/speex-git.tar.gz:
+	$(call download,$(SPEEX_GITURL))
+
 .sum-speex: speex-$(SPEEX_VERSION).tar.gz
+	$(warning $@ not implemented)
+	touch $@
 
 speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
-	$(UNPACK)
+	rm -Rf $@-git
+	mkdir -p $@-git
+	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(APPLY) $(SRC)/speex/no-ogg.patch
 	$(MOVE)