update 5.3.0

2 files changed, 38 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d0980a52f4f..38d1f99a9e8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Nov 29 04:00:32 UTC 2016
+# Fri Apr 28 19:53:44 UTC 2017
 pkgbase = paraview-manta
-	pkgdesc = Parallel Visualization Application using VTK (with MantaView plugin, Qt4, legacy OpenGL, OSPRay, Dev files)
-	pkgver = 5.2.0
-	pkgrel = 2
+	pkgdesc = Parallel Visualization Application using VTK (with MantaView plugin, Qt4, Python2, legacy OpenGL)
+	pkgver = 5.3.0
+	pkgrel = 1
 	url = http://www.paraview.org
 	arch = i686
 	arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = paraview-manta
 	makedepends = cmake
 	makedepends = mesa
 	makedepends = gcc-fortran
-	depends = qtwebkit
+	depends = qt4
 	depends = openmpi
 	depends = python2
 	depends = ffmpeg
@@ -25,20 +25,20 @@ pkgbase = paraview-manta
 	depends = libpng
 	depends = libtiff
 	depends = zlib
-	depends = manta
 	depends = ospray
+	depends = cgns
+	depends = manta
+	depends = intel-tbb
+	depends = lz4
+	depends = protobuf
 	optdepends = python2-matplotlib: Needed to support equation rendering using MathText markup language
 	optdepends = python2-numpy: Needed for using some filters such as "Python Calculator"
 	provides = paraview
 	conflicts = paraview
-	source = http://paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz
+	source = ParaView-v5.3.0.tar.gz::http://paraview.org/files/v5.3/ParaView-v5.3.0.tar.gz
 	source = paraview-desktop.patch
-	source = vtk_hdf5_internal.patch
-	source = paraview-mantaview.patch
-	sha1sums = c578cdad44673cd3311bd5c5fec52075ea923701
+	sha1sums = c8a31039b189e63b20618bbfa91e89555ce62b6d
 	sha1sums = d7da23daca34cd015294c4d2f702cdc4a81f0853
-	sha1sums = cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5
-	sha1sums = edd6f34c0a715f86e2304bb3458afb4f17562528
 
 pkgname = paraview-manta
 
diff --git a/PKGBUILD b/PKGBUILD
index baf88ae3b8ca..ca3b7ca40d65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,43 @@
+# Maintainer: gucong <gucong43216@gmail.com>
+# Contributor: Oliver Goethel <deezy>
+# Contributor: eolianoe eolianoe <eolianoe [at] gmail [DoT] com>
 # Contributor: George Eleftheriou <eleftg>
 # Contributor: Mathias Anselmann <mathias.anselmann@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Michele Mocciola <mickele>
 # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-# Maintainer: gucong <gucong43216@gmail.com>
+# Contributor: chuckdaniels
 
 pkgname=paraview-manta
-_pkgver=5.2.0
+_pkgver=5.3.0
 pkgver=${_pkgver//-/.}
-pkgrel=2
-pkgdesc='Parallel Visualization Application using VTK (with MantaView plugin, Qt4, legacy OpenGL, OSPRay, Dev files)'
+pkgrel=1
+pkgdesc='Parallel Visualization Application using VTK (with MantaView plugin, Qt4, Python2, legacy OpenGL)'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
-depends=('qtwebkit'
+depends=('qt4'
          'openmpi' 'python2' 'ffmpeg' 'boost' 'glew'
 	     'expat' 'freetype2' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib'
-         'manta' 'ospray')
+         'ospray' 'cgns'
+         'manta' 'intel-tbb' 'lz4' 'protobuf')
 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"')
 conflicts=('paraview')
 provides=('paraview')
-source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${_pkgver}.tar.gz"
-        'paraview-desktop.patch'
-        'vtk_hdf5_internal.patch'
-        'paraview-mantaview.patch')
-sha1sums=('c578cdad44673cd3311bd5c5fec52075ea923701'
-          'd7da23daca34cd015294c4d2f702cdc4a81f0853'
-          'cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5'
-          'edd6f34c0a715f86e2304bb3458afb4f17562528')
+source=("ParaView-v${_pkgver}.tar.gz::http://paraview.org/files/v${pkgver:0:3}/ParaView-v${_pkgver}.tar.gz"
+        '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
-  patch -p1 -i ../paraview-mantaview.patch
 
-  rm -rf "${srcdir}/build"
+  #rm -rf "${srcdir}/build"
   mkdir -p "${srcdir}/build"
 }
 
@@ -47,13 +45,14 @@ 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 EXPAT FREETYPE JPEG LIBXML2 OGGTHEORA PNG TIFF ZLIB HDF5 GLEW LZ4 PROTOBUF; 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,22 +60,20 @@ build() {
       -DCMAKE_CXX_COMPILER=mpicxx \
       -DCMAKE_INSTALL_PREFIX:PATH=/usr \
       -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-      -DPARAVIEW_ENABLE_CGNS:BOOL=OFF \
+      -DOSPRAY_INSTALL_DIR:PATH=/usr \
+      -DPARAVIEW_ENABLE_CGNS:BOOL=ON \
       -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
       -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-      -DPARAVIEW_PYTHON_VERSION=2 \
+      -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
       -DPARAVIEW_QT_VERSION=4 \
       -DPARAVIEW_USE_MPI:BOOL=ON \
+      -DPARAVIEW_USE_OSPRAY=ON \
       -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-      -DVISIT_BUILD_READER_CGNS:BOOL=OFF \
+      -DVISIT_BUILD_READER_CGNS:BOOL=ON \
       -DVTK_PYTHON_VERSION=2 \
       -DVTK_QT_VERSION=4 \
       -DVTK_RENDERING_BACKEND:STRING=OpenGL \
       -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=OpenMP \
-      -DVTK_USE_SYSTEM_HDF5:BOOL=OFF \
-      -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-      -DPARAVIEW_USE_OSPRAY=ON \
-      -DOSPRAY_INSTALL_DIR:PATH=/usr \
       -DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=ON \
       -DMANTA_BUILD:PATH=/usr \
       -DMANTA_SOURCE:PATH=/usr/include \
@@ -93,4 +90,7 @@ package() {
 
   #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
 }