math/vtk9: Update 9.0.3 -> 9.1.0

10 files changed, 19 insertions, 83 deletions

diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile
index 01b67ff811e3..c0edf4fbca85 100644
--- a/cad/freecad/Makefile
+++ b/cad/freecad/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	FreeCAD
 DISTVERSION=	0.19.2
-PORTREVISION=	3
+PORTREVISION=	4
 # use these for bugfixes/snapshots
 # DISTVERSION=	0.18-16093 # git rev-list --count
 # DISTVERSIONSUFFIX=	-g690774c0e
@@ -45,7 +45,7 @@ USE_QT=		buildtools concurrent core gui network opengl printsupport \
 		qmake_build svg webkit widgets xml xmlpatterns
 USE_LDCONFIG=	yes
 
-VTK_VER=	9.0
+VTK_VER=	9.1
 
 DOS2UNIX_GLOB=	*.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL
 
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 6dff3738c641..9c97b62d47ea 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	opencascade
 PORTVERSION=	7.6.0
+PORTREVISION=	1
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
@@ -40,7 +41,7 @@ SHEBANG_FILES=	adm/templates/*.sh	\
 		gendoc
 ENVSH=		adm/templates/env.sh
 
-VTKVER=		9.0
+VTKVER=		9.1
 
 OPTIONS_DEFINE=	DOCS DOXYGEN FFMPEG VIS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl)
diff --git a/graphics/mirtk/Makefile b/graphics/mirtk/Makefile
index 577172ff1fe4..c5885d5c2bbe 100644
--- a/graphics/mirtk/Makefile
+++ b/graphics/mirtk/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mirtk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-122
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-g38210fa
 CATEGORIES=	graphics
 
@@ -30,7 +30,7 @@ TBB_BROKEN=		Not oneTBB-compatible,see https://github.com/BioMedIA/MIRTK/issues/
 
 VTK_DESC=		Build with the VTK toolkit
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.0.so:math/vtk9 \
+VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9 \
 			libexpat.so:textproc/expat2
 
 .include <bsd.port.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 3b2abb2d3cc2..1d6d55cca4cd 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opencv
 DISTVERSION=	4.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/opencv/opencv/commit/
@@ -114,7 +114,7 @@ TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
 VTK_CMAKE_BOOL=		WITH_VTK
-VTK_LIB_DEPENDS=	libvtkCommonCore-9.0.so:math/vtk9
+VTK_LIB_DEPENDS=	libvtkCommonCore-9.1.so:math/vtk9
 ###
 
 # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile
index b45191df8c3d..ebab4bae192f 100644
--- a/graphics/py-mayavi/Makefile
+++ b/graphics/py-mayavi/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mayavi
 DISTVERSION=	4.7.3
+PORTREVISION=	1
 CATEGORIES=	graphics science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile
index 78e234e7caef..e1b8383b27f4 100644
--- a/math/vtk9/Makefile
+++ b/math/vtk9/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vtk
-DISTVERSION=	9.0.3
-PORTREVISION=	1
+DISTVERSION=	9.1.0
 CATEGORIES=	math graphics
 MASTER_SITES=	https://vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	9
@@ -18,7 +17,7 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 
 USES=		alias cmake compiler:c++11-lang gl jpeg localbase xorg
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
-USE_XORG=	ice x11 xt xext sm
+USE_XORG=	ice x11 xt xext sm xcursor xfixes xrender
 
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		VTK_INSTALL_NO_DOCUMENTATION VTK_USE_SYSTEM_EXPAT VTK_USE_SYSTEM_TIFF \
@@ -29,6 +28,8 @@ CMAKE_ARGS=	-DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \
 		-DVTK_INSTALL_QT_DIR=/${QT_LIBDIR_REL}/plugins/designer \
 		-DSTAGEDIR=${STAGEDIR}
 
+CFLAGS+=	-Du_int=unsigned # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259975
+
 VTK_SHORT_VER=	${PORTVERSION:R}
 
 DOCSDIR=	${PREFIX}/share/doc/vtk-${VTK_SHORT_VER}
@@ -63,7 +64,7 @@ PYTHON_CMAKE_ON=	-DVTK_PYTHON_VERSION=${PYTHON_MAJOR_VER}
 PYTHON_VARS=		SUB_FILES=PKG-INFO SUB_LIST=PORTVERSION=${PORTVERSION}
 
 QT5_USES=		qt:5
-QT5_USE=		QT=core,gui,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build
+QT5_USE=		QT=core,declarative,gui,network,opengl,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build
 QT5_CMAKE_ON=		-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 \
 			-DVTK_GROUP_ENABLE_Qt:STRING=YES \
 			-DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES
diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo
index 0754c728341d..cfc8330ff50a 100644
--- a/math/vtk9/distinfo
+++ b/math/vtk9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629311941
-SHA256 (VTK-9.0.3.tar.gz) = bc3eb9625b2b8dbfecb6052a2ab091fc91405de4333b0ec68f3323815154ed8a
-SIZE (VTK-9.0.3.tar.gz) = 34684378
+TIMESTAMP = 1637434253
+SHA256 (VTK-9.1.0.tar.gz) = 8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96
+SIZE (VTK-9.1.0.tar.gz) = 47871165
diff --git a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.cxx b/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.cxx
deleted file mode 100644
index b3870218a2f8..000000000000
--- a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
---- Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx.orig	2020-06-26 13:24:40 UTC
-+++ Rendering/OpenGL2/vtkXOpenGLRenderWindow.cxx
-@@ -61,10 +61,22 @@ typedef ptrdiff_t GLsizeiptr;
- 
- #include <sstream>
- 
-+// Patch from upstream b3b088e8
-+#include <X11/Xatom.h>
-+#include <X11/cursorfont.h>
-+
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
--#include <X11/cursorfont.h>
- 
-+/*
-+ * Work-around to get forward declarations of C typedef of anonymous
-+ * structs working. We do not want to include XUtil.h in the header as
-+ * it populates the global namespace.
-+ */
-+struct vtkXVisualInfo : public XVisualInfo
-+{
-+};
-+
- #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
- #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
- typedef GLXContext (*glXCreateContextAttribsARBProc)(
-@@ -224,7 +236,7 @@ int XEventTypeEquals(Display*, XEvent* event, XPointer
-   return event->type == EventType;
- }
- 
--XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo()
-+vtkXVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualInfo()
- {
-   XVisualInfo* v = nullptr;
- 
-@@ -258,7 +270,7 @@ XVisualInfo* vtkXOpenGLRenderWindow::GetDesiredVisualI
-       vtkErrorMacro(<< "Could not find a decent visual\n");
-     }
-   }
--  return (v);
-+  return reinterpret_cast<vtkXVisualInfo*>(v);
- }
- 
- vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow()
diff --git a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.h b/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.h
deleted file mode 100644
index 59457634d2ba..000000000000
--- a/math/vtk9/files/patch-Rendering_OpenGL2_vtkXOpenGLRenderWindow.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- Rendering/OpenGL2/vtkXOpenGLRenderWindow.h.orig	2020-06-26 13:24:40 UTC
-+++ Rendering/OpenGL2/vtkXOpenGLRenderWindow.h
-@@ -28,11 +28,11 @@
- #include "vtkOpenGLRenderWindow.h"
- #include "vtkRenderingOpenGL2Module.h" // For export macro
- #include <X11/Xlib.h>                  // Needed for X types used in the public interface
--#include <X11/Xutil.h>                 // Needed for X types used in the public interface
- #include <stack>                       // for ivar
- 
- class vtkIdList;
- class vtkXOpenGLRenderWindowInternal;
-+struct vtkXVisualInfo;
- 
- class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderWindow
- {
-@@ -112,7 +112,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkXOpenGLRenderWindo
-    */
-   virtual Colormap GetDesiredColormap();
-   virtual Visual* GetDesiredVisual();
--  virtual XVisualInfo* GetDesiredVisualInfo();
-+  virtual vtkXVisualInfo* GetDesiredVisualInfo();
-   virtual int GetDesiredDepth();
-   //@}
- 
diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
index e3911bb4dafc..ca7a1c9c605f 100644
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	elmerfem
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
@@ -59,7 +60,7 @@ OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 			libpython${_PYVERSION}.so:lang/python${PYTHON_SUFFIX} \
 			libtiff.so:graphics/tiff \
 			libTKernel.so:cad/opencascade \
-			libvtksys-9.0.so:math/vtk9
+			libvtksys-9.1.so:math/vtk9
 OCC_USES=		python
 OCC_CMAKE_BOOL=		WITH_OCC
 OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.0