git: e37fa74b91c4 - main - math/pdal: Update to 2.6.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Loïc Bartoletti <lbartoletti_at_FreeBSD.org>
Date: Sat, 24 Feb 2024 05:24:09 UTC
The branch main has been updated by lbartoletti:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e37fa74b91c4f9efb32b2d9c83f68fbe43634315

commit e37fa74b91c4f9efb32b2d9c83f68fbe43634315
Author:     Bram Ton <bram@cbbg.nl>
AuthorDate: 2024-02-22 21:01:21 +0000
Commit:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2024-02-24 05:23:52 +0000

    math/pdal: Update to 2.6.3
    
    Use libpdalcpp instead of libpdal_base
    
    Release notes:
     - https://github.com/PDAL/PDAL/releases/tag/2.6.2
     - https://github.com/PDAL/PDAL/releases/tag/2.6.3
    
    PR:             276752
    Reported by:    Bram Ton <bram@cbbg.nl>
---
 databases/grass8/Makefile                 |  2 +-
 graphics/qgis/Makefile                    |  4 +--
 math/mdal/Makefile                        |  3 ++-
 math/pdal/Makefile                        | 10 +++----
 math/pdal/distinfo                        |  6 ++---
 math/pdal/files/patch-apps_CMakeLists.txt |  6 ++---
 math/pdal/pkg-plist                       | 44 +++++++++++++++++++++----------
 math/py-pdal/Makefile                     |  4 +--
 8 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/databases/grass8/Makefile b/databases/grass8/Makefile
index 301c98314caf..0d60577348a3 100644
--- a/databases/grass8/Makefile
+++ b/databases/grass8/Makefile
@@ -106,7 +106,7 @@ NLS_USES=		gettext
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_WITH=	odbc
 PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
-PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
+PDAL_LIB_DEPENDS=	libpdalcpp.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index f0fb6745ac25..01fb4937bfd8 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qgis
 DISTVERSION=	3.34.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
@@ -43,7 +43,7 @@ LIB_DEPENDS=	libdraco.so:archivers/draco \
 		libmdal.so:math/mdal \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
-		libpdal_base.so:math/pdal \
+		libpdalcpp.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
diff --git a/math/mdal/Makefile b/math/mdal/Makefile
index 28aa5edb8932..a4a6af1b0485 100644
--- a/math/mdal/Makefile
+++ b/math/mdal/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mdal
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	math geography
 
 MAINTAINER=	wen@FreeBSD.org
@@ -11,7 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/gtest/gtest.h:devel/googletest
-LIB_DEPENDS=	libpdal_base.so:math/pdal \
+LIB_DEPENDS=	libpdalcpp.so:math/pdal \
 		libnetcdf.so:science/netcdf \
 		libsqlite3.so:databases/sqlite3 \
 		libgdal.so:graphics/gdal \
diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index 77a69e1637b2..2c805f6532e4 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	pdal
-DISTVERSION=	2.5.4
-PORTREVISION=	1
+DISTVERSION=	2.6.3
 CATEGORIES=	math databases graphics
 MASTER_SITES=	https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library for translating and manipulating point cloud data
-WWW=		https://www.pdal.io/
+WWW=		https://www.pdal.io
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -15,6 +14,7 @@ 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 \
@@ -70,9 +70,7 @@ PGPOINTCLOUD_USES=	pgsql
 
 CXXFLAGS_powerpc64=	-mvsx
 
-post-install-BASH-on:
+pre-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
-	${INSTALL_DATA} ${WRKSRC}/scripts/bash-completion/pdal \
-		${STAGEDIR}${PREFIX}/share/bash-completion/completions
 
 .include <bsd.port.mk>
diff --git a/math/pdal/distinfo b/math/pdal/distinfo
index 1b179d0008d0..a5eaccb84935 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 = 1708719688
+SHA256 (pdal-2.6.3-src.tar.bz2) = e4d90a3ce4c9681cd3522ca29e73a88ff3b3c713f918693ad03932a6b7680460
+SIZE (pdal-2.6.3-src.tar.bz2) = 87274788
diff --git a/math/pdal/files/patch-apps_CMakeLists.txt b/math/pdal/files/patch-apps_CMakeLists.txt
index 89a1f701e5ef..ac6928d98ed8 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/pkg-plist b/math/pdal/pkg-plist
index e5fec3466730..73d81b1a5455 100644
--- a/math/pdal/pkg-plist
+++ b/math/pdal/pkg-plist
@@ -76,6 +76,7 @@ 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/GroupByFilter.hpp
@@ -121,6 +122,7 @@ include/pdal/filters/SkewnessBalancingFilter.hpp
 include/pdal/filters/SortFilter.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 +145,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 +165,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 +176,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 +185,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 +212,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 +246,20 @@ 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/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/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 +275,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 +321,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.16
+lib/libpdal_plugin_kernel_fauxplugin.so.16.3.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.16
+%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.16.3.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.16
+%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.16.3.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.16
+%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.16.3.0
 lib/libpdalcpp.so
+lib/libpdalcpp.so.16
+lib/libpdalcpp.so.16.3.0
 libdata/pkgconfig/pdal.pc
 %%BASH%%share/bash-completion/completions/pdal
 @dir include/pdal/filters/private/csf
diff --git a/math/py-pdal/Makefile b/math/py-pdal/Makefile
index abfa36e6efb5..be82b31412ca 100644
--- a/math/py-pdal/Makefile
+++ b/math/py-pdal/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pdal
 DISTVERSION=	3.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>0:devel/py-scikit-build@${PY_FLAVOR} \
 		${PREFIX}/share/cmake/pybind11/pybind11Config.cmake:devel/pybind11 \
 		cmake:devel/cmake-core
-LIB_DEPENDS=	libpdal_base.so:math/pdal
+LIB_DEPENDS=	libpdalcpp.so:math/pdal
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYNUMPY}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}