[Sumover-dev] [svn commit] r4053 - in vic/branches/mpeg4: render video

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Mon Jun  4 10:53:21 2007
New Revision: 4053

Modified:
   vic/branches/mpeg4/configure
   vic/branches/mpeg4/configure.in
   vic/branches/mpeg4/configure.in.x11
   vic/branches/mpeg4/render/ppm.cpp
   vic/branches/mpeg4/video/grabber-v4l2.cpp

Log:
Applied patch from Doug Kosovic (vic-20070531svn-x86_64.patch 03-Jun-2007 23:49) for 64-bit issues (thanks!):
- configure/configure.in now works on x86-64 Fedora 7
- add lib64 X11R6 dirs to configure.in.x11
- changed int to long in a few debug messages due to precision loss syntax errors
- updated configure by re-running autoconf



Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Mon Jun  4 10:53:21 2007
@@ -1776,14 +1776,7 @@
     V_ARCH="ARCH_X86"
   ;;
   x86_64|amd64)
-    arch="x86_32"
-    ${cc:=gcc}
-    canon_arch="`$cc -dumpmachine | sed -e 's,\(^-*\)-.*,\1,'`"
-    if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
-      if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-	V_ARCH="ARCH_X86_64"
-      fi
-    fi
+    V_ARCH="ARCH_X86_64"
   ;;
   "Power Macintosh"|ppc|ppc64|powerpc)
     V_ARCH="ARCH_PPC"
@@ -4315,6 +4308,8 @@
 
 xlibdirs="\
 	/usr/openwin/lib \
+	/usr/X11R6/lib64 \
+	/usr/lib64/X11R6 \
 	/usr/X11R6/lib \
 	/usr/lib/X11R6 \
 	/usr/X11R5/lib \

Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Mon Jun  4 10:53:21 2007
@@ -19,14 +19,7 @@
     V_ARCH="ARCH_X86"
   ;;
   x86_64|amd64)
-    arch="x86_32"
-    ${cc:=gcc}
-    canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
-    if @<:@ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" @:>@; then
-      if @<:@ -z "`echo $CFLAGS | grep -- -m32`"  @:>@; then
-	V_ARCH="ARCH_X86_64"
-      fi
-    fi
+    V_ARCH="ARCH_X86_64"
   ;;
   "Power Macintosh"|ppc|ppc64|powerpc)
     V_ARCH="ARCH_PPC"

Modified: vic/branches/mpeg4/configure.in.x11
==============================================================================
--- vic/branches/mpeg4/configure.in.x11	(original)
+++ vic/branches/mpeg4/configure.in.x11	Mon Jun  4 10:53:21 2007
@@ -3,6 +3,8 @@
 
 xlibdirs="\
 	/usr/openwin/lib \
+	/usr/X11R6/lib64 \
+	/usr/lib64/X11R6 \
 	/usr/X11R6/lib \
 	/usr/lib/X11R6 \
 	/usr/X11R5/lib \

Modified: vic/branches/mpeg4/render/ppm.cpp
==============================================================================
--- vic/branches/mpeg4/render/ppm.cpp	(original)
+++ vic/branches/mpeg4/render/ppm.cpp	Mon Jun  4 10:53:21 2007
@@ -120,7 +120,7 @@
 				tcl.result("1");
 			}
 			if (dump(Ch) < 0) {
-				sprintf(TCLresult, "ppm.cpp: Can't dump overlay image file %s into channel %d\n", (char*)argv[2], (int)Ch);
+				sprintf(TCLresult, "ppm.cpp: Can't dump overlay image file %s into channel %l\n", (char*)argv[2], (long)Ch);
 				tcl.result(TCLresult);
 				return (TCL_ERROR);
 			} else {

Modified: vic/branches/mpeg4/video/grabber-v4l2.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-v4l2.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-v4l2.cpp	Mon Jun  4 10:53:21 2007
@@ -598,10 +598,10 @@
                                 }
                                 vimage[i].data = (typeof(vimage[0].data)) mmap(0,  vimage[i].vidbuf.length, PROT_READ|PROT_WRITE, MAP_SHARED, fd_, vimage[i].vidbuf.m.offset);
 
-                                if ((int)vimage[i].data == -1) {
-                                        debug_msg("v4l2: mmap() returned error %d\n", errno);
+                                if ((long)vimage[i].data == -1) {
+                                        debug_msg("v4l2: mmap() returned error %l\n", errno);
                                         return;
-                                } else debug_msg("v4l2: mmap()'ed buffer at 0x%x (%d bytes)\n", (int)vimage[i].data, vimage[i].vidbuf.length);
+                                } else debug_msg("v4l2: mmap()'ed buffer at 0x%x (%d bytes)\n", (long)vimage[i].data, vimage[i].vidbuf.length);
                         }
 
                         for (i = 0; i < (int)req.count; ++i)