[Contribs] Update LAME.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c22ca17eec6e8b2e4ab2b3279539afc86feaff0a..241540a63790fbcfe68769b1c7a01d5fbfd21dcb 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -927,7 +927,6 @@ lame-$(LAME_VERSION).tar.gz:
 
 lame: lame-$(LAME_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/libmp3lame-mingw32.patch
 
 .lame: lame
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install)

diff --git a/extras/contrib/src/Patches/libmp3lame-mingw32.patch b/extras/contrib/src/Patches/libmp3lame-mingw32.patch
deleted file mode 100644 (file)
index d2d916e..0000000
--- a/extras/contrib/src/Patches/libmp3lame-mingw32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lame-3.98b8/mpglib/mpglib.h        2006-06-16 01:51:49.000000000 +0200
-+++ lame/mpglib/mpglib.h       2008-07-02 07:56:40.000000000 +0200
-@@ -57,7 +57,7 @@
- } MPSTR, *PMPSTR;
- 
- 
--#if ( defined(_MSC_VER) || defined(__BORLANDC__) )
-+#if ( defined(_MSC_VER) || defined(__BORLANDC__) || defined( WIN32 ) )
-         typedef int BOOL; /* windef.h contains the same definition */
- #else
-         #define BOOL int

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index d4cc3b73535b521b16f070abddc8ac0b9bb4a2f5..1e45b5bc2c9b02a5504a00a09a999b5611bacda8 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -90,7 +90,7 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
 FAAC_VERSION=1.26
 FAAC_URL=$(SF)/faac/faac-$(FAAC_VERSION).tar.gz
-LAME_VERSION=3.98b8
+LAME_VERSION=398-2
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
 LIBEBML_VERSION=0.7.8
 LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2