Updated x264 so it builds on MacIntel

 Fixed build of XviD on MacIntel

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

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 5bdf71bfa3db7fcc55e013a3262de7f1125afd34..46e14c2c8b46ee10ddf1853f75c1de68ee7c5550 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -254,6 +254,10 @@ LibX264 $(SUBDIR)/lib/libx264.a : $(SUBDIR)/x264.tar.gz ;
 # libxvidcore
 rule LibXvidCore
 {
+    if $(OS) = MACOSX && $(OSPLAT) = X86
+    {
+       XVID_OPTIONS = --disable-assembly ;
+    }
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
@@ -261,7 +265,8 @@ actions LibXvidCore
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf xvidcore && tar xzf xvidcore.tar.gz &&
-    cd xvidcore/build/generic/ && ./configure && make libxvidcore.a &&
+    cd xvidcore/build/generic/ && ./configure $(XVID_OPTIONS) &&
+    make libxvidcore.a &&
     cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
     cp ../../src/xvid.h $CONTRIB/include/ &&
     strip -S $CONTRIB/lib/libxvidcore.a

diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt
index 560f081ab36ea791bb1b123ccba7596afe177e34..0ff3c2e5122625f44a2f1e0a8f6601e458102cf6 100644 (file)
--- a/contrib/version_x264.txt
+++ b/contrib/version_x264.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/x264-r305.tar.gz
+http://download.m0k.org/handbrake/contrib/x264-r400.tar.gz