* fixed the compilation of some libs on OSX:

    - faad2, goom2k4, libpng, ffmpeg (modified gibalou's patch and moved it to a win32-file)

extras/contrib/src/Makefile

 # ***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003, 2004, 2005 the VideoLAN team
+# Copyright (C) 2003 - 2005 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
 #          Eric Petit <titer@m0k.org>
 #          Felix Khne <fkuehne@users.sourceforge.net>
+#          Christophe Mutricy <xtophe@nxtelevision.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -691,7 +692,9 @@ ifdef HAVE_WIN32
 endif
 .faad: faad2
 	(cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
+ifdef HAVE_WIN32
 	$(INSTALL_NAME)
+endif
 	touch $@
 
 CLEAN_FILE += .faad
@@ -809,6 +812,12 @@ ifeq ($(HOST),i586-pc-beos)
 	patch -p 0 < Patches/ffmpeg-beos.patch.cvs
 	(cd $@; ./bootstrap)
 endif
+ifdef HAVE_WIN32
+	patch -p 0 < Patches/ffmpeg-cvs-win32.patch
+endif
+ifdef HAVE_DARWIN_OS
+	patch -p 0 < Patches/ffmpeg-cvs-osx.patch
+endif
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	$(WGET) $(FFMPEG_URL)
@@ -1014,7 +1023,11 @@ ifdef HAVE_WIN32
 endif
 
 .goom2k4: goom
-	(cd $<&& autoconf configure.in >|configure &&./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install )
+ifdef HAVE_DARWIN_OS
+	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+else
+	(cd $<&& autoconf configure.in >|configure &&./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
+endif
 	touch $@
 
 CLEAN_FILE += .goom2k4
@@ -1301,9 +1314,9 @@ ifdef HAVE_WIN32
 	(cd $<; cp scripts/makefile.cygwin Makefile && make && make install)
 else
 	(cd $<;./configure $(HOSTCONF) --prefix=$(PREFIX) && make   && make install)
-endif
 endif
 	$(INSTALL_NAME)
+endif 
 	touch $@
 
 CLEAN_FILE += .png
@@ -1550,7 +1563,11 @@ ifneq ($(HOST),$(BUILD))
 endif
 
 .tiff: tiff
+ifdef HAVE_WIN32
 	(cd $<;  ./configure  --noninteractive --target=$(HOST) --with-CC=$(HOST)-gcc --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no  && make -C libtiff && make -C libtiff install)
+else
+	(cd $<; ./configure --noninteractive --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install)
+endif
 	touch $@
 
 CLEAN_FILE += .tiff

extras/contrib/src/Patches/ffmpeg-cvs-osx.patch

+Index: libavutil/common.h
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
+retrieving revision 1.153
+diff -u -r1.153 common.h
+--- ffmpeg.orig/libavutil/common.h	19 Sep 2005 23:26:47 -0000	1.153
++++ ffmpeg/libavutil/common.h	1 Nov 2005 21:40:31 -0000
+@@ -543,7 +543,7 @@
+     }\
+ }
+ 
+-#ifndef HAVE_LRINTF
++#if !defined(HAVE_LRINTF) && !defined(__APPLE__)
+ /* XXX: add ISOC specific test to avoid specific BSD testing. */
+ /* better than nothing implementation. */
+ /* btw, rintf() is existing on fbsd too -- alex */

extras/contrib/src/Patches/ffmpeg-cvs-win32.patch

+Index: libavutil/common.h
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
+retrieving revision 1.153
+diff -u -r1.153 common.h
+--- ffmpeg.orig/libavutil/common.h	19 Sep 2005 23:26:47 -0000	1.153
++++ ffmpeg/libavutil/common.h	1 Nov 2005 21:40:31 -0000
+@@ -543,7 +543,7 @@
+     }\
+ }
+ 
+-#ifndef HAVE_LRINTF
++#if !defined(HAVE_LRINTF) && !defined(__MINGW32__)
+ /* XXX: add ISOC specific test to avoid specific BSD testing. */
+ /* better than nothing implementation. */
+ /* btw, rintf() is existing on fbsd too -- alex */

extras/contrib/src/Patches/ffmpeg-cvs.patch

@@ -14,19 +14,3 @@ diff -u -r1.26 Makefile
  ifeq ($(SHARED_PP),yes)
  ifeq ($(CONFIG_WIN32),yes)
  	install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)"
-Index: libavutil/common.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
-retrieving revision 1.153
-diff -u -r1.153 common.h
---- libavutil/common.h	19 Sep 2005 23:26:47 -0000	1.153
-+++ libavutil/common.h	1 Nov 2005 21:40:31 -0000
-@@ -543,7 +543,7 @@
-     }\
- }
- 
--#ifndef HAVE_LRINTF
-+#if !defined(HAVE_LRINTF) && !defined(__MINGW32__)
- /* XXX: add ISOC specific test to avoid specific BSD testing. */
- /* better than nothing implementation. */
- /* btw, rintf() is existing on fbsd too -- alex */