diff options
| author | sr55 <[email protected]> | 2008-03-22 00:39:29 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-03-22 00:39:29 +0000 |
| commit | d4dbb3abde3d18a5f0ca4d4c40f71a3199f0ddc5 (patch) | |
| tree | 52d1aa8696dc5105edbba7f189c3efd55f4126ff /contrib | |
| parent | ecc54675dddb56825215ce0c11358f81fc72f660 (diff) | |
xvid:
- Updates the xvid nasm patch so that xvid correctly uses CPU optimizations under cygwin.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1355 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/patch-xvidcore-nasm-2.00-configure.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/contrib/patch-xvidcore-nasm-2.00-configure.patch b/contrib/patch-xvidcore-nasm-2.00-configure.patch index b810eae7b..b28057482 100644 --- a/contrib/patch-xvidcore-nasm-2.00-configure.patch +++ b/contrib/patch-xvidcore-nasm-2.00-configure.patch @@ -1,12 +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 - 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
|