* back-ported xtophes and my libtwolame fixes/updates

    - this allows native compilation on future darwin and current win32 releases
    - more recent library version (0.3.9 instead of 0.3.8)
    - [18618], [18552], [18530], [18525], [18524] (partially)

extras/contrib/src/Makefile

 #***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003 - 2006 the VideoLAN team
+# Copyright (C) 2003 - 2007 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -1190,7 +1190,7 @@ CLEAN_PKG += libdca
 
 ifdef SVN
 x264: 
-	$(SVN) co svn://svn.videolan.org/x264/trunk/ -r 604 x264
+	$(SVN) co svn://svn.videolan.org/x264/trunk/ x264
 ifdef HAVE_WIN32
 	(cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
 endif
@@ -1415,9 +1415,15 @@ twolame: twolame-$(TWOLAME_VERSION).tar.gz
 ifdef HAVE_BEOS
 	patch -p 0 < Patches/twolame-BeOS.patch
 endif
+ifdef HAVE_DARWIN_OS
+	patch -p 0 < Patches/twolame-osx.patch
+endif
 
 .twolame: twolame
-	(cd twolame; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+ifdef HAVE_WIN32
+	(cd twolame/win32; wget "http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
+endif	
+	(cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd libtwolame &&  make && make install)
 	$(INSTALL_NAME)
 	touch $@
 

extras/contrib/src/Patches/twolame-osx.patch

+--- twolame.orig/libtwolame/common.h	2006-12-31 03:34:32.000000000 +0100
++++ twolame/libtwolame/common.h	2007-01-06 17:48:01.000000000 +0100
+@@ -33,9 +33,12 @@
+ #define NO_DLL_INLINE
+ #else
+ #include "config.h"
++#ifdef __APPLE__
++#define NO_DLL_INLINE
++#else
+ #define NO_DLL_INLINE inline
+ #endif
+-
++#endif
+ 
+ #include "twolame.h"
+ 

extras/contrib/src/packages.mak

 # ***************************************************************************
 # src/packages.mak : Archive locations
 # ***************************************************************************
-# Copyright (C) 2003 - 2006 the VideoLAN team
+# Copyright (C) 2003 - 2007 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -140,7 +140,7 @@ LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win
 GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
 MOZILLA_VERSION=1.7.5
 MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
-TWOLAME_VERSION=0.3.8
+TWOLAME_VERSION=0.3.9
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
 X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz