Index: contrib/Jamfile
===================================================================
--- contrib/Jamfile	(revision 1080)
+++ contrib/Jamfile	(working copy)
@@ -5,6 +5,9 @@
 if $(OS) = MACOSX
 {
     WGET = curl -L -o ;
+    SDK = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 ;
+    EXTRA_FLAGS = CFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' LDFLAGS='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' ;
+   EXTRA_FLAGS2 = --extra-cflags='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' --extra-ldflags='-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4' ;
 }
 else
 {
@@ -51,7 +54,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
     cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/liba52.a
 }
 Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
@@ -81,7 +84,7 @@
     ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
         --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
         --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
-        --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
+        --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs $(EXTRA_FLAGS2) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libavcodec.a
 }
@@ -116,7 +119,7 @@
         cd `dirname $(>)` && CONTRIB=`pwd` &&
         rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
         cd libdvdcss &&
-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
+        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install &&
         $(STRIP) $CONTRIB/lib/libdvdcss.a
     }
     Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
@@ -134,7 +137,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
     cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libdca.a
 }
 Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
@@ -153,7 +156,7 @@
         cd `dirname $(>)` && CONTRIB=`pwd` &&
         rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
         cd libdvdread &&
-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
+        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB $(EXTRA_FLAGS) &&
         $(MAKE) && $(MAKE) install &&
         $(STRIP) $CONTRIB/lib/libdvdread.a
     }
@@ -184,7 +187,7 @@
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libfaac.a
 }
@@ -201,7 +204,7 @@
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmp3lame.a
 }
@@ -214,7 +217,7 @@
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
-if $(OS) != CYGWIN
+if $(OS) != CYGWIN && $(OS) != MACOSX
 {
     actions LibMp4v2
     {
@@ -229,6 +232,24 @@
         $(STRIP) $CONTRIB/lib/libmp4v2.a
     }
 }
+
+else if $(OS) = MACOSX
+{
+    actions LibMp4v2
+    {
+	# Ugly hack, the bootstrap script does not pass the cflags correctly to the configure script
+        cd `dirname $(>)` && CONTRIB=`pwd` &&
+        rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) && 
+        cd mpeg4ip &&
+        $(PATCH) -p1 < ../patch-mpeg4ip.patch && $(PATCH) -p0 < ../patch-mpeg4ip-no_compressor_name.patch &&
+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
+	./configure $(EXTRA_FLAGS) CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" &&
+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
+        cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
+            include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
+        $(STRIP) $CONTRIB/lib/libmp4v2.a
+    }
+}
 else
 {
     actions LibMp4v2
@@ -244,6 +265,7 @@
         $(STRIP) $CONTRIB/lib/libmp4v2.a
     }
 }
+
 Wget     $(SUBDIR)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ;
 LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ;
 
@@ -257,10 +279,11 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
     cd libmkv &&
-    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
+    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmkv.a
 }
+
 Wget    $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ;
 LibMkv  $(SUBDIR)/lib/libmkv.a  : $(SUBDIR)/libmkv.tar.gz ;
 
@@ -275,7 +298,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
     cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmpeg2.a
 }
@@ -293,7 +316,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
     cd libogg &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libogg.a
 }
@@ -311,7 +334,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
     cd libsamplerate &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libsamplerate.a
 }
@@ -329,7 +352,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
     cd libvorbis &&
-    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared $(EXTRA_FLAGS) &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libvorbis.a
 }
@@ -369,7 +392,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
     cd x264 && $(LIBX264_PATCH)
-    bash ./configure --prefix=$CONTRIB --enable-pthread &&
+    bash ./configure --prefix=$CONTRIB --enable-pthread $(EXTRA_FLAGS2) &&
     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
 }
 Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
@@ -395,7 +418,7 @@
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
     cd xvidcore && $(LIBXVIDCORE_PATCH)
-    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
+    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache $(EXTRA_FLAGS) && $(MAKE) libxvidcore.a &&
     cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
     cp ../../src/xvid.h $CONTRIB/include/ &&
     $(STRIP) $CONTRIB/lib/libxvidcore.a