AC3 from DVD via HB converted to M4V for viewing on ATV

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

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 546e482..ebc9e7f 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -211,38 +211,27 @@ LibMp3Lame $(SUBDIR)/lib/libmp3lame.a : $(SUBDIR)/lame.tar.gz ;
 # libmp4v2
 rule LibMp4v2
 {
-    Depends $(<) : $(>) ;
-    Depends lib  : $(<) ;
-}
-if $(OS) != CYGWIN
-{
-    actions LibMp4v2
+    LIBMP4V2_PATCH = "" ;
+    if $(OS) = CYGWIN
     {
-        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-pascal-str.patch &&
-        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
-        $(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
+        LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch_mpeg4ip_cygwin.patch && " ;
     }
+    LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip.patch && " ;
+    LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip-nasm-2.00-configure.patch && " ;
+    LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip-ac3.patch && " ;
+    Depends $(<) : $(>) ;
+    Depends lib  : $(<) ;
 }
-else
+actions LibMp4v2
 {
-    actions LibMp4v2
-    {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) && 
-        cd mpeg4ip &&
-        $(PATCH) -p1 < ../patch-mpeg4ip.patch && $(PATCH) -p1 < ../patch_mpeg4ip_cygwin.patch && $(PATCH) -p0 < ../patch-mpeg4ip-pascal-str.patch &&
-        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
-        $(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
-    }
+    cd `dirname $(>)` && CONTRIB=`pwd` &&
+    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
+    cd mpeg4ip && $(LIBMP4V2_PATCH)
+    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
+    $(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
 }
 Wget     $(SUBDIR)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ;
 LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ;
@@ -351,11 +340,7 @@ LibVorbisEnc $(SUBDIR)/lib/libvorbisenc.a : $(SUBDIR)/lib/libvorbis.a ;
 rule LibX264
 {
     LIBX264_PATCH = "" ;
-    if $(OS) = MACOSX && $(OSPLAT) = X86
-    {
-        LIBX264_PATCH += "$(PATCH) -p1 < ../patch-x264-macintel.patch && " ;
-    }
-    else if $(OS) = CYGWIN
+    if $(OS) = CYGWIN
     {
         LIBX264_PATCH += "$(PATCH) -p1 < ../patch-x264-cygwin.patch && " ;
     }
@@ -363,8 +348,9 @@ rule LibX264
     {
         LIBX264_PATCH += " $(PATCH) -p1 < ../patch-x264-solaris.patch && " ;
     }
-    LIBX264_PATCH += "$(PATCH) -p0 < ../patch-x264-aq.patch && " ;
+# AQ is temporarily disabled    LIBX264_PATCH += "$(PATCH) -p0 < ../patch-x264-aq.patch && " ;
     LIBX264_PATCH += "$(PATCH) -p0 < ../patch-x264-idr.patch && " ;
+    LIBX264_PATCH += "$(PATCH) -p0 < ../patch-x264-vbv-2pass.patch && " ;
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
@@ -374,8 +360,7 @@ actions LibX264
     rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
     cd x264 && $(LIBX264_PATCH)
     bash ./configure --prefix=$CONTRIB --enable-pthread &&
-    $(MAKE) && $(MAKE) install &&
-    $(STRIP) $CONTRIB/lib/libx264.a
+    $(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 ;
 LibX264 $(SUBDIR)/lib/libx264.a : $(SUBDIR)/x264.tar.gz ;
@@ -392,6 +377,7 @@ rule LibXvidCore
     {
         LIBXVIDCORE_PATCH = "$(PATCH) -p1 < ../patch-xvidcore-cygwin.patch && " ;
     }
+    LIBXVIDCORE_PATCH += "$(PATCH) -p1 < ../patch-xvidcore-nasm-2.00-configure.patch && " ;
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
@@ -420,7 +406,7 @@ if $(OS) = CYGWIN
     {
         cd `dirname $(>)` && CONTRIB=`pwd` &&
         rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
-        cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
+        cd zlib && ./configure --prefix=$CONTRIB &&
         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
         $(STRIP) $CONTRIB/lib/libz.a
     }