[patch] Patch for mpeg4ip-1.5.0.1

nasm.patch (text/plain), 1.66 KB, created by Veit Nachtmann on 2008-01-20 17:39:00 UTC

diff -rup mpeg4ip-1.5.0.1.orig/configure mpeg4ip-1.5.0.1/configure
--- mpeg4ip-1.5.0.1.orig/configure      2008-01-20 18:24:33.000000000 +0100
+++ mpeg4ip-1.5.0.1/configure   2008-01-20 18:24:47.000000000 +0100
@@ -28881,7 +28881,7 @@ fi
    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 -v | tr '.' ' '`
         BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg`
        if test x$BILLSNASM_ret = x"yes"; then
           USENASM=true
diff -rup mpeg4ip-1.5.0.1.orig/configure.in mpeg4ip-1.5.0.1/configure.in
--- mpeg4ip-1.5.0.1.orig/configure.in   2008-01-20 18:24:32.000000000 +0100
+++ mpeg4ip-1.5.0.1/configure.in        2008-01-20 18:24:57.000000000 +0100
@@ -682,7 +682,7 @@ if test x$enable_mmx = xyes; then

    if test x$USENASM = xtrue; then
        AC_MSG_CHECKING(nasm version...)
-       BILLSNASM_arg=`nasm -r | tr '.' ' '`
+       BILLSNASM_arg=`nasm -v | tr '.' ' '`
         BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg`
        if test x$BILLSNASM_ret = x"yes"; then
           USENASM=true
diff -rup mpeg4ip-1.5.0.1.orig/util/testlame.sh mpeg4ip-1.5.0.1/util/testlame.sh
--- mpeg4ip-1.5.0.1.orig/util/testlame.sh       2008-01-20 18:24:33.000000000 +0100
+++ mpeg4ip-1.5.0.1/util/testlame.sh    2008-01-20 18:25:29.000000000 +0100
@@ -1,6 +1,6 @@
 #
 # shell to verify nasm version
-# nasm -r has format "NASM version <foo> <extra stuff>"
+# nasm -v has format "NASM version <foo> <extra stuff>"
 #
 # This shell looks for version, then sees if we're 0.98.19 or greater
 #