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

[Bruno Pagani]

    Date: Tuesday, March 16, 2021 @ 20:01:44
  Author: archange
Revision: 892180

upgpkg: paraview 5.9.0-1

Revert to vendored pegtl because of https://gitlab.kitware.com/vtk/vtk/-/issues/18151

Modified:
  paraview/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-16 20:00:40 UTC (rev 892179)
+++ PKGBUILD	2021-03-16 20:01:44 UTC (rev 892180)
@@ -7,8 +7,8 @@
 _mpi=openmpi
 pkgname=${_pkg}
 #-${_mpi}
-pkgver=5.8.1
-pkgrel=4
+pkgver=5.9.0
+pkgrel=1
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=(x86_64)
 url="https://www.paraview.org"
@@ -18,30 +18,20 @@
          double-conversion expat freetype2 gdal gl2ps glew hdf5 libjpeg jsoncpp
          libjsoncpp.so libharu libxml2 lz4 xz python-mpi4py netcdf libogg
          libpng pdal pugixml libtheora libtiff zlib)
-optdepends=(python-matplotlib)
-makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen pegtl utf8cpp)
+optdepends=(python-matplotlib python-pandas)
+makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen utf8cpp)
+# pegtl https://gitlab.kitware.com/vtk/vtk/-/issues/18151
 conflicts=(vtk)
-source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz"
-        paraview-cgns-4.1.patch::https://gitlab.kitware.com/paraview/paraview/-/commit/3d48a287141eb911b4888440e09c262743b4db3c.patch
-        paraview-vtk-python39.patch
-        paraview-vtk-freetype-2.10.3.patch)
-sha256sums=('7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034'
-            '917485fbff57b922e67e40ee35d265769b05b4b62c397e4c9ce00244f5fd07ae'
-            '9b8f4497050c110df0d087a1b297de738791ad0159f28666fd9f4ae937cd5e83'
-            'b547a665eaf980669b929f3a95e61cc8af4892ba3a41441ef98f8487886081ce')
+source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz")
+sha256sums=('b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d')
 
 prepare() {
     cd ParaView-v${pkgver/R/-R}
-    patch -Np1 -i ../paraview-cgns-4.1.patch
-    patch -Np1 -i ../paraview-vtk-python39.patch
     # We have a patched libharu
     sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
-    # https://bugs.archlinux.org/task/68244
-    patch -Np1 -i ../paraview-vtk-freetype-2.10.3.patch
 }
 
 build() {
-    export CPPFLAGS+=" -DH5_USE_110_API"
     cmake -B build -S ParaView-v${pkgver/R/-R} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
@@ -49,17 +39,18 @@
         -DPARAVIEW_ENABLE_GDAL=ON \
         -DPARAVIEW_ENABLE_MOTIONFX=ON \
         -DPARAVIEW_ENABLE_PDAL=ON \
+        -DPARAVIEW_ENABLE_RAYTRACING=ON \
         -DPARAVIEW_ENABLE_VISITBRIDGE=ON \
         -DPARAVIEW_ENABLE_XDMF3=ON \
         -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
         -DPARAVIEW_USE_MPI=ON \
         -DPARAVIEW_USE_PYTHON=ON \
-        -DPARAVIEW_USE_RAYTRACING=ON \
         -DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
         -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
         -DVTKm_ENABLE_MPI=ON \
         -DVTK_MODULE_ENABLE_VTK_IOGDAL=YES \
         -DVTK_MODULE_ENABLE_VTK_IOPDAL=YES \
+        -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
         -GNinja
 
     ninja -C build ${MAKEFLAGS}