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

[Bruno Pagani]

    Date: Thursday, August 20, 2020 @ 12:31:31
  Author: archange
Revision: 685521

upgpkg: paraview 5.8.1-1

Now build against system gl2ps and libharu

Modified:
  paraview/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-20 11:10:54 UTC (rev 685520)
+++ PKGBUILD	2020-08-20 12:31:31 UTC (rev 685521)
@@ -7,8 +7,8 @@
 _mpi=openmpi
 pkgname=${_pkg}
 #-${_mpi}
-pkgver=5.8.0
-pkgrel=9
+pkgver=5.8.1
+pkgrel=1
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=(x86_64)
 url="https://www.paraview.org"
@@ -15,28 +15,25 @@
 license=(BSD custom)
 depends=(boost-libs qt5-tools qt5-x11extras qt5-svg intel-tbb openmpi ffmpeg
          ospray python-numpy cgns protobuf
-         double-conversion expat freetype2 gdal glew hdf5 libjpeg jsoncpp
-         libjsoncpp.so libxml2 lz4 xz python-mpi4py netcdf libogg libpng pdal
-         pugixml libtheora libtiff zlib)
-#        gl2ps
-#        libharu
+         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)
 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)
-sha256sums=('219e4107abf40317ce054408e9c3b22fb935d464238c1c00c0161f1c8697a3f9'
+sha256sums=('7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034'
             '917485fbff57b922e67e40ee35d265769b05b4b62c397e4c9ce00244f5fd07ae')
 
 prepare() {
     cd ParaView-v${pkgver/R/-R}
     patch -p1 -i ../paraview-cgns-4.1.patch
+    # We have a patched libharu
+    sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
 }
 
 build() {
-    # Note regarding use of system dependencies:
-    # GL2PS has non-upstreamed patches
-    # LIBHARU blocked by https://github.com/libharu/libharu/pull/157
     export CPPFLAGS+=" -DH5_USE_110_API"
     cmake -B build -S ParaView-v${pkgver/R/-R} \
         -DCMAKE_BUILD_TYPE=Release \
@@ -52,8 +49,6 @@
         -DPARAVIEW_USE_PYTHON=ON \
         -DPARAVIEW_USE_RAYTRACING=ON \
         -DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
-        -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=OFF \
-        -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF \
         -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
         -DVTKm_ENABLE_MPI=ON \
         -DVTK_MODULE_ENABLE_VTK_IOGDAL=YES \
@@ -65,7 +60,6 @@
 
 package() {
     DESTDIR="${pkgdir}" ninja -C build install
-
-    # Install license
-    install -Dm644 ParaView-v${pkgver/R/-R}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+    # Fix licenses install
+    mv "${pkgdir}"/usr/share/licenses/{ParaView,paraview}
 }