From 5829f010de4a5204abc214971ee25c3064afe806 Mon Sep 17 00:00:00 2001 From: Lucas Holt Date: Fri, 24 Jan 2025 13:21:30 -0500 Subject: [PATCH] math/pdal: 2.7.2 --- math/pdal/Makefile | 9 ++-- math/pdal/distinfo | 6 +-- math/pdal/files/patch-CMakeLists.txt | 11 +++++ math/pdal/files/patch-apps_CMakeLists.txt | 6 +-- math/pdal/files/patch-vendor_kazhdan_Ply.h | 20 ++++++++ .../files/patch-vendor_kazhdan_SparseMatrix.h | 11 +++++ .../patch-vendor_kazhdan_SparseMatrix.inl | 16 ++++++ math/pdal/pkg-plist | 49 +++++++++++++------ 8 files changed, 104 insertions(+), 24 deletions(-) create mode 100644 math/pdal/files/patch-CMakeLists.txt create mode 100644 math/pdal/files/patch-vendor_kazhdan_Ply.h create mode 100644 math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h create mode 100644 math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl diff --git a/math/pdal/Makefile b/math/pdal/Makefile index 27482d1150..c0e422989f 100644 --- a/math/pdal/Makefile +++ b/math/pdal/Makefile @@ -1,6 +1,6 @@ PORTNAME= pdal -DISTVERSION= 2.5.4 -PORTREVISION= 1 +DISTVERSION= 2.7.2 +PORTREVISION= 0 CATEGORIES= math databases graphics MASTER_SITES= https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-src @@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ + libproj.so:graphics/proj \ libboost_thread.so:devel/boost-libs \ libcurl.so:ftp/curl \ libgeotiff.so:graphics/libgeotiff \ - libxml2.so:textproc/libxml2 \ liblaszip.so:archivers/laszip \ libzstd.so:archivers/zstd \ ${LIB_DEPENDS_${ARCH}} @@ -29,7 +29,8 @@ LIB_DEPENDS_i386= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind -USES= cmake compiler:c++11-lib pathfix pkgconfig ssl tar:bz2 +USES= cmake compiler:c++11-lib gnome pathfix pkgconfig ssl tar:bz2 +USE_GNOME= libxml2 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME:tu}-${DISTVERSION}-src diff --git a/math/pdal/distinfo b/math/pdal/distinfo index 1b179d0008..8e69bae045 100644 --- a/math/pdal/distinfo +++ b/math/pdal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685775042 -SHA256 (pdal-2.5.4-src.tar.bz2) = db9231cfe3d5199075aca6e479a3b9fced1d090a300bddc938717398d3e58c4b -SIZE (pdal-2.5.4-src.tar.bz2) = 102720071 +TIMESTAMP = 1724912712 +SHA256 (pdal-2.7.2-src.tar.bz2) = f6ae0f3dc012b19c70dde2361799ecac0cdcbeb9cad5cfd96313c9fdc8608f32 +SIZE (pdal-2.7.2-src.tar.bz2) = 87431434 diff --git a/math/pdal/files/patch-CMakeLists.txt b/math/pdal/files/patch-CMakeLists.txt new file mode 100644 index 0000000000..48d4547b63 --- /dev/null +++ b/math/pdal/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2024-08-29 07:07:08 UTC ++++ CMakeLists.txt +@@ -356,7 +356,7 @@ install(DIRECTORY ${PDAL_FILTERS_DIR}/ + # PATTERN "private" EXCLUDE + ) + +-install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp}/ ++install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/pdal" + PERMISSIONS + GROUP_EXECUTE WORLD_EXECUTE OWNER_EXECUTE diff --git a/math/pdal/files/patch-apps_CMakeLists.txt b/math/pdal/files/patch-apps_CMakeLists.txt index 89a1f701e5..ac6928d98e 100644 --- a/math/pdal/files/patch-apps_CMakeLists.txt +++ b/math/pdal/files/patch-apps_CMakeLists.txt @@ -1,6 +1,6 @@ ---- apps/CMakeLists.txt.orig 2018-05-22 16:03:21 UTC +--- apps/CMakeLists.txt.orig 2024-01-31 13:44:27 UTC +++ apps/CMakeLists.txt -@@ -67,7 +67,7 @@ file(MAKE_DIRECTORY "${PDAL_OUTPUT_LIB_D +@@ -62,7 +62,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pdal.pc.in ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc @@ -8,4 +8,4 @@ + DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) - if(UNIX OR APPLE) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.in" diff --git a/math/pdal/files/patch-vendor_kazhdan_Ply.h b/math/pdal/files/patch-vendor_kazhdan_Ply.h new file mode 100644 index 0000000000..2ec2a38292 --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_Ply.h @@ -0,0 +1,20 @@ +--- vendor/kazhdan/Ply.h.orig 2024-06-29 01:37:43 UTC ++++ vendor/kazhdan/Ply.h +@@ -317,7 +317,7 @@ class PlyOrientedVertex (public) + PlyOrientedVertex( void ) { ; } + PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; } + PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); } +- PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); } ++ PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); } + template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); } + template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); } + PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; } +@@ -363,7 +363,7 @@ class PlyColorVertex (public) + } + + _PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); } +- _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); } ++ _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); } + template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); } + template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); } + _PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; } diff --git a/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h new file mode 100644 index 0000000000..9152361e68 --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.h @@ -0,0 +1,11 @@ +--- vendor/kazhdan/SparseMatrix.h.orig 2024-06-29 01:37:43 UTC ++++ vendor/kazhdan/SparseMatrix.h +@@ -67,8 +67,6 @@ template class SparseMatrix (public) + SparseMatrix( const SparseMatrix& M ); + ~SparseMatrix(); + +- void SetZero(); +- + SparseMatrix& operator = (const SparseMatrix& M); + + SparseMatrix operator * (const T& V) const; diff --git a/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl new file mode 100644 index 0000000000..c8aa440a1b --- /dev/null +++ b/math/pdal/files/patch-vendor_kazhdan_SparseMatrix.inl @@ -0,0 +1,16 @@ +--- vendor/kazhdan/SparseMatrix.inl.orig 2024-06-29 01:37:43 UTC ++++ vendor/kazhdan/SparseMatrix.inl +@@ -188,13 +188,6 @@ void SparseMatrix< T >::SetRowSize( int row , int coun + } + } + +- +-template +-void SparseMatrix::SetZero() +-{ +- Resize(this->m_N, this->m_M); +-} +- + template + SparseMatrix SparseMatrix::operator * (const T& V) const + { diff --git a/math/pdal/pkg-plist b/math/pdal/pkg-plist index e5fec34667..5bd43291ee 100644 --- a/math/pdal/pkg-plist +++ b/math/pdal/pkg-plist @@ -76,9 +76,12 @@ include/pdal/filters/FaceRasterFilter.hpp include/pdal/filters/FarthestPointSamplingFilter.hpp include/pdal/filters/FerryFilter.hpp include/pdal/filters/GeomDistanceFilter.hpp +include/pdal/filters/GeoreferenceFilter.hpp include/pdal/filters/GpsTimeConvert.hpp include/pdal/filters/GreedyProjection.hpp +include/pdal/filters/GridDecimationFilter.hpp include/pdal/filters/GroupByFilter.hpp +include/pdal/filters/H3Filter.hpp include/pdal/filters/HagDelaunayFilter.hpp include/pdal/filters/HagDemFilter.hpp include/pdal/filters/HagNnFilter.hpp @@ -119,8 +122,10 @@ include/pdal/filters/SeparateScanLineFilter.hpp include/pdal/filters/ShellFilter.hpp include/pdal/filters/SkewnessBalancingFilter.hpp include/pdal/filters/SortFilter.hpp +include/pdal/filters/SparseSurfaceFilter.hpp include/pdal/filters/SplitterFilter.hpp include/pdal/filters/StatsFilter.hpp +include/pdal/filters/StraightenFilter.hpp include/pdal/filters/StreamCallbackFilter.hpp include/pdal/filters/TailFilter.hpp include/pdal/filters/TransformationFilter.hpp @@ -143,6 +148,9 @@ include/pdal/filters/private/expr/Lexer.hpp include/pdal/filters/private/expr/MathExpression.hpp include/pdal/filters/private/expr/MathParser.hpp include/pdal/filters/private/expr/Token.hpp +include/pdal/filters/private/georeference/LocalCartesian.hpp +include/pdal/filters/private/georeference/Trajectory.hpp +include/pdal/filters/private/georeference/Utils.hpp include/pdal/filters/private/hexer/HexGrid.hpp include/pdal/filters/private/hexer/HexInfo.hpp include/pdal/filters/private/hexer/HexIter.hpp @@ -160,6 +168,8 @@ include/pdal/filters/private/pnp/Comparison.hpp include/pdal/filters/private/pnp/Grid.hpp include/pdal/filters/private/pnp/GridPnp.hpp include/pdal/filters/private/pnp/VoxelRayTrace.hpp +include/pdal/filters/private/straighten/Polyline.hpp +include/pdal/filters/private/straighten/Utils.hpp include/pdal/io/BpfCompressor.hpp include/pdal/io/BpfHeader.hpp include/pdal/io/BpfReader.hpp @@ -169,6 +179,7 @@ include/pdal/io/CopcReader.hpp include/pdal/io/CopcWriter.hpp include/pdal/io/EptAddonWriter.hpp include/pdal/io/EptReader.hpp +include/pdal/io/EsriReader.hpp include/pdal/io/FauxReader.hpp include/pdal/io/FbiHeader.hpp include/pdal/io/FbiReader.hpp @@ -177,6 +188,7 @@ include/pdal/io/GDALReader.hpp include/pdal/io/GDALWriter.hpp include/pdal/io/GltfWriter.hpp include/pdal/io/HeaderVal.hpp +include/pdal/io/I3SReader.hpp include/pdal/io/Ilvis2MetadataReader.hpp include/pdal/io/Ilvis2Reader.hpp include/pdal/io/LasHeader.hpp @@ -203,6 +215,7 @@ include/pdal/io/SbetCommon.hpp include/pdal/io/SbetReader.hpp include/pdal/io/SbetSmrmsgReader.hpp include/pdal/io/SbetWriter.hpp +include/pdal/io/SlpkReader.hpp include/pdal/io/StacReader.hpp include/pdal/io/TIndexReader.hpp include/pdal/io/TerrasolidReader.hpp @@ -236,12 +249,22 @@ include/pdal/io/private/ept/Key.hpp include/pdal/io/private/ept/Overlap.hpp include/pdal/io/private/ept/TileContents.hpp include/pdal/io/private/ept/VectorPointTable.hpp +include/pdal/io/private/esri/EsriUtil.hpp +include/pdal/io/private/esri/Obb.hpp +include/pdal/io/private/esri/PageManager.hpp +include/pdal/io/private/las/ChunkInfo.hpp include/pdal/io/private/las/Geotiff.hpp include/pdal/io/private/las/Header.hpp include/pdal/io/private/las/Srs.hpp include/pdal/io/private/las/Summary.hpp +include/pdal/io/private/las/Tile.hpp include/pdal/io/private/las/Utils.hpp include/pdal/io/private/las/Vlr.hpp +include/pdal/io/private/stac/Catalog.hpp +include/pdal/io/private/stac/Collection.hpp +include/pdal/io/private/stac/Item.hpp +include/pdal/io/private/stac/ItemCollection.hpp +include/pdal/io/private/stac/Utils.hpp include/pdal/kernels/ChamferKernel.hpp include/pdal/kernels/DeltaKernel.hpp include/pdal/kernels/DensityKernel.hpp @@ -257,7 +280,9 @@ include/pdal/kernels/SplitKernel.hpp include/pdal/kernels/TIndexKernel.hpp include/pdal/kernels/TileKernel.hpp include/pdal/kernels/TranslateKernel.hpp +include/pdal/kernels/private/PointlessLas.hpp include/pdal/kernels/private/density/OGR.hpp +include/pdal/kernels/private/stac/StacInfo.hpp include/pdal/pdal.hpp include/pdal/pdal_config.hpp include/pdal/pdal_export.hpp @@ -301,25 +326,21 @@ lib/cmake/PDAL/PDALConfigVersion.cmake lib/cmake/PDAL/PDALTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/PDAL/PDALTargets.cmake lib/cmake/PDAL/pluginmacros.cmake -lib/libpdal_base.so -lib/libpdal_base.so.15 -lib/libpdal_base.so.15.4.0 lib/libpdal_plugin_kernel_fauxplugin.so -lib/libpdal_plugin_kernel_fauxplugin.so.15 -lib/libpdal_plugin_kernel_fauxplugin.so.15.4.0 +lib/libpdal_plugin_kernel_fauxplugin.so.17 +lib/libpdal_plugin_kernel_fauxplugin.so.17.1.0 %%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so -%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.15 -%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.15.4.0 +%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.17 +%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.17.1.0 %%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so -%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.15 -%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.15.4.0 +%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.17 +%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.17.1.0 %%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so -%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.15 -%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.15.4.0 -lib/libpdal_util.so -lib/libpdal_util.so.15 -lib/libpdal_util.so.15.4.0 +%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.17 +%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.17.1.0 lib/libpdalcpp.so +lib/libpdalcpp.so.17 +lib/libpdalcpp.so.17.1.0 libdata/pkgconfig/pdal.pc %%BASH%%share/bash-completion/completions/pdal @dir include/pdal/filters/private/csf