From 3f7664904aee9fa13504b52729e698aab96f320b Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 14 May 2020 19:28:08 +0000 Subject: Don't define bool and friends. Fixes magic compile errors. --- graphics/vtk/distinfo | 3 ++- graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h (limited to 'graphics/vtk') diff --git a/graphics/vtk/distinfo b/graphics/vtk/distinfo index 763ced69625..d6233bd1883 100644 --- a/graphics/vtk/distinfo +++ b/graphics/vtk/distinfo @@ -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 diff --git a/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h b/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h new file mode 100644 index 00000000000..74fd189f755 --- /dev/null +++ b/graphics/vtk/patches/patch-Utilities_ftgl_src_FTGL.h @@ -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 + +-#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 -- cgit v1.2.3