Fixed ffmpeg build on MacIntel

 Bumped version to 0.7.1-cvs

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@19 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/Jamrules b/Jamrules
index 6b15be6a3ed6acca83c6ca33346dfa0266e05110..9727c5cd1b1ee7af879d60072a9f562ad676c407 100644 (file)
--- a/Jamrules
+++ b/Jamrules
@@ -11,7 +11,7 @@ if ! $(DEFINES)
     Exit "Please run ./configure first." ;
 }
 
-HB_VERSION  = 0.7.0 ;
+HB_VERSION  = 0.7.1-cvs ;
 HB_BUILD    = 2005110400 ;
 DEFINES    += HB_VERSION=\\\"$(HB_VERSION)\\\" HB_BUILD=$(HB_BUILD) ;
 LANGUAGES   = fr de it pl ru nl es pt ja ;

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 46e14c2c8b46ee10ddf1853f75c1de68ee7c5550..2ba2aa492432724bc032d77f2bc95015bde3add6 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -42,6 +42,10 @@ LibA52 $(SUBDIR)/lib/liba52.a  : $(SUBDIR)/a52dec.tar.gz ;
 # libavcodec
 rule LibAvCodec
 {
+    if $(OS) = MACOSX && $(OSPLAT) = X86
+    {
+       FFMPEG_OPTIONS = --disable-mmx ;
+    }
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
@@ -49,7 +53,7 @@ actions LibAvCodec
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf ffmpeg && tar xzf ffmpeg.tar.gz && cd ffmpeg &&
-    ./configure --prefix=$CONTRIB --enable-gpl &&
+    ./configure --prefix=$CONTRIB $(FFMPEG_OPTIONS) --enable-gpl &&
     make -C libavcodec && make -C libavutil &&
     make -C libavcodec installlib && make -C libavutil installlib &&
     strip -S $CONTRIB/lib/libavcodec.a

diff --git a/macosx/Info.plist b/macosx/Info.plist
index f7df901d41b16f632c909703409036ef5e0dff12..12935842a572d8d1c8533544c10b01bbca23ea5e 100644 (file)
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -9,7 +9,7 @@
        <key>CFBundleExecutable</key>
        <string>HandBrake</string>
        <key>CFBundleGetInfoString</key>
-       <string>0.7.0</string>
+       <string>0.7.1-cvs</string>
        <key>CFBundleIconFile</key>
        <string>HandBrake.icns</string>
        <key>CFBundleIdentifier</key>
@@ -21,7 +21,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.7.0</string>
+       <string>0.7.1-cvs</string>
        <key>CFBundleSignature</key>
        <string>HB##</string>
        <key>CFBundleVersion</key>