libvorbis: Switch to tarballs and actually run autogen.sh to pick up configure changes

4 files changed, 106 insertions, 0 deletions

diff --git a/recipes/libvorbis.recipe b/recipes/libvorbis.recipe
index 67885ff6..8ee237ee 100644
--- a/recipes/libvorbis.recipe
+++ b/recipes/libvorbis.recipe
@@ -5,8 +5,14 @@ from cerbero.utils import shell
 class Recipe(recipe.Recipe):
     name = 'libvorbis'
     version = '1.3.3'
+    stype = SourceType.TARBALL
+    url = 'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.xz'
     licenses = [License.BSD_like]
     deps = ['libogg']
+    config_sh = 'sh autogen.sh'
+    patches = ['libvorbis/0001-Fix-linking-on-Android.patch',
+               'libvorbis/0003-Link-the-other-libs-with-lm-too.patch',
+               'libvorbis/0004-configure-check-for-endianness.patch']
 
     files_libs = ['libvorbis', 'libvorbisenc', 'libvorbisfile']
     files_devel = [
diff --git a/recipes/libvorbis/0001-Fix-linking-on-Android.patch b/recipes/libvorbis/0001-Fix-linking-on-Android.patch
new file mode 100644
index 00000000..2ad77a58
--- /dev/null
+++ b/recipes/libvorbis/0001-Fix-linking-on-Android.patch
@@ -0,0 +1,25 @@
+From c4251f892bbcaf47f1d20b3ce1664363ff08467a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 22 Aug 2012 15:45:05 +0200
+Subject: [PATCH 1/4] Fix linking on Android
+
+---
+ lib/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 50f7ea4..d095eab 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -16,7 +16,7 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c \
+ 			registry.h scales.h window.h lookup.h lookup_data.h\
+ 			codec_internal.h backends.h bitrate.h 
+ libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+-libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@
++libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ -lm
+ 
+ libvorbisfile_la_SOURCES = vorbisfile.c
+ libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+-- 
+1.8.4
+
diff --git a/recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch b/recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch
new file mode 100644
index 00000000..3eb9b4a6
--- /dev/null
+++ b/recipes/libvorbis/0003-Link-the-other-libs-with-lm-too.patch
@@ -0,0 +1,30 @@
+From 279c222e59caec8b315277938b56d3f3a51a319c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 22 Aug 2012 15:50:12 +0200
+Subject: [PATCH 3/4] Link the other libs with -lm too
+
+---
+ lib/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index d095eab..87f35fc 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -20,11 +20,11 @@ libvorbis_la_LIBADD = @VORBIS_LIBS@ @OGG_LIBS@ -lm
+ 
+ libvorbisfile_la_SOURCES = vorbisfile.c
+ libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+-libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@
++libvorbisfile_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm
+ 
+ libvorbisenc_la_SOURCES = vorbisenc.c 
+ libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+-libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@
++libvorbisenc_la_LIBADD = libvorbis.la @OGG_LIBS@ -lm
+ 
+ EXTRA_PROGRAMS = barkmel tone psytune
+ CLEANFILES = $(EXTRA_PROGRAMS)
+-- 
+1.8.4
+
diff --git a/recipes/libvorbis/0004-configure-check-for-endianness.patch b/recipes/libvorbis/0004-configure-check-for-endianness.patch
new file mode 100644
index 00000000..fc7a1870
--- /dev/null
+++ b/recipes/libvorbis/0004-configure-check-for-endianness.patch
@@ -0,0 +1,45 @@
+From eb862e6fb78a783e12061b771f8db9bab786e25c Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Fri, 19 Apr 2013 19:32:43 -0300
+Subject: [PATCH 4/4] configure: check for endianness
+
+---
+ configure.ac | 2 ++
+ lib/os.h     | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 55eccdb..953107d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,6 +222,8 @@ dnl --------------------------------------------------
+ 
+ AC_CHECK_HEADER(memory.h,CFLAGS="$CFLAGS -DUSE_MEMORY_H",:)
+ 
++AC_CHECK_HEADERS(endian.h machine/endian.h sys/param.h inttypes.h)
++
+ dnl --------------------------------------------------
+ dnl Check for typedefs, structures, etc
+ dnl --------------------------------------------------
+diff --git a/lib/os.h b/lib/os.h
+index 276b4de..f9fae9e 100644
+--- a/lib/os.h
++++ b/lib/os.h
+@@ -21,6 +21,14 @@
+ #include "config.h"
+ #endif
+ 
++#if HAVE_ENDIAN_H
++#include <endian.h>
++#elif HAVE_MACHINE_ENDIAN_H
++#include <machine/endian.h>
++#elif HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++
+ #include <math.h>
+ #include <ogg/os_types.h>
+ 
+-- 
+1.8.4
+