Date: Friday, October 1, 2021 @ 21:02:21
Author: archange
Revision: 1026598
archrelease: copy trunk to community-staging-x86_64
Added:
paraview/repos/community-staging-x86_64/PKGBUILD
(from rev 1026597, paraview/trunk/PKGBUILD)
Deleted:
paraview/repos/community-staging-x86_64/PKGBUILD
paraview/repos/community-staging-x86_64/vtk-comp-missing-includes.patch
---------------------------------+
PKGBUILD | 146 +++++++++++++++++++-------------------
vtk-comp-missing-includes.patch | 60 ---------------
2 files changed, 75 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-01 21:01:55 UTC (rev 1026597)
+++ PKGBUILD 2021-10-01 21:02:21 UTC (rev 1026598)
@@ -1,71 +0,0 @@
-# Maintainer: Bruno Pagani <archa...@archlinux.org>
-# Maintainer: Mathieu Westphal <mathieu.westp...@kitware.com>
-# Contributor: Stéphane Gaudreault <steph...@archlinux.org>
-# Contributor: <xantare...@hotmail.com>
-
-_pkg=paraview
-_mpi=openmpi
-pkgname=${_pkg}
-#-${_mpi}
-pkgver=5.9.1
-pkgrel=4
-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 qt5-svg intel-tbb openmpi ffmpeg
- adios2 liblas ospray pdal python-numpy cgns protobuf
- double-conversion expat freetype2 gdal gl2ps glew hdf5 libjpeg jsoncpp
- libjsoncpp.so libharu libxml2 lz4 xz python-mpi4py netcdf libogg
- libpng pugixml libtheora libtiff zlib)
-optdepends=(python-matplotlib python-pandas)
-makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns
eigen utf8cpp)
-# pegtl https://gitlab.kitware.com/vtk/vtk/-/issues/18151
-conflicts=(vtk)
-source=(${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz
- vtk-comp-missing-includes.patch)
-sha256sums=('0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d'
- 'c400753e386601008a2ed0269a58be76f06cc3c084f2dd48e87f6f04e8eca77f')
-
-prepare() {
- cd ParaView-v${pkgver/R/-R}
- # We have a patched libharu
- sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
- # Missing includes with GCC11
- patch -p1 -d VTK <../vtk-comp-missing-includes.patch
- # Fix build with HDF5 1.12.1,
https://gitlab.kitware.com/vtk/vtk/-/issues/18265
- sed -i 's/typedef int hid_t;/typedef int64_t hid_t;/'
VTK/ThirdParty/xdmf3/vtkxdmf3/core/XdmfHDF5Controller.hpp
-}
-
-build() {
- # LICENSEDIR blocked by https://gitlab.kitware.com/vtk/vtk/-/issues/18266
- cmake -B build -S ParaView-v${pkgver/R/-R} -G Ninja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_INSTALL_RPATH=ON \
- -DPARAVIEW_ENABLE_ADIOS2=ON \
- -DPARAVIEW_ENABLE_FFMPEG=ON \
- -DPARAVIEW_ENABLE_FIDES=ON \
- -DPARAVIEW_ENABLE_GDAL=ON \
- -DPARAVIEW_ENABLE_LAS=ON \
- -DPARAVIEW_ENABLE_MOTIONFX=ON \
- -DPARAVIEW_ENABLE_PDAL=ON \
- -DPARAVIEW_ENABLE_RAYTRACING=ON \
- -DPARAVIEW_ENABLE_VISITBRIDGE=ON \
- -DPARAVIEW_ENABLE_XDMF3=ON \
- -DPARAVIEW_USE_MPI=ON \
- -DPARAVIEW_USE_PYTHON=ON \
- -DPARAVIEW_VERSIONED_INSTALL=OFF \
- -DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
- -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
- -DVTKm_ENABLE_MPI=ON \
- -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
- -Wno-dev
- ninja -C build ${MAKEFLAGS}
-}
-
-package() {
- DESTDIR="${pkgdir}" ninja -C build install
- # Fix licenses install
- mv "${pkgdir}"/usr/share/licenses/{ParaView,paraview}
-}
Copied: paraview/repos/community-staging-x86_64/PKGBUILD (from rev 1026597,
paraview/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-01 21:02:21 UTC (rev 1026598)
@@ -0,0 +1,75 @@
+# Maintainer: Bruno Pagani <archa...@archlinux.org>
+# Maintainer: Mathieu Westphal <mathieu.westp...@kitware.com>
+# Contributor: Stéphane Gaudreault <steph...@archlinux.org>
+# Contributor: <xantare...@hotmail.com>
+
+_pkg=paraview
+_mpi=openmpi
+pkgname=${_pkg}
+#-${_mpi}
+pkgver=5.9.1
+pkgrel=5
+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 qt5-svg intel-tbb openmpi ffmpeg
+ adios2 liblas ospray pdal python-numpy cgns protobuf
+ double-conversion expat freetype2 gdal gl2ps glew hdf5 libjpeg jsoncpp
+ libjsoncpp.so libharu libxml2 lz4 xz python-mpi4py netcdf libogg
+ libpng pugixml rapidjson libtheora libtiff zlib)
+optdepends=(python-matplotlib python-pandas)
+makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns
eigen utf8cpp)
+# pegtl https://gitlab.kitware.com/vtk/vtk/-/issues/18151
+conflicts=(vtk)
+source=(${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz
+
vtk-gcc11.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7554.patch
+
vtk-fix-shader-initialization.patch::https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7978.patch)
+sha256sums=('0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d'
+ 'c9959adcb59e2f2657f0144b0b68239d4174947fb2ab8051f2575241281e4d68'
+ '10864f69e2d6577c56cc536438b5dd7a52b004f6bb253a17569899922d804fe8')
+
+prepare() {
+ cd ParaView-v${pkgver/R/-R}
+ # We have a patched libharu
+ sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
+ # Missing includes with GCC11
+ patch -p1 -d VTK < ../vtk-gcc11.patch
+ # FS#71081
+ patch -p1 -d VTK < ../vtk-fix-shader-initialization.patch
+ # Fix build with HDF5 1.12.1,
https://gitlab.kitware.com/vtk/vtk/-/issues/18265
+ sed -i 's/typedef int hid_t;/typedef int64_t hid_t;/'
VTK/ThirdParty/xdmf3/vtkxdmf3/core/XdmfHDF5Controller.hpp
+}
+
+build() {
+ # LICENSEDIR blocked by https://gitlab.kitware.com/vtk/vtk/-/issues/18266
+ cmake -B build -S ParaView-v${pkgver/R/-R} -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
+ -DPARAVIEW_ENABLE_ADIOS2=ON \
+ -DPARAVIEW_ENABLE_FFMPEG=ON \
+ -DPARAVIEW_ENABLE_FIDES=ON \
+ -DPARAVIEW_ENABLE_GDAL=ON \
+ -DPARAVIEW_ENABLE_LAS=ON \
+ -DPARAVIEW_ENABLE_MOTIONFX=ON \
+ -DPARAVIEW_ENABLE_PDAL=ON \
+ -DPARAVIEW_ENABLE_RAYTRACING=ON \
+ -DPARAVIEW_ENABLE_VISITBRIDGE=ON \
+ -DPARAVIEW_ENABLE_XDMF3=ON \
+ -DPARAVIEW_USE_MPI=ON \
+ -DPARAVIEW_USE_PYTHON=ON \
+ -DPARAVIEW_VERSIONED_INSTALL=OFF \
+ -DPARAVIEW_BUILD_WITH_EXTERNAL=ON \
+ -DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
+ -DVTKm_ENABLE_MPI=ON \
+ -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF \
+ -Wno-dev
+ ninja -C build ${MAKEFLAGS}
+}
+
+package() {
+ DESTDIR="${pkgdir}" ninja -C build install
+ # Fix licenses install
+ mv "${pkgdir}"/usr/share/licenses/{ParaView,paraview}
+}
Deleted: vtk-comp-missing-includes.patch
===================================================================
--- vtk-comp-missing-includes.patch 2021-10-01 21:01:55 UTC (rev 1026597)
+++ vtk-comp-missing-includes.patch 2021-10-01 21:02:21 UTC (rev 1026598)
@@ -1,60 +0,0 @@
-From e066c3f4fbbfe7470c6207db0fc3f3952db633cb Mon Sep 17 00:00:00 2001
-From: Mark Olesen <mark.ole...@esi-group.com>
-Date: Tue, 9 Feb 2021 15:19:10 +0100
-Subject: [PATCH] COMP: missing includes (clang)
-
----
- Common/Core/vtkGenericDataArrayLookupHelper.h | 1 +
- Common/DataModel/vtkPiecewiseFunction.cxx | 1 +
- Filters/HyperTree/vtkHyperTreeGridThreshold.cxx | 1 +
- Rendering/Core/vtkColorTransferFunction.cxx | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h
b/Common/Core/vtkGenericDataArrayLookupHelper.h
-index ab9d57248f8..202aaa27f4a 100644
---- a/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ b/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
-
-diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx
b/Common/DataModel/vtkPiecewiseFunction.cxx
-index 22eca0bc22e..11086f1dc42 100644
---- a/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ b/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
-diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-index a16bb27fc66..1052192c616 100644
---- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -27,6 +27,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
-
- #include <cmath>
-+#include <limits>
-
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
-
-diff --git a/Rendering/Core/vtkColorTransferFunction.cxx
b/Rendering/Core/vtkColorTransferFunction.cxx
-index 55c046b4df7..1be02919ab9 100644
---- a/Rendering/Core/vtkColorTransferFunction.cxx
-+++ b/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
-
