updpkg: 5.3.0

move to python3, use system hdf5 and cgns

2 files changed, 22 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cbab61deff4a..e974640e14bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Dec  2 14:41:52 UTC 2016
+# Wed Mar 15 12:46:02 UTC 2017
 pkgbase = paraview
 	pkgdesc = Parallel Visualization Application using VTK
-	pkgver = 5.2.0
-	pkgrel = 2
+	pkgver = 5.3.0
+	pkgrel = 1
 	url = http://www.paraview.org
 	arch = i686
 	arch = x86_64
@@ -15,7 +15,8 @@ pkgbase = paraview
 	depends = qt5-x11extras
 	depends = qt5-xmlpatterns
 	depends = openmpi
-	depends = python2
+	depends = python-matplotlib
+	depends = python-numpy
 	depends = ffmpeg
 	depends = boost
 	depends = glew
@@ -28,14 +29,11 @@ pkgbase = paraview
 	depends = libtiff
 	depends = zlib
 	depends = ospray
-	optdepends = python2-matplotlib: Needed to support equation rendering using MathText markup language
-	optdepends = python2-numpy: Needed for using some filters such as "Python Calculator"
-	source = http://paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz
+	depends = cgns
+	source = http://paraview.org/files/v5.3/ParaView-v5.3.0.tar.gz
 	source = paraview-desktop.patch
-	source = vtk_hdf5_internal.patch
-	sha1sums = c578cdad44673cd3311bd5c5fec52075ea923701
+	sha1sums = c8a31039b189e63b20618bbfa91e89555ce62b6d
 	sha1sums = d7da23daca34cd015294c4d2f702cdc4a81f0853
-	sha1sums = cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5
 
 pkgname = paraview
 
diff --git a/PKGBUILD b/PKGBUILD
index 00c405791221..4c1f56bf66d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,35 +8,28 @@
 # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
 # Contributor: chuckdaniels
 
-
 pkgname=paraview
-_pkgver=5.2.0
+_pkgver=5.3.0
 pkgver=${_pkgver//-/.}
-pkgrel=2
+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'
          'expat' 'freetype2' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib'
-         'ospray'
-        )
+         'ospray' 'cgns')
 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=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${_pkgver}.tar.gz"
-        'paraview-desktop.patch'
-        'vtk_hdf5_internal.patch')
-sha1sums=('c578cdad44673cd3311bd5c5fec52075ea923701'
-          'd7da23daca34cd015294c4d2f702cdc4a81f0853'
-          'cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5')
+        'paraview-desktop.patch')
+sha1sums=('c8a31039b189e63b20618bbfa91e89555ce62b6d'
+          'd7da23daca34cd015294c4d2f702cdc4a81f0853')
 
 prepare() {
   cd "${srcdir}/ParaView-v${_pkgver}"
 
   patch -p1 -i ../paraview-desktop.patch
-  patch -p1 -i ../vtk_hdf5_internal.patch
 
   #rm -rf "${srcdir}/build"
   mkdir -p "${srcdir}/build"
@@ -48,11 +41,13 @@ 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 EXPAT FREETYPE GLEW HDF5 JPEG LIBXML2 OGGTHEORA PNG TIFF ZLIB; do
     VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
 
   cmake \
+    -DBUILD_DOCUMENTATION:BOOL=OFF \
+    -DBUILD_EXAMPLES:BOOL=ON \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DBUILD_TESTING:BOOL=OFF \
     -DCMAKE_BUILD_TYPE=Release \
@@ -61,20 +56,19 @@ build() {
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
     -DOSPRAY_INSTALL_DIR:PATH=/usr \
-    -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_USE_MPI:BOOL=ON \
     -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
     -DPARAVIEW_USE_OSPRAY:BOOL=ON \
-    -DVISIT_BUILD_READER_CGNS:BOOL=OFF \
-    -DVTK_PYTHON_VERSION=2 \
+    -DVISIT_BUILD_READER_CGNS:BOOL=ON \
+    -DVTK_PYTHON_VERSION=3 \
     -DVTK_QT_VERSION=5 \
     -DVTK_RENDERING_BACKEND:STRING=OpenGL2 \
     -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=OpenMP \
-    -DVTK_USE_SYSTEM_HDF5:BOOL=OFF \
     ${VTK_USE_SYSTEM_LIB} \
     ../ParaView-v${_pkgver}