From 001d6bb4d6eb3c895439e6e68330bcd54ca47dab Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 6 Jul 2017 15:01:43 +0200
Subject: paraview: 5.3.0-1 -> 5.4.0-1

---
 paraview/PKGBUILD | 73 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 32 deletions(-)

(limited to 'paraview')

diff --git a/paraview/PKGBUILD b/paraview/PKGBUILD
index 95fed537..ee05aac4 100644
--- a/paraview/PKGBUILD
+++ b/paraview/PKGBUILD
@@ -7,35 +7,29 @@
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Michele Mocciola <mickele>
 # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
+# Contributor: chuckdaniels
 
 pkgname=paraview
-pkgver=5.3.0
+pkgver=5.4.0
 pkgrel=1
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
 depends=('qt5-tools' 'qt5-x11extras'  'qt5-xmlpatterns'
-         'openmpi' 'python2' 'ffmpeg' 'boost' 'glew'
+         'openmpi' 'python-matplotlib' 'python-numpy'
+         'ffmpeg' 'boost' 'glew' 'protobuf'
          'expat' 'freetype2' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib'
-        )
-makedepends=('cmake' 'mesa' 'gcc-fortran')
-optdepends=('python2-matplotlib: Needed to support equation rendering using MathText markup language'
-            'python2-numpy: Needed for using some filters such as "Python Calculator"')
-source=("https://www.paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz"
-        'paraview-desktop.patch'
-        'vtk_hdf5_internal.patch')
-sha512sums=('3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f'
-            '5b9a29e0cb7c9a2ec60345bc81115323885e2613bd18fb208803393ad1ef968ef03dd7ea3e04e97dcfdb101dbc13ef03560fd1a0fd6be325c66b4475c00efc19'
-            'b65286279175a6203a43027043802a09c06827034a7361ad9ea12f63bdd226d33e3b585c61ecf9fc8d411c841a9999758705c2c29c6eab29554c3d150d5913d9')
+         'cgns')
+depends_x86_64=('ospray')
+makedepends=('cmake' 'mesa' 'gcc-fortran' 'ninja')
+source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz")
+sha1sums=('d1bc9112d76f603d3232069b4ea9c507c4e1b1a7')
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}"
 
-  patch -p1 -i ../paraview-desktop.patch
-  patch -p1 -i ../vtk_hdf5_internal.patch
-
-  rm -rf "${srcdir}/build"
+  #rm -rf "${srcdir}/build"
   mkdir -p "${srcdir}/build"
 }
 
@@ -43,44 +37,59 @@ build() {
   cd "${srcdir}/build"
 
   # flags to enable system libs
-  # add PROTOBUF when https://gitlab.kitware.com/paraview/paraview/issues/13656 gets fixed
   local VTK_USE_SYSTEM_LIB=""
-  for lib in EXPAT FREETYPE GLEW JPEG LIBXML2 OGGTHEORA PNG TIFF ZLIB; do
+  for lib in CGNS EXPAT FREETYPE GLEW HDF5 JPEG LIBXML2 OGGTHEORA PNG PROTOBUF TIFF ZLIB
+  do
     VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
 
+  if [ "${CARCH}" = 'x86_64' ]; then
+    _arch_options='-DOSPRAY_INSTALL_DIR:PATH=/usr -DPARAVIEW_USE_OSPRAY:BOOL=ON'
+  else
+    _arch_options=''
+  fi
+
+  # VisitBridge bug: https://gitlab.kitware.com/paraview/paraview/issues/17456
   cmake \
+    -DBUILD_DOCUMENTATION:BOOL=OFF \
+    -DBUILD_EXAMPLES:BOOL=ON \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DBUILD_TESTING:BOOL=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_COMPILER=mpicc \
-    -DCMAKE_CXX_COMPILER=mpicxx \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DCMAKE_C_COMPILER:STRING=mpicc \
+    -DCMAKE_CXX_COMPILER:STRING=mpicxx \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-    -DPARAVIEW_ENABLE_CGNS:BOOL=OFF \
+    -DPARAVIEW_ENABLE_CGNS:BOOL=ON \
     -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
+    -DPARAVIEW_ENABLE_MATPLOTLIB:BOOL=ON \
     -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-    -DPARAVIEW_PYTHON_VERSION=2 \
-    -DPARAVIEW_QT_VERSION=5 \
+    -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+    -DPARAVIEW_QT_VERSION:STRING=5 \
     -DPARAVIEW_USE_MPI:BOOL=ON \
-    -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-    -DVISIT_BUILD_READER_CGNS:BOOL=OFF \
-    -DVTK_PYTHON_VERSION=2 \
-    -DVTK_QT_VERSION=5 \
+    -DPARAVIEW_USE_VISITBRIDGE:BOOL=OFF \
+    -DVISIT_BUILD_READER_CGNS:BOOL=ON \
+    -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON \
+    -DVTK_PYTHON_VERSION:STRING=3 \
+    -DVTK_QT_VERSION:STRING=5 \
     -DVTK_RENDERING_BACKEND:STRING=OpenGL2 \
     -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=OpenMP \
-    -DVTK_USE_SYSTEM_HDF5:BOOL=OFF \
+    -DVTK_USE_TK:BOOL=ON \
     ${VTK_USE_SYSTEM_LIB} \
+    ${_arch_options} \
+    -GNinja \
     ../ParaView-v${pkgver}
 
-  make
+  ninja ${MAKEFLAGS}
 }
 
 package() {
   cd "${srcdir}/build"
 
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 
   #Install license
   install -Dm644 "${srcdir}/ParaView-v${pkgver}/License_v1.2.txt" "${pkgdir}/usr/share/licenses/paraview/LICENSE"
+
+  # Remove IceT man pages to avoid conflicts
+  rm -- "${pkgdir}/usr/share/man/man3/icet"*.3
 }
-- 
cgit v1.2.3-54-g00ecf