LinGui: make it possible to build outside srcdir

[handbrake-jp/handbrake-jp-git.git] / contrib / Jamfile

diff --git a/contrib/Jamfile b/contrib/Jamfile
index d50a934..d0450cd 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -87,7 +87,11 @@ rule LibAvCodec
     else if $(OS) = SOLARIS
     {
         FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-solaris.patch " ;
-    } 
+    }
+    else if $(OS) = MACOSX
+    {
+        FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-h264dsp-crash.diff " ;
+    }
 
     if $(OS) = SOLARIS
     {
@@ -111,7 +115,7 @@ actions LibAvCodec
         --disable-shared --enable-static --disable-encoders \
         --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
         --enable-libfaad --disable-ffmpeg --disable-ffserver \
-        --disable-muxers --enable-muxer=ipod --disable-bsfs \
+        --disable-muxers --enable-muxer=ipod --disable-bsfs --disable-vhook \
         --extra-cflags="-I$CONTRIB/include" \
         --extra-ldflags="-L$CONTRIB/lib" $(FFMPEG_EXTRA_OPTIONS) &&
     $(MAKE) && $(MAKE) install &&
@@ -268,8 +272,8 @@ actions LibMp4v2
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libmp4v2 && (gzip -dc libmp4v2.tar.gz | tar xf - ) &&
-    cd libmp4v2 && $(LIBMP4V2_PATCH) ./configure --prefix=$CONTRIB &&
-    $(MAKE) && make install &&
+    cd libmp4v2 && $(LIBMP4V2_PATCH) rm -rf build && mkdir build && cd build &&
+    ../configure --disable-shared --disable-debug --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmp4v2.a
 }
 Wget     $(SUBDIR)/libmp4v2.tar.gz : $(SUBDIR)/version_libmp4v2.txt ;
@@ -406,8 +410,7 @@ rule LibX264
     {
         LIBX264_PATCH += " $(PATCH) -p1 < ../patch-x264-solaris.patch && " ;
     }
-    LIBX264_PATCH += "$(PATCH) -p0 < ../patch-x264-idr.patch && " ;
-       Depends $(<) : $(>) ;
+    Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
 actions LibX264