--- a/dist-files.mk	Fri Jun 27 21:06:38 2014 -0400
+++ b/dist-files.mk	Fri Jun 27 21:13:38 2014 -0400
@@ -178,6 +178,8 @@
   json-c-2-patch-remove-rpl.patch \
   json-c-test.c \
   json-c.mk \
+  lame-1-fix-xmmintrin-errors.patch  \
+  lame-2-update-autotools.patch \
   lame.mk \
   lapack-test.f \
   lapack.mk \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lame-1-fix-xmmintrin-errors.patch	Fri Jun 27 21:13:38 2014 -0400
@@ -0,0 +1,31 @@
+This file is part of MXE.
+See index.html for further information.
+
+Fix compilation of SSE2 sources with GCC 4.9. Since this requires an autoreconf
+run, we manually disable the GTK 1.2 dependency, because we don't have the GTK
+M4 files available.
+
+diff -Naur lame-3.99.5.orig/configure.in lame-3.99.5/configure.in
+--- lame-3.99.5.orig/configure.in	2014-05-02 13:00:26.006106005 +0200
++++ lame-3.99.5/configure.in	2014-05-02 13:14:01.690106046 +0200
+@@ -393,7 +393,8 @@
+ 
+ dnl configure use of features
+ 
+-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++HAVE_GTK="no"
++AC_SUBST(GTK_CFLAGS)
+ 
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
+diff -Naur lame-3.99.5.orig/libmp3lame/vector/Makefile.am lame-3.99.5/libmp3lame/vector/Makefile.am
+--- lame-3.99.5.orig/libmp3lame/vector/Makefile.am	2014-05-02 13:00:26.002106005 +0200
++++ lame-3.99.5/libmp3lame/vector/Makefile.am	2014-05-02 13:08:03.854106010 +0200
+@@ -20,6 +20,7 @@
+ 
+ if WITH_XMM
+ liblamevectorroutines_la_SOURCES = $(xmm_sources)
++liblamevectorroutines_la_CFLAGS = -msse
+ endif
+ 
+ noinst_HEADERS = lame_intrin.h

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lame-2-update-autotools.patch	Fri Jun 27 21:13:38 2014 -0400
@@ -0,0 +1,107 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+https://github.com/rbrito/lame/commit/a6552b532919dcc2fbfb32d1dfdaab80c1534200
+
+From a6552b532919dcc2fbfb32d1dfdaab80c1534200 Mon Sep 17 00:00:00 2001
+From: Rogério Brito <rbrito@ime.usp.br>
+Date: Wed, 12 Jun 2013 09:16:29 +0000
+Subject: [PATCH] Make autotools files compatible with automake >= 1.12
+
+Newer autotools versions don't seem to support ansi2knr, which is probably
+not a problem, given the last decades of compilers accepting ANSI C (and the
+rest of the LAME code being written in ANSI C itself).
+
+This fixes ticket #60, with a patch of Brennan Shacklett, from the Gentoo
+community.
+---
+ aclocal.m4                  | 17 -----------------
+ configure.in                |  3 ---
+ doc/html/Makefile.am        |  2 +-
+ doc/man/Makefile.am         |  3 +--
+ libmp3lame/i386/Makefile.am |  2 +-
+ 5 files changed, 3 insertions(+), 24 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index fc53243..4d9ad71 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -10530,23 +10530,6 @@ AC_DEFUN([_AM_IF_OPTION],
+ 
+ # serial 5
+ 
+-AC_DEFUN([AM_C_PROTOTYPES],
+-[AC_REQUIRE([AC_C_PROTOTYPES])
+-if test "$ac_cv_prog_cc_stdc" != no; then
+-  U= ANSI2KNR=
+-else
+-  U=_ ANSI2KNR=./ansi2knr
+-fi
+-# Ensure some checks needed by ansi2knr itself.
+-AC_REQUIRE([AC_HEADER_STDC])
+-AC_CHECK_HEADERS([string.h])
+-AC_SUBST([U])dnl
+-AC_SUBST([ANSI2KNR])dnl
+-_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
+-])
+-
+-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+-
+ # Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+diff --git a/configure.in b/configure.in
+index 24ca884..6f5c1c6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -77,9 +77,6 @@ if test "${GCC}" = "yes"; then
+ 	AC_MSG_RESULT(${GCC_version})
+ fi
+ 
+-dnl more automake stuff
+-AM_C_PROTOTYPES
+-
+ AC_CHECK_HEADER(dmalloc.h)
+ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
+ 	AM_WITH_DMALLOC
+diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
+index aa76785..09d26c2 100644
+--- a/doc/html/Makefile.am
++++ b/doc/html/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id$
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ docdir = $(datadir)/doc
+ pkgdocdir = $(docdir)/$(PACKAGE)
+diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
+index 05182b5..dac00a3 100644
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
+@@ -1,7 +1,6 @@
+ ## $Id$
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ man_MANS = lame.1
+ EXTRA_DIST = ${man_MANS}
+-
+diff --git a/libmp3lame/i386/Makefile.am b/libmp3lame/i386/Makefile.am
+index 032c2b2..c51912e 100644
+--- a/libmp3lame/i386/Makefile.am
++++ b/libmp3lame/i386/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id$
+ 
+-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
+-- 
+1.9.1
+

--- a/src/lame.mk	Fri Jun 27 21:06:38 2014 -0400
+++ b/src/lame.mk	Fri Jun 27 21:13:38 2014 -0400
@@ -3,12 +3,12 @@
 
 PKG             := lame
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.99
-$(PKG)_CHECKSUM := 91dfd25bedc02759051a6b3af05e61337a575028
+$(PKG)_VERSION  := 3.99.5
+$(PKG)_CHECKSUM := 03a0bfa85713adcc6b3383c12e2cc68a9cfbf4c4
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := libiconv gettext
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/lame/files/lame/' | \
@@ -17,10 +17,12 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(1)' && autoreconf -i -I '$(HOST_PREFIX)/share/aclocal' && \
+        ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
-        $(ENABLE_SHARED_OR_STATIC)
+        $(ENABLE_SHARED_OR_STATIC) \
+        --disable-frontend
     $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'
 endef