[vlc-commits] contrib: speex: fix build with recent automake

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Oct 16 13:03:02 2013 +0200| [68cc0b2748deef7bfb6c291657c2ff5609307628] | committer: Jean-Baptiste Kempf

contrib: speex: fix build with recent automake

Disable the API function returning version string as it uses old
automake functionality that might be buggy/not supported anymore.
Don't bother fixing properly as we don't use that function and libspeex is now
an abandoned projet (move to Opus!)

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

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

 contrib/src/speex/automake.patch |   59 ++++++++++++++++++++++++++++++++++++++
 contrib/src/speex/rules.mak      |    1 +
 2 files changed, 60 insertions(+)

diff --git a/contrib/src/speex/automake.patch b/contrib/src/speex/automake.patch
new file mode 100644
index 0000000..59015e6
--- /dev/null
+++ b/contrib/src/speex/automake.patch
@@ -0,0 +1,59 @@
+--- speex/configure.ac.orig	2013-10-16 12:58:06.707579608 +0200
++++ speex/configure.ac	2013-10-16 12:58:21.423579879 +0200
+@@ -1,9 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
+ 
+-AC_INIT(libspeex/speex.c)
+-
+-AM_CONFIG_HEADER([config.h])
+-
+ SPEEX_MAJOR_VERSION=1
+ SPEEX_MINOR_VERSION=1
+ SPEEX_MICRO_VERSION=16
+@@ -11,22 +7,23 @@
+ #SPEEX_VERSION=
+ #SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
+ SPEEX_VERSION="1.2rc1"
++AC_INIT([speex], 1.2rc1)
+ 
+ SPEEX_LT_CURRENT=6
+ SPEEX_LT_REVISION=0
+ SPEEX_LT_AGE=5
+ 
++AC_CONFIG_SRCDIR(libspeex/speex.c)
++AM_INIT_AUTOMAKE
++
++AM_CONFIG_HEADER([config.h])
++
+ AC_SUBST(SPEEX_LT_CURRENT)
+ AC_SUBST(SPEEX_LT_REVISION)
+ AC_SUBST(SPEEX_LT_AGE)
+ 
+-# For automake.
+-VERSION=$SPEEX_VERSION
+-PACKAGE=speex
+-
+ AC_SUBST(SPEEX_VERSION)
+ 
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+ AM_MAINTAINER_MODE
+ 
+ AC_CANONICAL_HOST
+--- speex/libspeex/speex.c.orig	2013-10-16 13:02:22.643584325 +0200
++++ speex/libspeex/speex.c	2013-10-16 13:01:25.995583281 +0200
+@@ -222,6 +222,7 @@
+ {
+    switch (request)
+    {
++#if 0
+       case SPEEX_LIB_GET_MAJOR_VERSION:
+          *((int*)ptr) = SPEEX_MAJOR_VERSION;
+          break;
+@@ -237,6 +238,7 @@
+       case SPEEX_LIB_GET_VERSION_STRING:
+          *((const char**)ptr) = SPEEX_VERSION;
+          break;
++#endif
+       /*case SPEEX_LIB_SET_ALLOC_FUNC:
+          break;
+       case SPEEX_LIB_GET_ALLOC_FUNC:
diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index fb96a6b..974eac2 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -25,6 +25,7 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
 	mkdir -p $@-git
 	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(APPLY) $(SRC)/speex/no-ogg.patch
+	$(APPLY) $(SRC)/speex/automake.patch
 	$(APPLY) $(SRC)/speex/neon.patch
 	$(MOVE)