community/vtk to 9.1.0-2

community/vtk/PKGBUILD

@@ -14,7 +14,7 @@
 
 pkgname=vtk
 pkgver=9.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Software system for 3D computer graphics, image processing, and visualization"
 arch=(x86_64)
 url="https://www.vtk.org/"
@@ -58,9 +58,11 @@ optdepends=('gnuplot: plotting tools'
             proj
             sqlite
             unixodbc)
-source=(${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz)
+source=(${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz
+        vtk-tbb-export.patch::https://gitlab.kitware.com/vtk/vtk-m/-/commit/3be3529f.patch)
 options=(staticlibs)
-sha256sums=('8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96')
+sha256sums=('8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96'
+            '883ce14c48c46ac8343afe3950e468021a4913352b40f32c22970665c9a669fc')
 
 prepare() {
   cd VTK-${pkgver}
@@ -68,6 +70,8 @@ prepare() {
   sed -i "s|2.4.0|2.3.0|" ThirdParty/libharu/CMakeLists.txt
   # We have a patched fmt
   sed -i "s|8.1.0|8.0.1|" ThirdParty/fmt/CMakeLists.txt
+  # Namespace the exported tbb target to fix conflicts
+  patch -d ThirdParty/vtkm/vtkvtkm/vtk-m -p1 -i "$srcdir"/vtk-tbb-export.patch
   # explicitly link with libatomic
   if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then
     echo "vtk_module_link(VTK::CommonDataModel PUBLIC atomic)" >> Common/DataModel/CMakeLists.txt