mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 03:30:32 -04:00
f3c231d641
- switches opencascade to vtk9 to enable upcoming import of
cad/py-ocp
- cad/freecad has to switch vtk8 -> vtk9, too
- this requires upstream commit 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25
"Make smesh compile with vtk9"
- while touching this, fixes vtk module detection
- clean up VTK_DIR usage: that variable does not exist in FreeCAD's
build system anymore (for quite some time, actually)
Obtained from: opencascade upstream: Kirill Gavrilov
Obtained from: freecad upstream: committed by github/wwmayer
Differential Revision: D30934
Reported by: thierry@
Submitted by: thierry@
16 lines
413 B
C++
16 lines
413 B
C++
--- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig 2020-11-03 14:50:01 UTC
|
|
+++ src/IVtkDraw/IVtkDraw_Interactor.cxx
|
|
@@ -20,6 +20,13 @@
|
|
#include <vtkWin32OpenGLRenderWindow.h>
|
|
#else
|
|
#include <GL/glx.h>
|
|
+
|
|
+// Preventing naming collisions between
|
|
+// GLX and VTK versions 9.0 and above
|
|
+#ifdef AllValues
|
|
+#undef AllValues
|
|
+#endif
|
|
+
|
|
#include <vtkXRenderWindowInteractor.h>
|
|
#include <vtkXOpenGLRenderWindow.h>
|
|
#endif
|