[arch-commits] Commit in opencascade/trunk (PKGBUILD vtk9.patch)

[Antonio Rojas]

    Date: Wednesday, October 20, 2021 @ 19:54:20
  Author: arojas
Revision: 1031453

vtk 9 rebuild

Added:
  opencascade/trunk/vtk9.patch
Modified:
  opencascade/trunk/PKGBUILD

------------+
 PKGBUILD   |   23 +++++++++++++++--------
 vtk9.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-20 19:23:46 UTC (rev 1031452)
+++ PKGBUILD	2021-10-20 19:54:20 UTC (rev 1031453)
@@ -6,29 +6,34 @@
 # Contributor: Michele Mocciola <mickele>
 
 pkgname=opencascade
-pkgver=7.5.0
-_pkgver=V7_5_0
+pkgver=7.5.3
+_pkgver=V7_5_3
 #_pkgver=${pkgver//_/}
 #_pkgver=V${_pkgver//./_}
-pkgrel=3
+pkgrel=1
 pkgdesc="Open CASCADE Technology, 3D modeling & numerical simulation"
 arch=('x86_64')
 url="https://www.opencascade.org"
 license=('custom')
 depends=('tk' 'vtk' 'gl2ps' 'ffmpeg' 'freeimage' 'intel-tbb')
-makedepends=('cmake' 'qt5-base' 'rapidjson') # VTK requires Qt5 to build
+makedepends=('cmake' 'qt5-base' 'rapidjson' 'eigen' 'utf8cpp' 'python' 'pugixml' 'glew'
+             'adios2' 'gdal' 'proj' 'boost' 'liblas' 'pdal' 'libharu' 'unixodbc'
+             'python-mpi4py' 'openvr') # VTK requires these to build
 source=("opencascade-${pkgver}.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_pkgver};sf=tgz"
         'opencascade.sh' 'fix-install-dir-references.patch'
-        'cmake-fix-variable.patch')
-sha256sums=('c8df7d23051b86064f61299a5f7af30004c115bdb479df471711bab0c7166654'
+        'cmake-fix-variable.patch'
+        'vtk9.patch')
+sha256sums=('cc3d3fd9f76526502c3d9025b651f45b034187430f231414c97dda756572410b'
             '2064536a85d46fee368a8f1a712b2c6c77ca79c5bffcc68cba79d70d36efa2f4'
             'afb584aa453993ae8d9e2b983594558531ede735a5892754b812be30650c9fb5'
-            'c7427082400b2d1ac58c59549d4dd1ee5b27d06847b7907842e9e2f2b68980fa')
+            'c7427082400b2d1ac58c59549d4dd1ee5b27d06847b7907842e9e2f2b68980fa'
+            'ae24da8eac8b57af8f612c872c8ec1962b6e5243758aa39c92e805223fdfe157')
 
 prepare() {
   cd "occt-${_pkgver}"
   patch -Np1 -i "$srcdir/fix-install-dir-references.patch"
   patch -Np1 -i "$srcdir/cmake-fix-variable.patch"
+  patch -p1 -i ../vtk9.patch # Fix build with VTK 9 https://gitlab.kitware.com/vtk/vtk/-/issues/18240
 }
 
 build() {
@@ -44,7 +49,9 @@
     -DUSE_FFMPEG=ON \
     -DUSE_VTK=ON \
     -DUSE_RAPIDJSON=ON \
-    -DUSE_TBB=ON
+    -DUSE_TBB=ON \
+    -DOpenVR_INCLUDE_DIR=/usr/include/openvr/ \
+    -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk
 
   make
 }

Added: vtk9.patch
===================================================================
--- vtk9.patch	                        (rev 0)
+++ vtk9.patch	2021-10-20 19:54:20 UTC (rev 1031453)
@@ -0,0 +1,37 @@
+diff --git a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
+index 9e8a4e028a..8491febece 100644
+--- a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
++++ b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
+@@ -23,6 +23,7 @@
+ 
+ // prevent disabling some MSVC warning messages by VTK headers 
+ #include <Standard_WarningsDisable.hxx>
++#undef AllValues
+ #include <vtkActor.h>
+ #include <vtkPolyData.h>
+ #include <vtkPolyDataMapper.h>
+diff --git a/src/IVtkVTK/IVtkVTK_ShapeData.hxx b/src/IVtkVTK/IVtkVTK_ShapeData.hxx
+index 0fda1748ab..3ca3a8eeb9 100644
+--- a/src/IVtkVTK/IVtkVTK_ShapeData.hxx
++++ b/src/IVtkVTK/IVtkVTK_ShapeData.hxx
+@@ -23,6 +23,7 @@
+ #include <vtkPolyData.h>
+ #include <vtkSmartPointer.h>
+ #include <vtkIdTypeArray.h>
++#include <vtkVersion.h>
+ #include <Standard_WarningsRestore.hxx>
+ 
+ class vtkIdTypeArray;
+diff --git a/src/InterfaceGraphic/InterfaceGraphic.hxx b/src/InterfaceGraphic/InterfaceGraphic.hxx
+index c533f68cd5..6410892618 100644
+--- a/src/InterfaceGraphic/InterfaceGraphic.hxx
++++ b/src/InterfaceGraphic/InterfaceGraphic.hxx
+@@ -40,6 +40,8 @@
+ #include <X11/Xatom.h>
+ #include <GL/glx.h>
+ 
++#undef AllValues
++
+ #endif
+ 
+ #endif // __INTERFACE_GRAPHIC_HXX