[arch-commits] Commit in paraview/trunk (PKGBUILD paraview-system-pugixml.patch)
Bruno Pagani
archange at archlinux.org
Tue Feb 18 16:49:08 UTC 2020
Date: Tuesday, February 18, 2020 @ 16:49:07
Author: archange
Revision: 576011
Pre-update for 5.8.0
Update PKGBUILD according to Mathieu Westphal hints.
Allow building RCs.
Simplify CMake use.
Drop upstreamed patch.
Modified:
paraview/trunk/PKGBUILD
Deleted:
paraview/trunk/paraview-system-pugixml.patch
-------------------------------+
PKGBUILD | 65 ++++++++++------------------------------
paraview-system-pugixml.patch | 19 -----------
2 files changed, 17 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-18 16:48:53 UTC (rev 576010)
+++ PKGBUILD 2020-02-18 16:49:07 UTC (rev 576011)
@@ -1,61 +1,37 @@
# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Contributor: Oliver Goethel <deezy>
-# Contributor: eolianoe eolianoe <eolianoe [at] gmail [DoT] com>
-# Contributor: George Eleftheriou <eleftg>
-# Contributor: Mathias Anselmann <mathias.anselmann at gmail.com>
+# Maintainer: Mathieu Westphal <mathieu.westphal at kitware.com>
# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-# Contributor: chuckdaniels
_pkg=paraview
_mpi=openmpi
pkgname=${_pkg}
#-${_mpi}
-pkgver=5.7.0
-pkgrel=3
+pkgver=5.8.0
+pkgrel=1
pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
arch=(x86_64)
url="https://www.paraview.org"
license=(BSD custom)
-depends=(boost-libs qt5-tools qt5-x11extras intel-tbb openmpi ffmpeg ospray
- python-numpy cgns protobuf
+depends=(boost-libs qt5-tools qt5-x11extras qt5-svg 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 libogg libpng pdal
- proj pugixml libtheora libtiff zlib)
+ pugixml libtheora libtiff zlib)
# gl2ps
# libharu
-# sqlite apparently not used in this VTK configuration
optdepends=(python-matplotlib)
makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen pegtl utf8cpp)
-source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz"
- paraview-system-pugixml.patch
- vtk-python-3.8.patch::"https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch")
-sha256sums=('e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874'
- 'dd2e23298ab5a07da0e799c3db313ed3f9d2a403d7228d50748206b535b6f65f'
- '3beff972e7e9236f2e8ab596be8f893ae7e9346a140c4538d9e8d88c3378b916')
+source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz")
+sha256sums=('219e4107abf40317ce054408e9c3b22fb935d464238c1c00c0161f1c8697a3f9')
-prepare() {
- mkdir -p build
- patch -Np0 -i ./paraview-system-pugixml.patch
- patch -d ParaView-v${pkgver}/VTK -p1 -i "$srcdir"/vtk-python-3.8.patch # Fix build with python 3.8
-}
-
build() {
- cd build
-
# Flags to enable system libs in VTK building, as in VTK package
# GL2PS has non-upstreamed patches
- # KISSFFT is not packaged
- # VERDICT is not packaged
- # ZFP is not packaged
# LIBHARU blocked by https://github.com/libharu/libharu/pull/157
- # SQLITE apparently not used in this VTK configuration
local VTK_USE_SYSTEM_LIB=""
- for lib in doubleconversion eigen expat freetype glew hdf5 jpeg jsoncpp libproj libxml2 lz4 lzma mpi4py netcdf ogg pegtl png pugixml theora tiff utf8 zlib
+ for lib in doubleconversion eigen expat freetype glew hdf5 jpeg jsoncpp libxml2 lz4 lzma mpi4py netcdf ogg pegtl png pugixml theora tiff utf8 zlib
do
- VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_vtk${lib}:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_${lib}:BOOL=ON "
+ VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_VTK_${lib}:BOOL=ON "
done
# Specific system libs for ParaView version
for lib in cgns protobuf
@@ -63,39 +39,32 @@
VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_ParaView_${lib}:BOOL=ON "
done
- cmake ../ParaView-v${pkgver} \
+ cmake -B build -S ParaView-v${pkgver/R/-R} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPARAVIEW_ENABLE_FFMPEG=ON \
-DPARAVIEW_ENABLE_GDAL=ON \
+ -DPARAVIEW_ENABLE_MOTIONFX=ON \
-DPARAVIEW_ENABLE_PDAL=ON \
- -DPARAVIEW_ENABLE_PYTHON=ON \
-DPARAVIEW_ENABLE_VISITBRIDGE=ON \
+ -DPARAVIEW_ENABLE_XDMF3=ON \
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
-DPARAVIEW_USE_MPI=ON \
+ -DPARAVIEW_USE_PYTHON=ON \
-DPARAVIEW_USE_RAYTRACING=ON \
- -DVTK_ENABLE_OSPRAY=ON \
- -DVTK_PYTHON_FULL_THREADSAFE=ON \
- -DVTK_PYTHON_VERSION=3 \
-DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
-DVTKm_ENABLE_MPI=ON \
- -DVTKm_ENABLE_RENDERING=ON \
- -DVTKm_USE_DOUBLE_PRECISION=ON \
- -DVTK_MODULE_ENABLE_VTK_GeovisCore=YES \
- -DVTK_MODULE_ENABLE_VTK_GeovisGDAL=YES \
-DVTK_MODULE_ENABLE_VTK_IOGDAL=YES \
-DVTK_MODULE_ENABLE_VTK_IOPDAL=YES \
${VTK_USE_SYSTEM_LIB} \
-GNinja
- ninja ${MAKEFLAGS}
+ ninja -C build ${MAKEFLAGS}
}
package() {
- cd build
+ DESTDIR="${pkgdir}" ninja -C build install
- DESTDIR="${pkgdir}" ninja install
-
# Install license
- install -Dm644 "${srcdir}"/ParaView-v${pkgver}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/paraview/LICENSE
+ install -Dm644 ParaView-v${pkgver/R/-R}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
Deleted: paraview-system-pugixml.patch
===================================================================
--- paraview-system-pugixml.patch 2020-02-18 16:48:53 UTC (rev 576010)
+++ paraview-system-pugixml.patch 2020-02-18 16:49:07 UTC (rev 576011)
@@ -1,19 +0,0 @@
---- ParaView-v5.7.0/VTK/ThirdParty/pugixml/CMakeLists.txt.orig 2019-10-18 16:22:47.612817047 +0800
-+++ ParaView-v5.7.0/VTK/ThirdParty/pugixml/CMakeLists.txt 2019-10-18 16:29:12.692090865 +0800
-@@ -1,7 +1,12 @@
--vtk_module_third_party_internal(
-- LICENSE_FILES "vtkpugixml/LICENSE"
-- VERSION "1.9"
-- STANDARD_INCLUDE_DIRS)
-+vtk_module_third_party(
-+ INTERNAL
-+ LICENSE_FILES "vtkpugixml/LICENSE"
-+ VERSION "1.9"
-+ STANDARD_INCLUDE_DIRS
-+ EXTERNAL
-+ PACKAGE pugixml
-+ TARGETS pugixml
-+ STANDARD_INCLUDE_DIRS)
-
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/vtk_pugixml.h.in"
More information about the arch-commits
mailing list