From: jbrjake Date: Mon, 19 May 2008 03:26:43 +0000 (+0000) Subject: Windows line endings begone! X-Git-Tag: 0.9.3~479 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebd11b3e862751dd90e5110a8624d942e62b0c96;p=handbrake Windows line endings begone! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1465 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/contrib/patch-xvidcore-nasm-2.00-configure.patch b/contrib/patch-xvidcore-nasm-2.00-configure.patch index b28057482..44242ace4 100644 --- a/contrib/patch-xvidcore-nasm-2.00-configure.patch +++ b/contrib/patch-xvidcore-nasm-2.00-configure.patch @@ -1,13 +1,13 @@ -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 -+ nasm_patch=45 - fi +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 ++ nasm_patch=45 + fi