Date: Saturday, September 14, 2019 @ 13:03:01 Author: anthraxx Revision: 510532
archrelease: copy trunk to community-staging-x86_64 Added: paraview/repos/community-staging-x86_64/ paraview/repos/community-staging-x86_64/PKGBUILD (from rev 510531, paraview/trunk/PKGBUILD) paraview/repos/community-staging-x86_64/proj6.patch (from rev 510531, paraview/trunk/proj6.patch) -------------+ PKGBUILD | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ proj6.patch | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 217 insertions(+) Copied: paraview/repos/community-staging-x86_64/PKGBUILD (from rev 510531, paraview/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-09-14 13:03:01 UTC (rev 510532) @@ -0,0 +1,107 @@ +# Maintainer: Bruno Pagani <archa...@archlinux.org> +# Contributor: Oliver Goethel <deezy> +# Contributor: eolianoe eolianoe <eolianoe [at] gmail [DoT] com> +# Contributor: George Eleftheriou <eleftg> +# Contributor: Mathias Anselmann <mathias.anselm...@gmail.com> +# Contributor: Stéphane Gaudreault <steph...@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.6.2 +pkgrel=3 +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-matplotlib python-numpy + cgns protobuf python-pygments + 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) +# gl2ps +# netcdf-cxx libharu +# sqlite apparently not used in this VTK configuration +makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen pegtl) +source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.xz" + proj6.patch) +sha256sums=('1f3710b77c58a46891808dbe23dc59a1259d9c6b7bb123aaaeaa6ddf2be882ea' + '2271cf8b57a4251d04a5e6f48b05939f60131b5b9a7947c21f013af2cbe55e28') + +prepare() { + mkdir -p build + cd ParaView-v${pkgver}/VTK + patch -p1 -i ../../proj6.patch +} + +build() { + cd build + + # Flags to enable system libs in VTK building, as in VTK package + # GL2PS has non-upstreamed patches? + # KISSFFT is not packaged + # UTF8 (utfcpp) is not packaged (but present in AUR) + # VERDICT is not packaged + # ZFP is not packaged + # NETCDFCPP blocked by https://github.com/Unidata/netcdf-cxx4/issues/43 + # 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 ZLIB + do + VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " + done + # Specific system libs for ParaView version + for lib in CGNS PROTOBUF PYGMENTS + do + VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " + done + + cmake ../ParaView-v${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOSPRAY_INSTALL_DIR=/usr \ + -DPARAVIEW_ENABLE_FFMPEG=ON \ + -DPARAVIEW_ENABLE_GDAL=ON \ + -DPARAVIEW_ENABLE_MATPLOTLIB=ON \ + -DPARAVIEW_ENABLE_PDAL=ON \ + -DPARAVIEW_ENABLE_PYTHON=ON \ + -DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \ + -DPARAVIEW_USE_MPI=ON \ + -DPARAVIEW_USE_VISITBRIDGE=ON \ + -DPARAVIEW_USE_OSPRAY=ON \ + -DVISIT_BUILD_READER_CGNS=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 \ + -DModule_vtkGeovisCore=ON \ + -DModule_vtkGeovisGDAL=ON \ + -DModule_vtkIOGDAL=ON \ + -DModule_vtkIOPDAL=ON \ + ${VTK_USE_SYSTEM_LIB} \ + -GNinja + + ninja ${MAKEFLAGS} +} + +package() { + cd build + + DESTDIR="${pkgdir}" ninja install + + # Install license + install -Dm644 "${srcdir}"/ParaView-v${pkgver}/License_v1.2.txt "${pkgdir}"/usr/share/licenses/paraview/LICENSE + + # Remove IceT man pages to avoid conflicts + rm -- "${pkgdir}"/usr/share/man/man3/icet*.3 + rmdir "${pkgdir}"/usr/share/man/{man3/,} +} Copied: paraview/repos/community-staging-x86_64/proj6.patch (from rev 510531, paraview/trunk/proj6.patch) =================================================================== --- community-staging-x86_64/proj6.patch (rev 0) +++ community-staging-x86_64/proj6.patch 2019-09-14 13:03:01 UTC (rev 510532) @@ -0,0 +1,110 @@ +diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx +index f3a8852d94..824060348a 100644 +--- a/Geovis/Core/vtkGeoProjection.cxx ++++ b/Geovis/Core/vtkGeoProjection.cxx +@@ -72,6 +72,7 @@ public: + } + + std::map< std::string, std::string > OptionalParameters; ++ PJ_PROJ_INFO ProjInfo; + }; + + //----------------------------------------------------------------------------- +@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProjections() + if ( vtkGeoProjectionNumProj < 0 ) + { + vtkGeoProjectionNumProj = 0; +- for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj ) ++ for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj ) + ++ vtkGeoProjectionNumProj; + } + return vtkGeoProjectionNumProj; +@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProjectionName( int projection ) + if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) + return nullptr; + +- return pj_get_list_ref()[projection].id; ++ return proj_list_operations()[projection].id; + } + //----------------------------------------------------------------------------- + const char* vtkGeoProjection::GetProjectionDescription( int projection ) +@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProjectionDescription( int projection ) + if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections() ) + return nullptr; + +- return pj_get_list_ref()[projection].descr[0]; ++ return proj_list_operations()[projection].descr[0]; + } + //----------------------------------------------------------------------------- + vtkGeoProjection::vtkGeoProjection() +@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostream& os, vtkIndent indent ) + int vtkGeoProjection::GetIndex() + { + int i = 0; +- for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj, ++ i ) ++ for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++ proj, ++ i ) + { + if ( ! strcmp( proj->id, this->Name ) ) + { +@@ -161,7 +164,7 @@ const char* vtkGeoProjection::GetDescription() + { + return nullptr; + } +- return this->Projection->descr; ++ return this->Internals->ProjInfo.description; + } + //----------------------------------------------------------------------------- + projPJ vtkGeoProjection::GetProjection() +@@ -232,6 +239,7 @@ int vtkGeoProjection::UpdateProjection() + this->ProjectionMTime = this->GetMTime(); + if ( this->Projection ) + { ++ this->Internals->ProjInfo = proj_pj_info(this->Projection); + return 0; + } + return 1; +diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx +index aeeabc1075..b80a8c010c 100644 +--- a/Geovis/Core/vtkGeoTransform.cxx ++++ b/Geovis/Core/vtkGeoTransform.cxx +@@ -167,9 +167,9 @@ void vtkGeoTransform::InternalTransformPoints( double* x, vtkIdType numPts, int + double* coord = x; + for ( vtkIdType i = 0; i < numPts; ++ i ) + { +- xy.u = coord[0]; xy.v = coord[1]; ++ xy.x = coord[0]; xy.y = coord[1]; + lp = pj_inv( xy, src ); +- coord[0] = lp.u; coord[1] = lp.v; ++ coord[0] = lp.lam; coord[1] = lp.phi; + coord += stride; + } + } +@@ -191,9 +199,9 @@ void vtkGeoTransform::InternalTransformPoints( double* x, vtkIdType numPts, int + double* coord = x; + for ( vtkIdType i = 0; i < numPts; ++ i ) + { +- lp.u = coord[0]; lp.v = coord[1]; ++ lp.lam = coord[0]; lp.phi = coord[1]; + xy = pj_fwd( lp, dst ); +- coord[0] = xy.u; coord[1] = xy.v; ++ coord[0] = xy.x; coord[1] = xy.y; + coord += stride; + } + } +diff --git a/ThirdParty/libproj/vtk_libproj.h.in b/ThirdParty/libproj/vtk_libproj.h.in +index d52db07a95..4d8ffc3c5d 100644 +--- a/ThirdParty/libproj/vtk_libproj.h.in ++++ b/ThirdParty/libproj/vtk_libproj.h.in +@@ -18,7 +18,8 @@ + /* Use the libproj library configured for VTK. */ + #cmakedefine VTK_USE_SYSTEM_LIBPROJ + #ifdef VTK_USE_SYSTEM_LIBPROJ +-# include <projects.h> ++# include <proj.h> ++# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 + # include <proj_api.h> + # include <geodesic.h> + #else +-- +2.21.0 +