Date: Tuesday, November 9, 2021 @ 18:56:29 Author: arojas Revision: 1039401
Fix cmake target name collision Modified: vtk/trunk/PKGBUILD ----------+ PKGBUILD | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-09 18:44:22 UTC (rev 1039400) +++ PKGBUILD 2021-11-09 18:56:29 UTC (rev 1039401) @@ -7,7 +7,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/"; @@ -54,9 +54,11 @@ 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} @@ -64,6 +66,8 @@ 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 } build() {
