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

[Bruno Pagani]

    Date: Friday, July 23, 2021 @ 01:44:29
  Author: archange
Revision: 984119

netcdf 4.8.0 + hdf5 1.12.1 rebuilds

Also enable ADIOS2, FIDES and LAS.
Clean some build flags.

Modified:
  paraview/trunk/PKGBUILD

----------+
 PKGBUILD |   71 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-23 01:00:24 UTC (rev 984118)
+++ PKGBUILD	2021-07-23 01:44:29 UTC (rev 984119)
@@ -8,59 +8,64 @@
 pkgname=${_pkg}
 #-${_mpi}
 pkgver=5.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=(x86_64)
 url="https://www.paraview.org"
 license=(BSD custom)
 depends=(boost-libs qt5-tools qt5-x11extras qt5-svg intel-tbb openmpi ffmpeg
-         ospray python-numpy cgns protobuf
+         adios2 liblas ospray pdal python-numpy cgns protobuf
          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)
+         libpng pugixml libtheora libtiff zlib)
 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"
+source=(${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz
         vtk-comp-missing-includes.patch)
 sha256sums=('0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d'
             'c400753e386601008a2ed0269a58be76f06cc3c084f2dd48e87f6f04e8eca77f')
 
 prepare() {
-    cd ParaView-v${pkgver/R/-R}
-    patch -Np1 -d VTK <../vtk-comp-missing-includes.patch
-    # We have a patched libharu
-    sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
+  cd ParaView-v${pkgver/R/-R}
+  # We have a patched libharu
+  sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
+  # Missing includes with GCC11
+  patch -p1 -d VTK <../vtk-comp-missing-includes.patch
+  # Fix build with HDF5 1.12.1, https://gitlab.kitware.com/vtk/vtk/-/issues/18265
+  sed -i 's/typedef int hid_t;/typedef int64_t hid_t;/' VTK/ThirdParty/xdmf3/vtkxdmf3/core/XdmfHDF5Controller.hpp
 }
 
 build() {
-    cmake -B build -S ParaView-v${pkgver/R/-R} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DPARAVIEW_ENABLE_FFMPEG=ON \
-        -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_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}
+  # LICENSEDIR blocked by https://gitlab.kitware.com/vtk/vtk/-/issues/18266
+  cmake -B build -S ParaView-v${pkgver/R/-R} -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_INSTALL_RPATH=ON \
+    -DPARAVIEW_ENABLE_ADIOS2=ON \
+    -DPARAVIEW_ENABLE_FFMPEG=ON \
+    -DPARAVIEW_ENABLE_FIDES=ON \
+    -DPARAVIEW_ENABLE_GDAL=ON \
+    -DPARAVIEW_ENABLE_LAS=ON \
+    -DPARAVIEW_ENABLE_MOTIONFX=ON \
+    -DPARAVIEW_ENABLE_PDAL=ON \
+    -DPARAVIEW_ENABLE_RAYTRACING=ON \
+    -DPARAVIEW_ENABLE_VISITBRIDGE=ON \
+    -DPARAVIEW_ENABLE_XDMF3=ON \
+    -DPARAVIEW_USE_MPI=ON \
+    -DPARAVIEW_USE_PYTHON=ON \
+    -DPARAVIEW_VERSIONED_INSTALL=OFF \
+    -DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
+    -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
+    -DVTKm_ENABLE_MPI=ON \
+    -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
+    -Wno-dev
+  ninja -C build ${MAKEFLAGS}
 }
 
 package() {
-    DESTDIR="${pkgdir}" ninja -C build install
-    # Fix licenses install
-    mv "${pkgdir}"/usr/share/licenses/{ParaView,paraview}
+  DESTDIR="${pkgdir}" ninja -C build install
+  # Fix licenses install
+  mv "${pkgdir}"/usr/share/licenses/{ParaView,paraview}
 }