X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2FJamfile;h=d0450cdfc32489dbfa80c24bcc75ad59575a632b;hb=aa15b5a47943752f66d2d24400f8c13afbe26c5c;hp=b3a8545db25a0382e1fe086961faa8f00b7bd5e8;hpb=80fa85dad2331801d65c2a2de0bb79c685a6621b;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/Jamfile b/contrib/Jamfile
index b3a8545d..d0450cdf 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -4,7 +4,7 @@ SubDir TOP contrib ;
 # is installed for all other systems
 if $(OS) = MACOSX
 {
-    WGET = curl -L -o ;
+    WGET = curl -q -L -o ;
 }
 else
 {
@@ -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
     {
@@ -96,7 +100,7 @@ rule LibAvCodec
        # don't. When we get new versions of FFMPEG we can try enabling
        # then again.
        #
-       FFMPEG_EXTRA_OPTIONS = "--disable-vis --disable-demuxer=mpc8 --disable-vhook" ;
+       FFMPEG_EXTRA_OPTIONS = "--disable-vis --disable-demuxer=mpc8 --disable-vhook --disable-network" ;
     }
 
     Depends $(<) : $(>) ;
@@ -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 &&
@@ -183,6 +187,11 @@ rule LibDvdRead
     {
         DVDREAD_PATCH = "$(PATCH) -p0 < ../patch-libdvdread-css-vlc-dylib.patch &&" ;
     }
+	
+    if $(OS) = CYGWIN
+    {
+        DVDREAD_PATCH = "$(PATCH) -p1 < ../patch-libdvdread-cygwin.patch &&" ;
+    }
     
 }
 if $(CSS) = 1 # Include CSS support in libdvdread if requested
@@ -256,30 +265,19 @@ LibMp3Lame $(SUBDIR)/lib/libmp3lame.a : $(SUBDIR)/lame.tar.gz ;
 rule LibMp4v2
 {
     LIBMP4V2_PATCH = "" ;
-    if $(OS) = CYGWIN
-    {
-        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 && " ;
-    LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip-colr.patch && " ;
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
 actions LibMp4v2
 {
     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 &&
+    rm -rf libmp4v2 && (gzip -dc libmp4v2.tar.gz | tar xf - ) &&
+    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)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ;
-LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ;
+Wget     $(SUBDIR)/libmp4v2.tar.gz : $(SUBDIR)/version_libmp4v2.txt ;
+LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/libmp4v2.tar.gz ;
 
 rule LibMkv
 {
@@ -391,7 +389,7 @@ actions LibTheora
 {
     cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libtheora &&
     (gzip -dc libtheora.tar.gz | tar xf - ) && cd libtheora &&
-    export HAVE_PKG_CONFIG="no" &&
+    HAVE_PKG_CONFIG="no" && export HAVE_PKG_CONFIG &&
     ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --with-vorbis=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared \
             --disable-oggtest --disable-vorbistest --disable-sdltest --disable-examples &&
     $(MAKE) && $(MAKE) install &&
@@ -412,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
@@ -476,3 +473,22 @@ if $(OS) = CYGWIN
     Wget  $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
     Zlib  $(SUBDIR)/lib/libz.a  : $(SUBDIR)/zlib.tar.gz ;
 }
+
+# bzip2
+if $(OS) = CYGWIN
+{
+    rule BZip2
+    {
+        Depends $(<) : $(>) ;
+        Depends lib  : $(<) ;
+    }
+    actions BZip2
+    {
+        cd `dirname $(>)` && CONTRIB=`pwd` &&
+        rm -rf bzip2 && (gzip -dc bzip2.tar.gz | tar xf - ) &&
+        cd bzip2 && $(MAKE) && $(MAKE) install && cp libbz2.a $CONTRIB/lib/ &&
+        $(STRIP) $CONTRIB/lib/libbz2.a
+    }
+    Wget  $(SUBDIR)/bzip2.tar.gz : $(SUBDIR)/version_bzip2.txt ;
+    BZip2  $(SUBDIR)/lib/libbz2.a  : $(SUBDIR)/bzip2.tar.gz ;
+}