[arch-commits] Commit in vtk/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Friday, July 1, 2022 @ 15:55:36
  Author: archange
Revision: 1243210

proj 9/gdal 3.5 rebuild

Also backport python 3.10 fixes (FS#74455)
And bytecompile python libs

Modified:
  vtk/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-01 15:50:55 UTC (rev 1243209)
+++ PKGBUILD	2022-07-01 15:55:36 UTC (rev 1243210)
@@ -7,7 +7,7 @@
 
 pkgname=vtk
 pkgver=9.1.0
-pkgrel=18
+pkgrel=19
 pkgdesc="Software system for 3D computer graphics, image processing, and visualization"
 arch=(x86_64)
 url="https://www.vtk.org/"
@@ -14,9 +14,9 @@
 license=(BSD)
 depends=(gcc-libs double-conversion pugixml tbb)
 makedepends=(adios2 cmake boost doxygen ffmpeg gdal git gnuplot java-environment=11
-             liblas libxt openimagedenoise openmp openmpi openvdb openvr ospray pdal
-             postgresql python-matplotlib qt5-base qt5-tools qt5-webkit
-             qt5-x11extras tk unixodbc wget
+             liblas libxt mariadb-libs openimagedenoise openmp openmpi openvdb
+             openvr ospray pdal postgresql-libs python-matplotlib qt5-base
+             qt5-tools qt5-webkit qt5-x11extras tk unixodbc wget
              cgns cli11 eigen expat fmt freetype2 gl2ps glew hdf5 libjpeg
              jsoncpp libjsoncpp.so libharu proj libxml2 lz4 xz python-mpi4py
              netcdf libogg libpng rapidjson sqlite libtheora libtiff utf8cpp zfp zlib)
@@ -57,11 +57,15 @@
             unixodbc)
 source=(${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz
         vtkm-tbb-2021.patch::https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2509.patch
-        vtk-ffmpeg5.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8863.patch)
+        vtk-ffmpeg5.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8863.patch
+        vtk-python3.10.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8738.patch
+        vtk-exodus-netcdf4.9-compat.patch::https://github.com/sandialabs/seacas/commit/5e1b19181110c52b76d13e3f60da2c8cf678c941.patch)
 options=(staticlibs)
 sha256sums=('8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96'
             '37cff664c4eaacf44ecb995e62e9e54e54880bae0857d598c74660a2159ccb2e'
-            '955ef22d2541beb9935557ef09a802b6504855a350f27ff056734679da8f0281')
+            '955ef22d2541beb9935557ef09a802b6504855a350f27ff056734679da8f0281'
+            'dbc9a67caf548cf5afd571018d91aadcfcf78ddf8c66ac75b0772935e26ad29f'
+            '1272fafccd3d9677f3fd9cc0a70e47a21f6ec86379765e25c6bccd9053875259')
 
 prepare() {
   cd VTK-${pkgver}
@@ -73,6 +77,11 @@
   patch -p1 -d ThirdParty/vtkm/vtkvtkm/vtk-m < ../vtkm-tbb-2021.patch
   # Fix build with FFmpeg 5
   patch -p1 < ../vtk-ffmpeg5.patch
+  # Fix Python 3.10 compatibility https://gitlab.kitware.com/vtk/vtk/-/issues/18518
+  patch -p1 < ../vtk-python3.10.patch || true
+  # Fix build with netCDF 4.9
+  sed -i 's|1999-2020|1999-2021|' ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
+  patch -p5 -d ThirdParty/exodusII/vtkexodusII/ < ../vtk-exodus-netcdf4.9-compat.patch
 }
 
 build() {
@@ -124,6 +133,10 @@
   mv "${pkgdir}"/usr/lib/java/vtk-Linux-${CARCH}/*.so "${pkgdir}"/usr/lib/
   rmdir "${pkgdir}"/usr/lib/java/{vtk-Linux-${CARCH}/,}
 
+  # byte-compile python modules since the CMake build does not do it
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  python -m compileall -o 0 -o 1 -o 2 --hardlink-dupes -s "${pkgdir}" "${pkgdir}"${site_packages}
+
   # Remove third party CMake patching for older versions than ours
   rm -rv "${pkgdir}"/usr/lib/cmake/vtk/patches/3.{1{3,6,8,9},20}
   # … as well as duplicate copies