[vlc-commits] contribs: lame: use version 3.100

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Oct  4 13:53:47 2018 +0200| [4ac5fe7ff0e49da5b1fc4d04430661646e9c216f] | committer: Steve Lhomme

contribs: lame: use version 3.100

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

 contrib/src/lame/SHA512SUMS                    |  2 +-
 contrib/src/lame/lame-outdated-autotools.patch | 50 --------------------------
 contrib/src/lame/rules.mak                     |  3 +-
 contrib/src/lame/sse.patch                     |  8 ++---
 4 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/contrib/src/lame/SHA512SUMS b/contrib/src/lame/SHA512SUMS
index ef98895eca..38f2cbae71 100644
--- a/contrib/src/lame/SHA512SUMS
+++ b/contrib/src/lame/SHA512SUMS
@@ -1 +1 @@
-ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8  lame-3.99.5.tar.gz
+0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b  lame-3.100.tar.gz
diff --git a/contrib/src/lame/lame-outdated-autotools.patch b/contrib/src/lame/lame-outdated-autotools.patch
deleted file mode 100644
index 4bc27922f9..0000000000
--- a/contrib/src/lame/lame-outdated-autotools.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- lame/configure.in.autotools	2012-02-28 19:50:27.000000000 +0100
-+++ lame/configure.in	2018-05-24 08:17:53.119940000 +0200
-@@ -78,7 +78,7 @@ if test "${GCC}" = "yes"; then
- fi
- 
- dnl more automake stuff
--AM_C_PROTOTYPES
-+dnl AM_C_PROTOTYPES
- 
- AC_CHECK_HEADER(dmalloc.h)
- if test "${ac_cv_header_dmalloc_h}" = "yes"; then
-@@ -393,7 +393,7 @@ CONFIG_MATH_LIB="${USE_LIBM}"
- 
- dnl configure use of features
- 
--AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
-+dnl AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
- 
- dnl ElectricFence malloc debugging
- AC_MSG_CHECKING(use of ElectricFence malloc debugging)
---- lame/doc/html/Makefile.am.autotools	2018-05-24 08:42:16.439442600 +0200
-+++ lame/doc/html/Makefile.am	2018-05-24 08:19:44.596125100 +0200
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
- 
--AUTOMAKE_OPTIONS = foreign ansi2knr
-+AUTOMAKE_OPTIONS = foreign
- 
- docdir = $(datadir)/doc
- pkgdocdir = $(docdir)/$(PACKAGE)
---- lame/doc/man/Makefile.am.autotools	2018-05-24 08:42:11.199809700 +0200
-+++ lame/doc/man/Makefile.am	2018-05-24 08:19:48.855510100 +0200
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
- 
--AUTOMAKE_OPTIONS = foreign ansi2knr
-+AUTOMAKE_OPTIONS = foreign
- 
- man_MANS = lame.1
- EXTRA_DIST = ${man_MANS}
---- lame/libmp3lame/i386/Makefile.am.autotools	2018-05-24 08:42:07.015600500 +0200
-+++ lame/libmp3lame/i386/Makefile.am	2018-05-24 08:19:54.559671800 +0200
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
- 
--AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
-+AUTOMAKE_OPTIONS = foreign
- 
- DEFS = @DEFS@ @CONFIG_DEFS@
- 
diff --git a/contrib/src/lame/rules.mak b/contrib/src/lame/rules.mak
index 45186e2505..c0f2df4fce 100644
--- a/contrib/src/lame/rules.mak
+++ b/contrib/src/lame/rules.mak
@@ -1,6 +1,6 @@
 # lame
 
-LAME_VERSION := 3.99.5
+LAME_VERSION := 3.100
 LAME_URL := $(SF)/lame/lame-$(LAME_VERSION).tar.gz
 
 $(TARBALLS)/lame-$(LAME_VERSION).tar.gz:
@@ -12,7 +12,6 @@ lame: lame-$(LAME_VERSION).tar.gz .sum-lame
 	$(UNPACK)
 	$(APPLY) $(SRC)/lame/lame-forceinline.patch
 	$(APPLY) $(SRC)/lame/sse.patch
-	$(APPLY) $(SRC)/lame/lame-outdated-autotools.patch
 	# Avoid relying on iconv.m4 from gettext, when reconfiguring.
 	# This is only used by the frontend which we disable.
 	cd $(UNPACK_DIR) && sed -i.orig 's/^AM_ICONV/#&/' configure.in
diff --git a/contrib/src/lame/sse.patch b/contrib/src/lame/sse.patch
index 7958c64ef6..e67f5966da 100644
--- a/contrib/src/lame/sse.patch
+++ b/contrib/src/lame/sse.patch
@@ -10,8 +10,8 @@ In file included from xmm_quantize_sub.c:37:0:
 xmm_quantize_sub.c:65:18: error: called from here
      const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
                   ^
---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig	2014-06-08 12:16:19.455468042 -0700
-+++ lame/libmp3lame/vector/xmm_quantize_sub.c	2014-06-08 12:16:09.592356980 -0700
+--- lame/libmp3lame/vector/xmm_quantize_sub.c.orig	2018-10-04 13:48:32.286892400 +0200
++++ lame/libmp3lame/vector/xmm_quantize_sub.c	2018-10-04 13:49:23.640116100 +0200
 @@ -35,6 +35,7 @@
  #ifdef HAVE_XMMINTRIN_H
  
@@ -20,11 +20,11 @@ xmm_quantize_sub.c:65:18: error: called from here
  
  typedef union {
      int32_t _i_32[4]; /* unions are initialized by its first member */
-@@ -124,6 +125,7 @@
+@@ -132,6 +133,7 @@ store4(__m128 v, float* f0, float* f1, f
  }
  
  
 +#pragma GCC target("sse2")
- void
+ SSE_FUNCTION void
  fht_SSE2(FLOAT * fz, int n)
  {