Date: Tuesday, October 19, 2021 @ 19:49:57 Author: archange Revision: 1030996
upgpkg: vtk 9.0.3-1 Upstream release, also enable more modules Modified: vtk/trunk/PKGBUILD Deleted: vtk/trunk/vtk-freetype-2.10.3.patch ---------------------------+ PKGBUILD | 161 +++++++++++++++++++------------------------- vtk-freetype-2.10.3.patch | 18 ---- 2 files changed, 73 insertions(+), 106 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-19 19:30:10 UTC (rev 1030995) +++ PKGBUILD 2021-10-19 19:49:57 UTC (rev 1030996) @@ -1,27 +1,29 @@ # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org> # Maintainer: Bruno Pagani <archange at archlinux dot org> +# Contributor: Michael Migliore <[email protected]> # Contributor: Ray Rashif <schiv at archlinux dot org> # Contributor: Andrzej Giniewicz <gginiu at gmail dot com> # Contributor: Thomas Dziedzic <gostrc at gmail> pkgname=vtk -pkgver=8.2.0 -pkgrel=21 -pkgdesc="A software system for 3D computer graphics, image processing, and visualization" +pkgver=9.0.3 +pkgrel=1 +pkgdesc="Software system for 3D computer graphics, image processing, and visualization" arch=(x86_64) url="https://www.vtk.org/"; license=(BSD) depends=(gcc-libs double-conversion) -makedepends=(cmake boost doxygen ffmpeg gdal gnuplot - java-environment openmpi python-matplotlib qt5-base - qt5-tools qt5-webkit qt5-x11extras tk unixodbc wget - double-conversion eigen expat freetype2 glew hdf5 - libjpeg jsoncpp libxml2 lz4 xz python-mpi4py netcdf - libogg pdal libpng libtheora libtiff zlib - sqlite) +makedepends=(adios2 cmake boost doxygen ffmpeg gdal git gnuplot java-environment=11 + liblas libxt openimagedenoise openmpi openvr ospray pdal postgresql + python-matplotlib qt5-base qt5-tools qt5-webkit qt5-x11extras tk + unixodbc wget + double-conversion eigen expat freetype2 gl2ps glew hdf5 libjpeg + jsoncpp libharu proj libxml2 lz4 xz python-mpi4py netcdf libogg + libpng pugixml sqlite libtheora libtiff utf8cpp zlib) +# pegtl https://gitlab.kitware.com/vtk/vtk/-/issues/18151 optdepends=('gnuplot: plotting tools' 'graphviz: drawing tools' - 'java-runtime: java bindings' + 'java-runtime=11: java bindings' 'python: python bindings' 'python-mpi4py: OpenMPI python support' 'python-matplotlib: for Matplotlib rendering' @@ -29,102 +31,90 @@ 'qt5-x11extras' 'qt5-webkit: WebKit support' 'tk: tcl bindings' + adios2 ffmpeg gdal + gl2ps glew hdf5 jsoncpp + libarchive + libharu + liblas lz4 netcdf + openimagedenoise + openvr + ospray pdal + postgresql + pugixml + proj sqlite unixodbc) -source=("${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz" - "${url}/files/release/${pkgver%.*}/VTKData-${pkgver}.tar.gz" - "${url}/files/release/${pkgver%.*}/VTKLargeData-${pkgver}.tar.gz" - vtk-python-3.8.patch::"https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch"; - vtk-gcc10.patch::"https://gitlab.kitware.com/vtk/vtk/-/commit/a9079bdc.patch"; - vtk-qt5.15.patch::"https://gitlab.kitware.com/vtk/vtk/-/commit/797f2869.patch"; - vtk-freetype-2.10.3.patch) +source=(${url}/files/release/${pkgver%.*}/VTK-${pkgver}.tar.gz + vtk-gcc11.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7554.patch + vtk-proj8-pre.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7299.patch + vtk-proj8.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7731.patch + vtk-hdf5-1.10-api.patch::https://gitlab.kitware.com/vtk/vtk/-/commit/2f4246682eb9545fd738a0f765bec8d50730e905.patch) options=(staticlibs) -sha512sums=('521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286' - '517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b' - '8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588' - '05a367dbb21c95f6e03e30c1c520357f60c54074d341b592de8161280c9b90e9e70c19f6b474921cc2f4d2ec17d08a2e76d7dc94c8cef111c72a241684a57b34' - 'b62127f078686f24501bc3ba2954bdcec846e7d7d1bdaf5f1b9d47ff86881035b81d6e065472228d46521a6ecafbc113adf3a8b8a97ab01a70fe88f47a971d3d' - 'ce4c8822ca4a18f0aa94991ea4df27b340e30ca38d8931cb2929c2226e8cb3a34b15c4ebe4fcb2fa5f940ab132ffe925fdef0236429face93a46d633f272c329' - '01df3947425b510f9c64e72ab2020b02f28141421ad29be94bf118cd7b56cc22702ae329db05bc336284d3edcf3b71d254de10a2784296c691447ee356c76683') +sha256sums=('bc3eb9625b2b8dbfecb6052a2ab091fc91405de4333b0ec68f3323815154ed8a' + 'c9959adcb59e2f2657f0144b0b68239d4174947fb2ab8051f2575241281e4d68' + '745b9e1523e2eb3f4f6366504d2436242300cc5bcdd2251a3434cbe53eb0bad9' + '2d3535827d1a6eeb20e16f4986f973a25dabf68b0139516bd2c7a0313901d06c' + '743c0e17d7ccd3dde869ed349c4a5bd3d7a08316ce5735dd0d1c11a4b92e62f3') prepare() { cd VTK-${pkgver} - - # Fix build with python 3.8 - patch -p1 -i ../vtk-python-3.8.patch - - # Fix build with GCC 10 - patch -d ThirdParty/exodusII/vtkexodusII -p1 -i "$srcdir"/vtk-gcc10.patch - sed -e 's|REGEX MATCH \"\[3-9\]|REGEX MATCH \"[1-9][0-9]|' -i CMake/VTKGenerateExportHeader.cmake - - # Fix build with Qt 5.15 - patch -p1 -i ../vtk-qt5.15.patch - - # Fix build with Java 12 - sed -i 's/VTK_JAVA_SOURCE_VERSION "1.6"/VTK_JAVA_SOURCE_VERSION "1.7"/ - s/VTK_JAVA_TARGET_VERSION "1.6"/VTK_JAVA_TARGET_VERSION "1.7"/' Wrapping/Java/CMakeLists.txt - - # Fix build with FreeType 2.10.3 - patch -p1 -i ../vtk-freetype-2.10.3.patch - - # Fix build with HDF5 1.12.1 + # We have a patched libharu + sed -i "s|2.4.0|2.3.0|" ThirdParty/libharu/CMakeLists.txt + # Missing includes with GCC11 + patch -p1 < ../vtk-gcc11.patch + # Fix build with proj 8.x + patch -p1 < ../vtk-proj8-pre.patch + patch -p1 < ../vtk-proj8.patch + # Fix build with HDF5 1.12.1, https://gitlab.kitware.com/vtk/vtk/-/issues/18265 + patch -p1 < ../vtk-hdf5-1.10-api.patch sed -i 's/typedef int hid_t;/typedef int64_t hid_t;/' ThirdParty/xdmf3/vtkxdmf3/core/XdmfHDF5Controller.hpp + # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8546 + sed -i 's/CACHE PATH "License files/CACHE STRING "License files/' CMakeLists.txt } build() { - # to help cmake find java + # To help cmake find java export JAVA_HOME=/usr/lib/jvm/default - - # GL2PS blocked by http://www.vtk.org/Bug/view.php?id=16083 - # LIBHARU blocked by https://github.com/libharu/libharu/pull/157 - # exodusII,kissfft,verdict,VPIC,xdmf2/3,zfp not packaged in Arch - # Note: VTK explicitly disables system GLEW dependency, it uses embedded sources with modifications - local VTK_USE_SYSTEM_LIB="" - # Common with ParaView - for lib in DOUBLECONVERSION EIGEN EXPAT FREETYPE GLEW HDF5 JPEG JSONCPP LIBXML2 LZ4 LZMA MPI4PY NETCDF OGG PNG THEORA TIFF ZLIB; do - VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}=ON " - done - for lib in SQLITE; do - VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}=ON " - done - + # To set tcl lib path local _tkver=$(echo 'puts $tcl_version' | tclsh) cmake -B build -S VTK-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_LICENSEDIR=share/licenses/vtk \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_DOCUMENTATION=OFF \ - -DDOXYGEN_KEEP_TEMP=ON \ - -DDOCUMENTATION_HTML_HELP=OFF \ - -DDOCUMENTATION_HTML_TARZ=OFF \ - -DBUILD_EXAMPLES=ON \ - -DXDMF_STATIC_AND_SHARED=OFF \ + -DVTK_BUILD_ALL_MODULES=ON \ + -DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \ + -DVTK_LEGACY_REMOVE=ON \ + -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \ + -DVTK_PYTHON_VERSION=3 \ -DVTK_USE_FFMPEG_ENCODER=ON \ - -DVTK_BUILD_ALL_MODULES=ON \ - -DModule_vtkIOPDAL=ON \ - -DVTK_USE_LARGE_DATA=ON \ - -DVTK_QT_VERSION="5" \ + -DVTK_USE_MPI=ON \ + -DVTK_USE_OGGTHEORA_ENCODER=ON \ + -DVTK_USE_TK=ON \ + -DVTK_VERSIONED_INSTALL=OFF \ -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=include/vtk \ - -DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \ - ${VTK_USE_SYSTEM_LIB} \ + -DVTK_USE_EXTERNAL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \ + -DOpenVR_INCLUDE_DIR=/usr/include/openvr/ \ + -DOpenVR_LIBRARY=/usr/lib/libopenvr_api.so \ + -DVTK_ENABLE_OSPRAY=OFF \ + -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy=NO \ + -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS=NO \ -Wno-dev +# OSPRAY 2.7 not supported +# -DVTKOSPRAY_ENABLE_DENOISER=ON \ make -C build } @@ -131,15 +121,10 @@ package() { make -C build DESTDIR="${pkgdir}" install - # Move the vtk.jar to the arch-specific location + # 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 license - 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 + mv -v "${pkgdir}"/usr/lib/java/vtk.jar "${pkgdir}"/usr/share/java/vtk + # …and the libs to the proper place + mv "${pkgdir}"/usr/lib/java/vtk-Linux-x86_64/*.so "${pkgdir}"/usr/lib/ + rmdir "${pkgdir}"/usr/lib/java/{vtk-Linux-x86_64/,} } Deleted: vtk-freetype-2.10.3.patch =================================================================== --- vtk-freetype-2.10.3.patch 2021-10-19 19:30:10 UTC (rev 1030995) +++ vtk-freetype-2.10.3.patch 2021-10-19 19:49:57 UTC (rev 1030996) @@ -1,18 +0,0 @@ -diff --git a/ThirdParty/freetype/vtk_freetype.h.in b/ThirdParty/freetype/vtk_freetype.h.in -index c3f6f4f3..fd525e55 100644 ---- a/ThirdParty/freetype/vtk_freetype.h.in -+++ b/ThirdParty/freetype/vtk_freetype.h.in -@@ -20,6 +20,13 @@ - - #ifdef VTK_USE_SYSTEM_FREETYPE - # include <ft2build.h> -+#ifndef FT_CALLBACK_DEF -+#ifdef __cplusplus -+#define FT_CALLBACK_DEF( x ) extern "C" x -+#else -+#define FT_CALLBACK_DEF( x ) static x -+#endif -+#endif /* FT_CALLBACK_DEF */ - #else - # include <vtkfreetype/include/ft2build.h> - #endif
