From: titer <eric@lapsus.org>
Date: Sat, 14 Jan 2006 19:42:37 +0000 (+0000)
Subject:  Fixed ffmpeg build on MacIntel
X-Git-Tag: 0.7.1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0746b160593e1237101cbef5e959d0dc04aaf70;p=handbrake

 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 6b15be6a3..9727c5cd1 100644
--- 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 46e14c2c8..2ba2aa492 100644
--- 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 f7df901d4..12935842a 100644
--- 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>