[arch-commits] Commit in vtk/trunk (PKGBUILD)
Bruno Pagani
archange at archlinux.org
Wed Nov 21 16:52:24 UTC 2018
Date: Wednesday, November 21, 2018 @ 16:52:24
Author: archange
Revision: 409281
upgpkg: vtk 8.1.2-1
Clean PKGBUILD/sync with ParaView one
Modified:
vtk/trunk/PKGBUILD
----------+
PKGBUILD | 116 +++++++++++++++++++++++++++++--------------------------------
1 file changed, 57 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-21 16:41:54 UTC (rev 409280)
+++ PKGBUILD 2018-11-21 16:52:24 UTC (rev 409281)
@@ -5,33 +5,36 @@
# Contributor: Thomas Dziedzic <gostrc at gmail>
pkgname=vtk
-pkgver=8.1.1
-pkgrel=3
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization'
+pkgver=8.1.2
+pkgrel=1
+pkgdesc="A software system for 3D computer graphics, image processing, and visualization"
arch=('x86_64')
-url='http://www.vtk.org/'
+url="https://www.vtk.org/"
license=('BSD')
depends=('gcc-libs')
-makedepends=('boost' 'cmake' 'doxygen' 'ffmpeg' 'gdal' 'glew' 'gnuplot'
- 'hdf5' 'java-environment' 'jsoncpp' 'lz4'
- 'mariadb' 'netcdf' 'openmpi' 'proj' 'python-autobahn' 'python-constantly'
- 'python-incremental' 'python-matplotlib'
- 'python-mpi4py' 'python-twisted' 'qt5-base' 'qt5-tools'
- 'qt5-webkit' 'qt5-x11extras' 'tk' 'unixodbc' 'wget')
-optdepends=('python: python bindings'
+makedepends=('cmake' 'boost' 'doxygen' 'ffmpeg' 'gdal' 'gnuplot'
+ 'java-environment' 'openmpi' 'python-matplotlib' 'qt5-base'
+ 'qt5-tools' 'qt5-webkit' 'qt5-x11extras' 'tk' 'unixodbc' 'wget'
+ 'expat' 'freetype2' 'glew' 'hdf5' 'libjpeg' 'jsoncpp' 'libxml2'
+ 'lz4' 'python-mpi4py' 'netcdf' 'libogg' 'libtheora' 'libpng'
+ 'libtiff' 'zlib'
+ 'python-autobahn' 'python-constantly' 'python-hyperlink'
+ 'python-incremental' 'proj' 'mariadb' 'python-six'
+ 'python-twisted' 'python-txaio' 'python-zope-interface')
+optdepends=('gnuplot: plotting tools'
+ 'graphviz: drawing tools'
'java-runtime: java bindings'
- 'tk: tcl bindings'
- 'gnuplot: plotting tools'
- 'graphviz: drawing tools'
+ 'python: python bindings'
+ 'python-autobahn: for vtkWeb'
+ 'python-twisted: for vtkWeb'
'python-constantly'
'python-incremental'
+ 'python-mpi4py: OpenMPI python support'
'python-matplotlib: for Matplotlib rendering'
- 'python-twisted: for vtkWeb'
- 'python-autobahn: for vtkWeb'
- 'python-mpi4py: OpenMPI python support'
'openmpi: OpenMPI support'
'qt5-x11extras'
'qt5-webkit: WebKit support'
+ 'tk: tcl bindings'
'ffmpeg'
'gdal'
'glew'
@@ -44,19 +47,14 @@
'unixodbc')
source=("http://www.vtk.org/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz"
"http://www.vtk.org/files/release/${pkgver%.*}/VTKData-${pkgver}.tar.gz"
- "http://www.vtk.org/files/release/${pkgver%.*}/VTKLargeData-${pkgver}.tar.gz"
- "https://github.com/Kitware/VTK/commit/706f1b397df09a27ab8981ab9464547028d0c322.patch")
+ "http://www.vtk.org/files/release/${pkgver%.*}/VTKLargeData-${pkgver}.tar.gz")
options=(staticlibs)
-sha512sums=('7ab38042f6d94d1580125b3a68a6d17cdc3de925d0e886ebfc8c414adfba1438f5783d896a4cd1bb7e15462450107ab5773a3a749195b357f062e91d5c410060'
- '6c20cfb9dda9d64c27946693f22357f38699d2ff014c2f33e3b05573935eaf3b7a4e30a8cf5747772a6dafe39c20e90b78a0267620ff6b6d5b487edf8ef4f975'
- '9966b8474c22c2fb23a51e0411f06bc4f33e4233535d0b4875a87731c6c95e2c10c97565dc0e6af2af6c7ed7d5e5de171eddf9678cc4235a329cdaf36a021dd4'
- '6f5064517fd72a46933b4c4723602a1b774133f47b8f21424d5c44b9283a4af7992ce48cf256b7b2aadb81cbbbfe2b5f3ef3ab0629c4d2362e05b4314c975a89')
+sha512sums=('c9fc498804ff9bb433bf79f4b14d9bb6134b026aea46ed12ac40434bfdd8063c42e75d3e0cfa88d171fa271001c9444d66a471edc9b22df83a9109733abcdfa0'
+ '6aaf2bfed03bf1138eba2476ea7d03f977bcbd918718b545304873935e88c1361d1aa0483a188f60d36e68da1a22620a8786e7a7f8c3c16fa82e2c6a3d695bb8'
+ '12c65442c16fc0eaadfcd59248eb8ed0d45e9afb272a2bfa6820143d1059e02efbb503e81f78168eb86f24641908975f81e5c0fa739ff2b5ca018d1a48c9a579')
prepare() {
mkdir build
- cd VTK-${pkgver}
- # Fix building with python 3.7 (https://gitlab.kitware.com/vtk/vtk/issues/17350, fixed in next release)
- patch -p1 -i ../706f1b397df09a27ab8981ab9464547028d0c322.patch
}
build() {
@@ -65,17 +63,19 @@
# to help cmake find java
export JAVA_HOME=/usr/lib/jvm/default
- # flags to enable using system libs
- local cmake_system_flags=""
- # TODO: try to use system provided XDMF2, XDMF3, GL2PS
- # VTK fails to compile with recent netcdf-cxx package, VTK should be ported to the latest API
- # VTK does not work with XDMF2 compiled from git. TODO: make vtk compatible with system XDMF library.
- # libharu needs to be patched, see https://github.com/libharu/libharu/pull/157
+ # GL2PS blocked by http://www.vtk.org/Bug/view.php?id=16083
+ # NETCDFCPP blocked by https://github.com/Unidata/netcdf-cxx4/issues/43
+ # LIBHARU blocked by https://github.com/libharu/libharu/pull/157
# Note: VTK explicitly disables system GLEW dependency, it uses embedded sources with modifications
- # system gl2ps is not used because of http://www.vtk.org/Bug/view.php?id=16083
- for lib in EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE SIX AUTOBAHN MPI4PY JSONCPP GLEW HDF HDF5 LIBPROJ4 TXAIO HYPERLINK CONSTANTLY INCREMENTAL LZ4 NETCDF; do
- cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+ # Only in ParaView build: DOUBLECONVERSION EIGEN LZMA PEGTL PUGIXML
+ local VTK_USE_SYSTEM_LIB=""
+ # Common with ParaView
+ for lib in EXPAT FREETYPE GLEW HDF5 JPEG JSONCPP LIBXML2 LZ4 MPI4PY NETCDF OGGTHEORA PNG TIFF ZLIB; do
+ VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}=ON "
done
+ for lib in AUTOBAHN CONSTANTLY HYPERLINK INCREMENTAL LIBPROJ4 SIX TWISTED TXAIO ZOPE; do
+ VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}=ON "
+ done
local _tkver=$(echo 'puts $tcl_version' | tclsh)
@@ -83,27 +83,27 @@
-Wno-dev \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
- -DBUILD_DOCUMENTATION:BOOL=OFF \
- -DDOXYGEN_KEEP_TEMP:BOOL=ON \
- -DDOCUMENTATION_HTML_HELP:BOOL=OFF \
- -DDOCUMENTATION_HTML_TARZ:BOOL=OFF \
- -DBUILD_EXAMPLES:BOOL=ON \
+ -DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_DOCUMENTATION=OFF \
+ -DDOXYGEN_KEEP_TEMP=ON \
+ -DDOCUMENTATION_HTML_HELP=OFF \
+ -DDOCUMENTATION_HTML_TARZ=OFF \
+ -DBUILD_EXAMPLES=ON \
-DXDMF_STATIC_AND_SHARED=OFF \
- -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
- -DVTK_BUILD_ALL_MODULES:BOOL=ON \
- -DVTK_USE_LARGE_DATA:BOOL=ON \
- -DVTK_QT_VERSION:STRING="5" \
- -DVTK_WRAP_JAVA:BOOL=ON \
- -DVTK_WRAP_PYTHON:BOOL=ON \
- -DVTK_WRAP_TCL:BOOL=ON \
+ -DVTK_USE_FFMPEG_ENCODER=ON \
+ -DVTK_BUILD_ALL_MODULES=ON \
+ -DVTK_USE_LARGE_DATA=ON \
+ -DVTK_QT_VERSION="5" \
+ -DVTK_WRAP_JAVA=ON \
+ -DVTK_WRAP_PYTHON=ON \
+ -DVTK_WRAP_TCL=ON \
-DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-DVTK_PYTHON_VERSION="3" \
-DVTK_CUSTOM_LIBRARY_SUFFIX="" \
- -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
+ -DVTK_INSTALL_INCLUDE_DIR=include/vtk \
-DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \
- ${cmake_system_flags} \
+ ${VTK_USE_SYSTEM_LIB} \
-DCMAKE_BUILD_TYPE=Release
make
@@ -113,18 +113,16 @@
cd build
make DESTDIR="${pkgdir}" install
- # remove xdmf cmake config file
- rm -rf "${pkgdir}/usr/XdmfConfig.cmake"
# Move the vtk.jar to the arch-specific location
- install -dv "${pkgdir}/usr/share/java/vtk"
- mv -v "${pkgdir}/usr/lib/vtk.jar" "${pkgdir}/usr/share/java/vtk"
- rm -rf "${pkgdir}/usr/lib/vtk-${pkgver%.*}/java"
+ install -dv "${pkgdir}"/usr/share/java/vtk
+ mv -v "${pkgdir}"/usr/lib/vtk.jar "${pkgdir}"/usr/share/java/vtk
+ rm -rf "${pkgdir}"/usr/lib/vtk-${pkgver%.*}/java
# Install license
- install -Dm644 "${srcdir}/VTK-${pkgver}/Copyright.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm644 ../VTK-${pkgver}/Copyright.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
# Fix path of QtDesigner plugin
- install -dv "${pkgdir}/usr/lib/qt"
- mv "${pkgdir}/usr/plugins" "${pkgdir}/usr/lib/qt/plugins"
+ install -dv "${pkgdir}"/usr/lib/qt
+ mv "${pkgdir}"/usr/plugins "${pkgdir}"/usr/lib/qt/plugins
}
More information about the arch-commits
mailing list