From 038ff7b2822ab927762912c130e15781b0f3bb4d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf <jb@videolan.org> Date: Fri, 7 Nov 2008 01:49:04 +0100 Subject: [PATCH] [Contribs] Update LAME. --- extras/contrib/src/Makefile | 1 - extras/contrib/src/Patches/libmp3lame-mingw32.patch | 11 ----------- extras/contrib/src/packages.mak | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 extras/contrib/src/Patches/libmp3lame-mingw32.patch diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index c22ca17eec6e..241540a63790 100644 --- 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 index d2d916eb1aeb..000000000000 --- 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 d4cc3b73535b..1e45b5bc2c9b 100644 --- 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 -- GitLab