[vlc-devel] commit: Fix contribs compilation (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.8.6-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sun May 25 13:46:40 2008 -0700| [73e50b29ce8fdba4381acad28f0064a2959cbde8]

Fix contribs compilation

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

 extras/contrib/src/Makefile                 |    3 +--
 extras/contrib/src/Patches/xml2-win32.patch |   20 --------------------
 extras/contrib/src/packages.mak             |    2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index fbb7953..4031290 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -871,7 +871,6 @@ lame-$(LAME_VERSION).tar.gz:
 
 lame: lame-$(LAME_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	rm -rf lame;  mv lame-3.97 lame; touch lame
 
 .lame: lame
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install)
@@ -1629,7 +1628,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 ifdef HAVE_WIN32
 	patch -p0 < Patches/gnutls-win32.patch
-	(cd $@; cd lgl; ln -sf alloca_.h alloca.h; rm vasprintf.c; touch vasprintf.c; rm vasnprintf.c; touch vasnprintf.c) 
+	(cd $@; cd lgl; ln -sf alloca_.h alloca.h;) 
 endif
 
 .gnutls: gnutls .opencdk .gcrypt .gpg-error 
diff --git a/extras/contrib/src/Patches/xml2-win32.patch b/extras/contrib/src/Patches/xml2-win32.patch
index a8b166d..f13fea9 100644
--- a/extras/contrib/src/Patches/xml2-win32.patch
+++ b/extras/contrib/src/Patches/xml2-win32.patch
@@ -191,23 +191,3 @@
  noinst_LTLIBRARIES = testdso.la
  testdso_la_SOURCES = testdso.c
  testdso_la_LDFLAGS = -module -rpath $(libdir)
---- xml/xmlmodule.c	2005-10-28 16:24:34.000000000 +0200
-+++ xml-new/xmlmodule.c	2006-10-11 13:56:13.748125000 +0200
-@@ -190,6 +190,8 @@
-     return (0);
- }
- 
-+#ifndef _WIN32
-+
- #ifdef HAVE_DLOPEN
- #ifdef HAVE_DLFCN_H
- #include <dlfcn.h>
-@@ -288,7 +290,7 @@
- #endif /* HAVE_SHLLOAD */
- #endif /* ! HAVE_DLOPEN */
- 
--#ifdef _WIN32
-+#else /* _WIN32 */
- 
- #include <windows.h>
- 
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 9575c6a..036d20c 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -78,7 +78,7 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
 #FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
 FAAC_VERSION=1.24
 FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
-LAME_VERSION=3.97b2
+LAME_VERSION=3.97
 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