diff options
| author | saintdev <[email protected]> | 2008-02-04 01:22:33 +0000 |
|---|---|---|
| committer | saintdev <[email protected]> | 2008-02-04 01:22:33 +0000 |
| commit | 8553dd7e5048a26fcc17b993da84d48f7dd4df70 (patch) | |
| tree | 303de7c30a39f4c66e6460ca4f2c91fb64284dba /contrib/patch-xvidcore-nasm-2.00-configure.patch | |
| parent | 0487754e31c2085ea19d2bcc83631149028ec48e (diff) | |
Add patches to the xvid and mpeg4ip configure scripts for nasm 2.00.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1248 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/patch-xvidcore-nasm-2.00-configure.patch')
| -rw-r--r-- | contrib/patch-xvidcore-nasm-2.00-configure.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/patch-xvidcore-nasm-2.00-configure.patch b/contrib/patch-xvidcore-nasm-2.00-configure.patch new file mode 100644 index 000000000..b810eae7b --- /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 |