[pkgsrc/trunk]: pkgsrc/graphics/aqsis Fix some 64-bit issues. Package still d...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7f3900597c3
branches:  trunk
changeset: 546432:c7f3900597c3
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Sep 01 08:02:23 2008 +0000

description:
Fix some 64-bit issues. Package still doesn't build; there's a problem with
a template function that either means the thing never built at all or that
some incomprehensible C++ thing is going on, and I'm not sure which it is.

diffstat:

 graphics/aqsis/distinfo         |   5 +++-
 graphics/aqsis/patches/patch-ao |  13 ++++++++++
 graphics/aqsis/patches/patch-ap |  49 +++++++++++++++++++++++++++++++++++++++++
 graphics/aqsis/patches/patch-aq |  24 ++++++++++++++++++++
 4 files changed, 90 insertions(+), 1 deletions(-)

diffs (114 lines):

diff -r 2baa344c3ad1 -r c7f3900597c3 graphics/aqsis/distinfo
--- a/graphics/aqsis/distinfo   Mon Sep 01 06:59:15 2008 +0000
+++ b/graphics/aqsis/distinfo   Mon Sep 01 08:02:23 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/05/11 19:00:26 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/09/01 08:02:23 dholland Exp $
 
 SHA1 (aqsis-0.6.4.tar.gz) = 7a8e10db5502907840d8d2f4269eb3b489875dd4
 RMD160 (aqsis-0.6.4.tar.gz) = d2b034e05d47e31aa040471be37b34750154e6e5
@@ -17,3 +17,6 @@
 SHA1 (patch-al) = 3f721b5a28714c7ed601aace984096ef142c105b
 SHA1 (patch-am) = 8227295b85018e5294ab1c8ca5c415dbe0371282
 SHA1 (patch-an) = 2a0dead7923ce600b70577f9f476bc0bab527131
+SHA1 (patch-ao) = 8776ff34346420d34a0ccfa1f952815c7a0328b8
+SHA1 (patch-ap) = b8659e4027114c1f1ecd0e8ab9d9c4eed61575a1
+SHA1 (patch-aq) = e4e2aef5e57f58e2f5f02d00277084c73ce4fe74
diff -r 2baa344c3ad1 -r c7f3900597c3 graphics/aqsis/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/aqsis/patches/patch-ao   Mon Sep 01 08:02:23 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/09/01 08:02:23 dholland Exp $
+
+--- filebuffer/filebuffer.cpp~ 2002-05-21 06:47:26.000000000 -0400
++++ filebuffer/filebuffer.cpp  2008-09-01 03:28:56.000000000 -0400
+@@ -171,7 +171,7 @@ TqInt Close( SOCKET s, SqDDMessageBase* 
+ #else
+               sprintf( version, "%s %s", STRNAME, VERSION );
+ #endif
+-              TIFFSetField( pOut, TIFFTAG_SOFTWARE, ( uint32 ) version );
++              TIFFSetField( pOut, TIFFTAG_SOFTWARE, version );
+               TIFFSetField( pOut, TIFFTAG_IMAGEWIDTH, ( uint32 ) XRes );
+               TIFFSetField( pOut, TIFFTAG_IMAGELENGTH, ( uint32 ) YRes );
+               TIFFSetField( pOut, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT );
diff -r 2baa344c3ad1 -r c7f3900597c3 graphics/aqsis/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/aqsis/patches/patch-ap   Mon Sep 01 08:02:23 2008 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-ap,v 1.1 2008/09/01 08:02:23 dholland Exp $
+
+--- render/texturemap.cpp.orig 2002-05-21 08:20:02.000000000 -0400
++++ render/texturemap.cpp      2008-09-01 03:39:36.000000000 -0400
+@@ -1840,7 +1840,7 @@ void CqShadowMap::SaveShadowMap( const C
+ #else
+                       sprintf( version, "%s %s", STRNAME, VERSION );
+ #endif
+-                      TIFFSetField( pshadow, TIFFTAG_SOFTWARE, ( uint32 ) version );
++                      TIFFSetField( pshadow, TIFFTAG_SOFTWARE, version );
+                       TIFFSetField( pshadow, TIFFTAG_PIXAR_MATRIX_WORLDTOCAMERA, matWorldToCamera );
+                       TIFFSetField( pshadow, TIFFTAG_PIXAR_MATRIX_WORLDTOSCREEN, matWorldToScreen );
+                       TIFFSetField( pshadow, TIFFTAG_PIXAR_TEXTUREFORMAT, SHADOWMAP_HEADER );
+@@ -1900,7 +1900,7 @@ void CqTextureMap::WriteTileImage( TIFF*
+ #else
+       sprintf( version, "%s %s", STRNAME, VERSION );
+ #endif
+-      TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version );
++      TIFFSetField( ptex, TIFFTAG_SOFTWARE, version );
+       TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width );
+       TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length );
+       TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG );
+@@ -1963,7 +1963,7 @@ void CqTextureMap::WriteImage( TIFF* pte
+ #else
+       sprintf( version, "%s %s", STRNAME, VERSION );
+ #endif
+-      TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version );
++      TIFFSetField( ptex, TIFFTAG_SOFTWARE, version );
+       TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width );
+       TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length );
+       TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG );
+@@ -1996,7 +1996,7 @@ void CqTextureMap::WriteTileImage( TIFF*
+ #else
+       sprintf( version, "%s %s", STRNAME, VERSION );
+ #endif
+-      TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version );
++      TIFFSetField( ptex, TIFFTAG_SOFTWARE, version );
+       TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width );
+       TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length );
+       TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG );
+@@ -2059,7 +2059,7 @@ void CqTextureMap::WriteImage( TIFF* pte
+ #else
+       sprintf( version, "%s %s", STRNAME, VERSION );
+ #endif
+-      TIFFSetField( ptex, TIFFTAG_SOFTWARE, ( uint32 ) version );
++      TIFFSetField( ptex, TIFFTAG_SOFTWARE, version );
+       TIFFSetField( ptex, TIFFTAG_IMAGEWIDTH, width );
+       TIFFSetField( ptex, TIFFTAG_IMAGELENGTH, length );
+       TIFFSetField( ptex, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG );
diff -r 2baa344c3ad1 -r c7f3900597c3 graphics/aqsis/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/aqsis/patches/patch-aq   Mon Sep 01 08:02:23 2008 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-aq,v 1.1 2008/09/01 08:02:23 dholland Exp $
+
+--- libri2rib/ascii.cpp~       2002-03-01 13:58:59.000000000 -0500
++++ libri2rib/ascii.cpp        2008-09-01 03:45:14.000000000 -0400
+@@ -246,7 +246,8 @@ RtVoid CqASCII::RiObjectEnd( RtVoid )
+ }
+ RtVoid CqASCII::RiObjectInstance( RtObjectHandle handle )
+ {
+-      out << "ObjectInstance " << ( RtInt ) handle << endl;
++      //out << "ObjectInstance " << ( RtInt ) handle << endl;
++      out << "ObjectInstance " << ( intptr_t ) handle << endl;
+ }
+ RtVoid CqASCII::RiAttributeBegin( RtVoid )
+ {
+@@ -461,7 +462,8 @@ RtLightHandle CqASCII::RiAreaLightSource
+ RtVoid CqASCII::RiIlluminate( RtLightHandle light, RtBoolean onoff )
+ {
+       out << "Illuminate ";
+-      out << ( RtInt ) light << " ";
++      //out << ( RtInt ) light << " ";
++      out << ( intptr_t ) light << " ";
+       if ( onoff == RI_TRUE )
+               out << "1" << endl;
+       else