[arch-commits] Commit in paraview/trunk (PKGBUILD proj6.patch)
Bruno Pagani
archange at archlinux.org
Mon Oct 7 07:51:45 UTC 2019
Date: Monday, October 7, 2019 @ 07:51:44
Author: archange
Revision: 513686
Update to 5.7.0, part 1
Fixed calls to the new module system, but it does not build yet.
Modified:
paraview/trunk/PKGBUILD
Deleted:
paraview/trunk/proj6.patch
-------------+
PKGBUILD | 56 ++++++++++++-----------------
proj6.patch | 110 ----------------------------------------------------------
2 files changed, 24 insertions(+), 142 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-07 07:47:20 UTC (rev 513685)
+++ PKGBUILD 2019-10-07 07:51:44 UTC (rev 513686)
@@ -13,31 +13,27 @@
_mpi=openmpi
pkgname=${_pkg}
#-${_mpi}
-pkgver=5.6.2
-pkgrel=3
+pkgver=5.7.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-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)
+depends=(boost-libs qt5-tools qt5-x11extras 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)
# gl2ps
-# netcdf-cxx libharu
+# 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')
+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")
+sha256sums=('e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874')
prepare() {
mkdir -p build
- cd ParaView-v${pkgver}/VTK
- patch -p1 -i ../../proj6.patch
}
build() {
@@ -44,39 +40,35 @@
cd build
# Flags to enable system libs in VTK building, as in VTK package
- # GL2PS has non-upstreamed patches?
+ # 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
+ 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
do
- VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+ VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_vtk${lib}:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_${lib}:BOOL=ON "
done
# Specific system libs for ParaView version
- for lib in CGNS PROTOBUF PYGMENTS
+ for lib in cgns protobuf
do
- VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+ VTK_USE_SYSTEM_LIB+="-DVTK_MODULE_USE_EXTERNAL_ParaView_${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_ENABLE_VISITBRIDGE=ON \
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON \
-DPARAVIEW_USE_MPI=ON \
- -DPARAVIEW_USE_VISITBRIDGE=ON \
- -DPARAVIEW_USE_OSPRAY=ON \
- -DVISIT_BUILD_READER_CGNS=ON \
+ -DPARAVIEW_USE_RAYTRACING=ON \
+ -DVTK_ENABLE_OSPRAY=ON \
-DVTK_PYTHON_FULL_THREADSAFE=ON \
-DVTK_PYTHON_VERSION=3 \
-DVTK_SMP_IMPLEMENTATION_TYPE=TBB \
@@ -83,10 +75,10 @@
-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 \
+ -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
Deleted: proj6.patch
===================================================================
--- proj6.patch 2019-10-07 07:47:20 UTC (rev 513685)
+++ proj6.patch 2019-10-07 07:51:44 UTC (rev 513686)
@@ -1,110 +0,0 @@
-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
-
More information about the arch-commits
mailing list