Add patches to the xvid and mpeg4ip configure scripts for nasm 2.00.

git-svn-id: svn://localhost/HandBrake/trunk@1248 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 54e2865..c9e29f9 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -217,6 +217,7 @@ rule LibMp4v2
         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 && " ;
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }
@@ -375,6 +376,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  : $(<) ;
 }

diff --git a/contrib/patch-mpeg4ip-nasm-2.00-configure.patch b/contrib/patch-mpeg4ip-nasm-2.00-configure.patch
new file mode 100644 (file)
index 0000000..9baa8b5
--- /dev/null
+++ b/contrib/patch-mpeg4ip-nasm-2.00-configure.patch
@@ -0,0 +1,12 @@
+diff -ruN mpeg4ip-orig/configure mpeg4ip/configure
+--- mpeg4ip-orig/configure     2005-05-18 16:03:25.000000000 -0600
++++ mpeg4ip/configure  2008-01-30 20:17:15.000000000 -0700
+@@ -27789,7 +27789,7 @@
+    if test x$USENASM = xtrue; then
+       echo "$as_me:$LINENO: checking nasm version..." >&5
+ echo $ECHO_N "checking nasm version...... $ECHO_C" >&6
+-      BILLSNASM_arg=`nasm -r | tr '.' ' '`
++      BILLSNASM_arg=`(nasm -r || nasm -v) | tr '.' ' '`
+         BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg`
+       if test x$BILLSNASM_ret = x"yes"; then
+          USENASM=true

diff --git a/contrib/patch-xvidcore-nasm-2.00-configure.patch b/contrib/patch-xvidcore-nasm-2.00-configure.patch
new file mode 100644 (file)
index 0000000..b810eae
--- /dev/null
+++ b/contrib/patch-xvidcore-nasm-2.00-configure.patch
@@ -0,0 +1,12 @@
+diff -ruN xvidcore-orig/build/generic/configure xvidcore/build/generic/configure
+--- xvidcore-orig/build/generic/configure      2006-11-01 03:39:36.000000000 -0700
++++ xvidcore/build/generic/configure   2008-01-30 20:19:48.000000000 -0700
+@@ -4016,7 +4016,7 @@
+        if test "$ac_nasm" = "yes" ; then
+                                             echo "$as_me:$LINENO: checking for nasm patch version" >&5
+ echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6
+-           nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
++           nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1`
+            if test -z $nasm_patch ; then
+               nasm_patch=-1
+            fi