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

[Bruno Pagani]

    Date: Tuesday, February 18, 2020 @ 18:22:32
  Author: archange
Revision: 576061

Final 5.8.0 update, simplify PKGBUILD thanks to the OOD contributor

Modified:
  paraview/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-18 18:22:28 UTC (rev 576060)
+++ PKGBUILD	2020-02-18 18:22:32 UTC (rev 576061)
@@ -1,6 +1,7 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 # Maintainer: Mathieu Westphal <mathieu.westphal at kitware.com>
 # Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: <xantares09 at hotmail.com>
 
 _pkg=paraview
 _mpi=openmpi
@@ -25,20 +26,9 @@
 sha256sums=('219e4107abf40317ce054408e9c3b22fb935d464238c1c00c0161f1c8697a3f9')
 
 build() {
-    # Flags to enable system libs in VTK building, as in VTK package
+    # Note regarding use of system dependencies:
     # GL2PS has non-upstreamed patches
     # LIBHARU blocked by https://github.com/libharu/libharu/pull/157
-    local VTK_USE_SYSTEM_LIB=""
-    for lib in doubleconversion eigen expat freetype glew hdf5 jpeg jsoncpp libxml2 lz4 lzma mpi4py netcdf ogg pegtl png pugixml theora tiff utf8 zlib
-    do
-        VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_VTK_${lib}:BOOL=ON "
-    done
-    # Specific system libs for ParaView version
-    for lib in cgns protobuf
-    do
-        VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_ParaView_${lib}:BOOL=ON "
-    done
-
     cmake -B build -S ParaView-v${pkgver/R/-R} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
@@ -52,11 +42,13 @@
         -DPARAVIEW_USE_MPI=ON \
         -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 \
         -DVTK_MODULE_ENABLE_VTK_IOPDAL=YES \
-        ${VTK_USE_SYSTEM_LIB} \
         -GNinja
 
     ninja -C build ${MAKEFLAGS}