flac: Update to 1.3.2

3 files changed, 2 insertions, 91 deletions

diff --git a/recipes/flac.recipe b/recipes/flac.recipe
index 7918dfb3..c3d9f4f1 100644
--- a/recipes/flac.recipe
+++ b/recipes/flac.recipe
@@ -4,13 +4,11 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'flac'
-    version = '1.3.1'
+    version = '1.3.2'
     # only libraries are Xiph.org (aka BSD-like), tools are GPLv2+ and defined below
     licenses = [License.BSD_like]
     stype = SourceType.TARBALL
-    url = 'http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz'
-    patches = ['flac/0001-configure.ac-use-mstackrealign-mingw32.patch',
-               'flac/0002-fix-autoreconf.patch']
+    url = 'http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz'
     deps = ['libogg']
     configure_options = ' --disable-cpplibs --enable-static'
 
diff --git a/recipes/flac/0001-configure.ac-use-mstackrealign-mingw32.patch b/recipes/flac/0001-configure.ac-use-mstackrealign-mingw32.patch
deleted file mode 100644
index 212291c1..00000000
--- a/recipes/flac/0001-configure.ac-use-mstackrealign-mingw32.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1ed65e560039a1b729720bbc5d9b72f72bab2152 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Tue, 31 Mar 2015 18:21:38 +1100
-Subject: [PATCH 1/2] configure.ac : Add -mstackrealign whenever we add -msse2.
-
-There have been some (pretty much unconfirmed) reports of problems
-with SSE enabled but without this stack alignment flag.
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2dcc698..eb9b0cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -399,6 +399,7 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
- 
- 	if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
- 		XIPH_ADD_CFLAGS([-msse2])
-+		XIPH_ADD_CFLAGS([-mstackrealign])
- 		fi
- 
- 	fi
--- 
-2.7.2.windows.1
-
-From a84587061cab4d55fa2668ea431d3b61e711c8a3 Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Sat, 11 Apr 2015 01:05:30 -0400
-Subject: [PATCH 2/2] configure: Only use -mstackrealign on i686 for
- mingw32/os2
-
-Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index eb9b0cc..6f34c66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -399,11 +399,17 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
- 
- 	if test "x$asm_optimisation$sse_os" = "xyesyes" ; then
- 		XIPH_ADD_CFLAGS([-msse2])
--		XIPH_ADD_CFLAGS([-mstackrealign])
- 		fi
- 
- 	fi
- 
-+case "$host_os" in
-+	"mingw32"|"os2")
-+	if test "$host_cpu" = "i686"; then
-+		XIPH_ADD_CFLAGS([-mstackrealign])
-+		fi
-+	esac
-+
- XIPH_ADD_CFLAGS([-Wextra])
- 
- if test x$enable_werror = "xyes" ; then
--- 
-2.7.2.windows.1
-
diff --git a/recipes/flac/0002-fix-autoreconf.patch b/recipes/flac/0002-fix-autoreconf.patch
deleted file mode 100644
index 6981ece4..00000000
--- a/recipes/flac/0002-fix-autoreconf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 36d2dcadb1884938f23aa349a056f92f13d09961 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Thu, 30 Aug 2012 21:14:07 +0200
-Subject: [PATCH 2/2] fix autoreconf
-
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 451921d..17f8c7b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -30,6 +30,7 @@
- #
- 
- ACLOCAL_AMFLAGS = -I m4
-+AUTOMAKE_OPTIONS = foreign 1.7
- 
- SUBDIRS = doc include m4 man src examples test build objs
- 
--- 
-1.9.0
-