update 5.2.0

3 files changed, 65 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 384e750348a7..f848f401c29a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Aug 11 15:51:43 UTC 2016
+# Wed Nov 16 14:50:13 UTC 2016
 pkgbase = paraview-manta
 	pkgdesc = Parallel Visualization Application using VTK (with MantaView plugin, Qt4, legacy OpenGL backend)
-	pkgver = 5.1.2
+	pkgver = 5.2.0
 	pkgrel = 1
 	url = http://www.paraview.org
 	arch = i686
@@ -31,12 +31,12 @@ pkgbase = paraview-manta
 	optdepends = python2-numpy: Needed for using some filters such as "Python Calculator"
 	provides = paraview
 	conflicts = paraview
-	source = http://paraview.org/files/v5.1/ParaView-v5.1.2.tar.gz
-	source = paraview_32bit.patch
+	source = http://paraview.org/files/v5.2/ParaView-v5.2.0.tar.gz
 	source = paraview-desktop.patch
-	sha1sums = 449f104090b1fa84d1ee4b852dbfc6269cba9db4
-	sha1sums = c25134330c582371e1009b51445cdb435144b53f
+	source = paraview-mantaview.patch
+	sha1sums = c578cdad44673cd3311bd5c5fec52075ea923701
 	sha1sums = d7da23daca34cd015294c4d2f702cdc4a81f0853
+	sha1sums = edd6f34c0a715f86e2304bb3458afb4f17562528
 
 pkgname = paraview-manta
 
diff --git a/PKGBUILD b/PKGBUILD
index 3102798ce273..2481497eed99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,32 +6,32 @@
 # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
 
 pkgname=paraview-manta
-pkgver=5.1.2
+pkgver=5.2.0
 pkgrel=1
 pkgdesc='Parallel Visualization Application using VTK (with MantaView plugin, Qt4, legacy OpenGL backend)'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
 depends=('qtwebkit' 'openmpi' 'python2' 'ffmpeg' 'boost' 'glew'
-	 'expat' 'freetype2' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib' 'manta' 'ospray')
+	     'expat' 'freetype2' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib'
+         'manta' 'ospray')
 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')
-# options=('!strip')
 source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz"
-	    'paraview_32bit.patch'
-        'paraview-desktop.patch')
-sha1sums=('449f104090b1fa84d1ee4b852dbfc6269cba9db4'
-          'c25134330c582371e1009b51445cdb435144b53f'
-          'd7da23daca34cd015294c4d2f702cdc4a81f0853')
+        'paraview-desktop.patch'
+        'paraview-mantaview.patch')
+sha1sums=('c578cdad44673cd3311bd5c5fec52075ea923701'
+          'd7da23daca34cd015294c4d2f702cdc4a81f0853'
+          'edd6f34c0a715f86e2304bb3458afb4f17562528')
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}"
-  patch -p1 -i ../paraview_32bit.patch
-  
+
   patch -p1 -i ../paraview-desktop.patch
+  patch -p1 -i ../paraview-mantaview.patch
 
   rm -rf "${srcdir}/build"
   mkdir "${srcdir}/build"
@@ -42,58 +42,43 @@ build() {
   cd "${srcdir}/build"
   
   # flags to enable system libs
-  # add PROTOBUF when http://www.vtk.org/Bug/view.php?id=13656 gets fixed
-  local cmake_system_flags=""
+  # 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
-    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+    VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
 
-   # flags to use python2 instead of python which is 3.x.x on archlinux
-   local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 \
-   	 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
-
-   # flags to use ffmpeg2.8
-   local ffmpeg_compat_flags="-DFFMPEG_INCLUDE_DIR:PATH=/usr/include/ \
-   	 -DFFMPEG_avcodec_LIBRARY=/usr/lib/libavcodec.so \
-   	 -DFFMPEG_avformat_LIBRARY=/usr/lib/libavformat.so \
-   	 -DFFMPEG_avutil_LIBRARY=/usr/lib/libavutil.so \
-   	 -DFFMPEG_swscale_LIBRARY=/usr/lib/libswscale.so"
-
-   local manta_system_flags="-DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=ON \
-     -DMANTA_BUILD:PATH=/usr/ \
-     -DMANTA_SOURCE:PATH=/usr/include/"
-
-   # enable when http://paraview.org/Bug/view.php?id=12852 gets fixed:
-   #-DCMAKE_SKIP_RPATH:BOOL=YES \
-   cmake \
-   -DBUILD_SHARED_LIBS:BOOL=ON \
-   -DBUILD_TESTING:BOOL=OFF \
-   -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_C_COMPILER=mpicc \
-   -DCMAKE_CXX_COMPILER=mpicxx \
-   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-   -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-   -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
-   -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-   -DPARAVIEW_USE_MPI:BOOL=ON \
-   -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-   -DPARAVIEW_QT_VERSION=4 \
-   -DVTK_QT_VERSION=4 \
-   -DQT_HELP_GENERATOR:FILEPATH=/usr/lib/qt4/bin/qhelpgenerator \
-   -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
-   -DVISIT_BUILD_READER_CGNS:BOOL=OFF \
-   -DVTK_RENDERING_BACKEND:STRING=OpenGL \
-   -DVTK_USE_SYSTEM_HDF5:BOOL=OFF \
-   -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
-   -DPARAVIEW_USE_OSPRAY=ON \
-   -DOSPRAY_INSTALL_DIR:PATH=/usr \
-   ${cmake_system_flags} \
-   ${cmake_system_python_flags} \
-   ${ffmpeg_compat_flags} \
-   ${manta_system_flags} \
-   ../ParaView-v${pkgver}
+  cmake \
+      -DBUILD_SHARED_LIBS:BOOL=ON \
+      -DBUILD_TESTING:BOOL=OFF \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_C_COMPILER=mpicc \
+      -DCMAKE_CXX_COMPILER=mpicxx \
+      -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+      -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
+      -DPARAVIEW_ENABLE_CGNS:BOOL=OFF \
+      -DPARAVIEW_ENABLE_FFMPEG:BOOL=ON \
+      -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
+      -DPARAVIEW_PYTHON_VERSION=2 \
+      -DPARAVIEW_QT_VERSION=4 \
+      -DPARAVIEW_USE_MPI:BOOL=ON \
+      -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
+      -DVISIT_BUILD_READER_CGNS:BOOL=OFF \
+      -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 \
+      ${VTK_USE_SYSTEM_LIB} \
+      ../ParaView-v${pkgver}
 
-   make
+  make
 }
 
 package() {
diff --git a/paraview-mantaview.patch b/paraview-mantaview.patch
new file mode 100644
index 000000000000..fd493971bb4b
--- /dev/null
+++ b/paraview-mantaview.patch
@@ -0,0 +1,16 @@
+--- ParaView-v5.2.0/Plugins/MantaView/ParaView/CMakeLists.txt~	2016-11-14 09:41:57.000000000 -0600
++++ ParaView-v5.2.0/Plugins/MantaView/ParaView/CMakeLists.txt	2016-11-16 02:11:18.610664194 -0600
+@@ -5,6 +5,13 @@
+ )
+ 
+ IF(PARAVIEW_BUILD_QT_GUI)
++  pv_find_package_qt(qt_targets REQUIRED QUIET
++    QT4_COMPONENTS QtGui
++    QT5_COMPONENTS Widgets)
++
++  vtk_module_load(pqComponents)
++  include_directories(${pqComponents_INCLUDE_DIRS})
++
+   INCLUDE_DIRECTORIES(
+     ${PARAVIEW_GUI_INCLUDE_DIRS}
+     )