New 5.7.0 version

1 files changed, 50 insertions, 52 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 13786b4811ed..38d34fd27e89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,22 @@
 _pkgname=paraview
 pkgname=$_pkgname-git
 pkgrel=1
-pkgver=v5.6.0.RC2.r314.gfd39ef33ba
+pkgver=v5.7.0.r726.g5296521c81
 pkgdesc="Open-source, multi-platform data analysis and visualization application"
-arch=('x86_64')
-url="https://www.paraview.org/"
+arch=(x86_64)
+url="https://www.paraview.org"
 provides=(paraview)
 conflicts=(paraview)
-license=('custom')
-depends=('qt5-tools' 'qt5-x11extras' 'ospray' 'ffmpeg' 'openmpi'
-         'cgns' 'python-pygments' 'protobuf' 'pugixml'
-         'python-matplotlib' 'python-numpy' 'python-mpi4py'
-         'boost-libs' 'glew' 'expat' 'freetype2'
-         'libjpeg' 'jsoncpp' 'libxml2' 'libpng'
-         'libtiff' 'zlib' 'hdf5' 'lz4' 'netcdf' 'intel-tbb')
-makedepends=('cmake' 'boost' 'mesa' 'gcc-fortran' 'ninja' 'qt5-tools' 'qt5-xmlpatterns' 'eigen' 'git')
+license=(BSD custom)
+depends=(boost-libs qt5-tools qt5-x11extras 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 libpng pdal
+         libtiff zlib)
+#        gl2ps
+#        libharu
+optdepends=(python-matplotlib)
+makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen utf8cpp)
 source=("git+https://gitlab.kitware.com/paraview/${_pkgname}.git")
 sha512sums=('SKIP')
 
@@ -34,52 +36,48 @@ prepare() {
 }
 
 build() {
-  cd build
-  # Flags to enable system libs in VTK building, as in VTK package
-  # NETCDFCPP status?
-  # GL2PS fails.
-  # libharu blocked by https://github.com/libharu/libharu/pull/157
-  # LIBPROJ4 apparently not used in this VTK configuration
-  local VTK_USE_SYSTEM_LIB=""
-  for lib in EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 MPI4PY JSONCPP GLEW HDF5 LZ4 NETCDF EIGEN
-  do
-      VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
-  # Specific system libs for ParaView version
-  for lib in CGNS PUGIXML PROTOBUF PYGMENTS
-  do
-      VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
+    cd build
 
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOSPRAY_INSTALL_DIR=/usr \
-    -DPARAVIEW_ENABLE_FFMPEG=ON \
-    -DPARAVIEW_ENABLE_MATPLOTLIB=ON \
-    -DPARAVIEW_ENABLE_PYTHON=ON \
-    -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
-    -DPARAVIEW_USE_MPI=ON \
-    -DPARAVIEW_USE_VISITBRIDGE=ON \
-    -DPARAVIEW_USE_OSPRAY=ON \
-    -DVISIT_BUILD_READER_CGNS=ON \
-    -DVTK_PYTHON_FULL_THREADSAFE=ON \
-    -DVTK_PYTHON_VERSION=3 \
-    -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
-    ${VTK_USE_SYSTEM_LIB} \
-    -GNinja \
-    "$srcdir/$_pkgname"
+    # Flags to enable system libs in VTK building, as in VTK package
+    # 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 png 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
 
-  ninja ${MAKEFLAGS}
+    cmake ../$_pkgname \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DPARAVIEW_ENABLE_FFMPEG=ON \
+        -DPARAVIEW_ENABLE_GDAL=ON \
+        -DPARAVIEW_ENABLE_PDAL=ON \
+        -DPARAVIEW_ENABLE_PYTHON=ON \
+        -DPARAVIEW_ENABLE_XDMF3=ON \
+        -DPARAVIEW_ENABLE_MOTIONFX=ON \
+        -DPARAVIEW_ENABLE_VISITBRIDGE=ON \
+        -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
+        -DPARAVIEW_USE_MPI=ON \
+        -DPARAVIEW_USE_RAYTRACING=ON \
+        -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
+        -DVTKm_ENABLE_MPI=ON \
+        ${VTK_USE_SYSTEM_LIB} \
+        -GNinja
+
+    ninja ${MAKEFLAGS}
 }
 
 package() {
-  cd build
-
-  DESTDIR="$pkgdir" ninja install
+    cd build
 
-  install -Dm644 "$srcdir/$_pkgname/License_v1.2.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    DESTDIR="${pkgdir}" ninja install
 
-  rm -- "$pkgdir"/usr/share/man/man3/icet*.3
-  rmdir "$pkgdir"/usr/share/man/{man3/,}
+    # Install license
+    install -Dm644 "${srcdir}"/$_pkgname/License_v1.2.txt "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }