CVS commit: pkgsrc/graphics/vtk

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu May 14 19:28:08 UTC 2020

Modified Files:
        pkgsrc/graphics/vtk: distinfo
Added Files:
        pkgsrc/graphics/vtk/patches: patch-Utilities_ftgl_src_FTGL.h

Log Message:
Don't define bool and friends. Fixes magic compile errors.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/vtk/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/vtk/distinfo
diff -u pkgsrc/graphics/vtk/distinfo:1.8 pkgsrc/graphics/vtk/distinfo:1.9
--- pkgsrc/graphics/vtk/distinfo:1.8    Tue Nov  3 21:34:34 2015
+++ pkgsrc/graphics/vtk/distinfo        Thu May 14 19:28:08 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 21:34:34 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/05/14 19:28:08 joerg Exp $
 
 SHA1 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 31ab01c16b3d44ce201d8180af431833cf6527d8
 RMD160 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 71a092cf929cfaeeb8f297334cadb829209b9ad7
 SHA512 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = f4c4ef36046ae17733ebca142f2182f9f091a891de7b3de878ff5637d50567dc924ed04de1f9261605ca5969c9a04dd561bf379ac8ce8e7c4f1ac98f39983bc3
 Size (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 6073644 bytes
+SHA1 (patch-Utilities_ftgl_src_FTGL.h) = ba6ccc0e543b78e01ddf39ba294e60192e77c959
 SHA1 (patch-aa) = dbda07f15a60a0e66ce50e50addcf85d4c2b840c
 SHA1 (patch-ab) = 83d063aaf1924daff17a45fb92316743fbb448f3
 SHA1 (patch-ac) = 59977568e92ba01344447c0c0b1c770d26e460bb

Added files:

Index: pkgsrc/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h
diff -u /dev/null pkgsrc/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h:1.1
--- /dev/null   Thu May 14 19:28:08 2020
+++ pkgsrc/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h Thu May 14 19:28:08 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-Utilities_ftgl_src_FTGL.h,v 1.1 2020/05/14 19:28:08 joerg Exp $
+
+--- Utilities/ftgl/src/FTGL.h.orig     2020-05-11 14:34:47.522471411 +0000
++++ Utilities/ftgl/src/FTGL.h
+@@ -32,15 +32,6 @@ struct FTGLRenderContext
+     #define  WIN32_LEAN_AND_MEAN
+     #include <windows.h>
+ 
+-#else
+-
+-// Some sgi compilers do not define true, false and bool
+-#ifndef false
+-#define false 0
+-#define true 1
+-#define bool char
+-#endif
+-
+ #endif
+ 
+ // Compiler-specific conditional compilation