Date: Thursday, April 22, 2021 @ 11:37:28 Author: bgyorgy Revision: 920901
upgpkg: vtk 8.2.0-18: Rebuild for gdal 3.2.2, use internal pegtl, proj and pugixml Modified: vtk/trunk/PKGBUILD Deleted: vtk/trunk/proj6.patch -------------+ PKGBUILD | 23 ++++-------- proj6.patch | 110 ---------------------------------------------------------- 2 files changed, 8 insertions(+), 125 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-22 11:36:57 UTC (rev 920900) +++ PKGBUILD 2021-04-22 11:37:28 UTC (rev 920901) @@ -6,7 +6,7 @@ pkgname=vtk pkgver=8.2.0 -pkgrel=17 +pkgrel=18 pkgdesc="A software system for 3D computer graphics, image processing, and visualization" arch=(x86_64) url="https://www.vtk.org/" @@ -17,8 +17,8 @@ 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 pegtl libpng pugixml libtheora libtiff zlib - proj sqlite) + libogg pdal libpng libtheora libtiff zlib + sqlite) optdepends=('gnuplot: plotting tools' 'graphviz: drawing tools' 'java-runtime: java bindings' @@ -37,14 +37,11 @@ lz4 netcdf pdal - 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" - proj6.patch 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" @@ -53,18 +50,14 @@ sha512sums=('521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286' '517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b' '8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588' - 'bd095a848c198752307d6924eaa46d07af4fbbba70f4665e10c8b5dd8d2a84cb6d9ea6c25705463a6c054c5afa5af4c68030ad90d37953672c0fc609eaf24b07' - '9b85600812b6caf5007cdaeff34a504fa706bd0e1412dd306f8424b39edde430d8eedddcb53ce987afb6799ffc571f3fb9de80106324782e9d5b37947e92dcd6' - '5432ae62773377301a6709de0b789b1d5a459e467e4796b3d275c8a1cec6962fd8ebf404f8f11ed63a8d525c2d5a8dd163080d8fd3e483f3a5e06739133acd8f' - 'a82df18ed019fe798b740c707e6511ea28b200ddd887054346508ead0aa91a847de15aa5f668c9cb87792424d2ead3600e59f7acc76e003477bc5f630cbbadaa' + '05a367dbb21c95f6e03e30c1c520357f60c54074d341b592de8161280c9b90e9e70c19f6b474921cc2f4d2ec17d08a2e76d7dc94c8cef111c72a241684a57b34' + 'b62127f078686f24501bc3ba2954bdcec846e7d7d1bdaf5f1b9d47ff86881035b81d6e065472228d46521a6ecafbc113adf3a8b8a97ab01a70fe88f47a971d3d' + 'ce4c8822ca4a18f0aa94991ea4df27b340e30ca38d8931cb2929c2226e8cb3a34b15c4ebe4fcb2fa5f940ab132ffe925fdef0236429face93a46d633f272c329' '01df3947425b510f9c64e72ab2020b02f28141421ad29be94bf118cd7b56cc22702ae329db05bc336284d3edcf3b71d254de10a2784296c691447ee356c76683') prepare() { cd VTK-${pkgver} - # Fix build with proj 6.0 - patch -Np1 -i ../proj6.patch - # Fix build with python 3.8 patch -p1 -i ../vtk-python-3.8.patch @@ -93,10 +86,10 @@ # 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 PEGTL PNG PUGIXML THEORA TIFF ZLIB; do + 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 LIBPROJ SQLITE; do + for lib in SQLITE; do VTK_USE_SYSTEM_LIB+="-DVTK_USE_SYSTEM_${lib}=ON " done Deleted: proj6.patch =================================================================== --- proj6.patch 2021-04-22 11:36:57 UTC (rev 920900) +++ proj6.patch 2021-04-22 11:37:28 UTC (rev 920901) @@ -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 -