recipes/libvorbis: Bump to 1.3.5

3 files changed, 44 insertions, 16 deletions

diff --git a/recipes/libvorbis.recipe b/recipes/libvorbis.recipe
index 7b3a8933..a6cc7d2d 100644
--- a/recipes/libvorbis.recipe
+++ b/recipes/libvorbis.recipe
@@ -4,17 +4,18 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'libvorbis'
-    version = '1.3.4'
+    version = '1.3.5'
     stype = SourceType.TARBALL
-    url = 'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz'
+    url = 'http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz'
     licenses = [License.BSD_like]
     deps = ['libogg']
-    config_sh = 'sh autogen.sh'
+    config_sh = 'rm ltmain.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',
                'libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch',
-               'libvorbis/0006-Use-our-version-of-automake-instead-of-some-random-o.patch'
+               'libvorbis/0006-Use-our-version-of-automake-instead-of-some-random-o.patch',
+               'libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch'
               ]
 
     files_libs = ['libvorbis', 'libvorbisenc', 'libvorbisfile']
diff --git a/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch b/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch
index 6153da70..b0fd55ba 100644
--- a/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch
+++ b/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch
@@ -1,30 +1,30 @@
-From dded9c5c30cf45320541c27e444d9150b04e6ab5 Mon Sep 17 00:00:00 2001
+From 9feb6354cf8322a3a9cb89077a300bc61858dba2 Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Mon, 4 Nov 2013 12:15:10 +0100
 Subject: [PATCH] darwin: do not build for a generic arm architecture
 
 These linker flags end up building for generic arm when armv7 is required
 ---
- configure.ac |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 953107d..a5c0f88 100644
+index 923eefe..4bf75a0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -198,9 +198,9 @@ else
- 		CFLAGS="-O20 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
- 		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
+@@ -197,9 +197,9 @@ else
+ 		CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ 		PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
  	*-*-darwin*)
 -		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
--		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+-		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+-		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
 +		DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
-+		CFLAGS="-DDARWIN -fno-common -Wall -g -O2 -ffast-math -fsigned-char"
-+		PROFILE="-DDARWIN -fno-common -Wall -g -pg -O2 -ffast-math -fsigned-char";;
++		CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
++		PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
  	*-*-os2*)
  		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
  		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
 -- 
-1.7.4.4
+2.1.0
 
diff --git a/recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch b/recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch
new file mode 100644
index 00000000..dc971565
--- /dev/null
+++ b/recipes/libvorbis/0007-autogen.sh-Make-sure-libtoolize-runs-fully.patch
@@ -0,0 +1,27 @@
+From fa7893ac074b42229464cc009251628ad25821b7 Mon Sep 17 00:00:00 2001
+From: Edward Hervey <bilboed@bilboed.com>
+Date: Tue, 7 Apr 2015 10:16:15 +0200
+Subject: [PATCH] autogen.sh: Make sure libtoolize runs fully
+
+---
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index e605da8..4f77601 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -116,8 +116,8 @@ echo "Generating configuration files for $package, please wait...."
+ 
+ echo "  $ACLOCAL $ACLOCAL_FLAGS"
+ $ACLOCAL $ACLOCAL_FLAGS || exit 1
+-echo "  $LIBTOOLIZE --automake"
+-$LIBTOOLIZE --automake || exit 1
++echo "  $LIBTOOLIZE --automake --force"
++$LIBTOOLIZE --automake --force || exit 1
+ echo "  autoheader"
+ autoheader || exit 1
+ echo "  $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
+-- 
+2.1.0
+