Update to 2.5.2

from upstream #3966, to be removed with PDAL 2.5.1

.gitignore

@@ -1 +1,10 @@
 /PDAL-2.1.0-src.tar.gz
+/PDAL-2.2.0-src.tar.gz
+/PDAL-2.3.0-src.tar.gz
+/PDAL-2.4.0-src.tar.gz
+/PDAL-2.4.1-src.tar.gz
+/PDAL-2.4.2-src.tar.gz
+/PDAL-2.4.3-src.tar.gz
+/PDAL-2.5.0-src.tar.gz
+/PDAL-2.5.1-src.tar.gz
+/PDAL-2.5.2-src.tar.gz

PDAL.spec

@@ -1,14 +1,22 @@
+%global __cmake_in_source_build 1
+
+# BZ 1996330
+%ifarch ppc64le
+%global _lto_cflags %nil
+%endif
+
 Summary:	Point Data Abstraction Library
 Name:		PDAL
-Version:	2.1.0
-Release:	8%{?dist}
+# NOTE: Re-verifiy test exclusions in %%check when updating
+Version:	2.5.2
+Release:	1%{?dist}
 # The code is licensed BSD except for:
 # - filters/private/csf/* and plugins/i3s/lepcc/* are ASL 2.0
 # - vendor/arbiter/*, plugins/nitf/io/nitflib.h and plugins/oci/io/OciWrapper.* are Expat/MIT
 # - plugins/e57/libE57Format/{src,include}/* is Boost
-License:	BSD and ASL 2.0 and MIT and Boost
-Source:		https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-src.tar.gz
+License:	BSD-3-Clause AND Apache-2.0 AND MIT AND BSL-1.0
 URL:		https://www.pdal.io
+Source:		https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-src.tar.gz
 # commented out due to size (320 MB larger)
 #Source1:	http://download.osgeo.org/proj/vdatum/%%{name}-vdatums.zip
 # originals
@@ -32,6 +40,9 @@ Patch0:		PDAL_unbundle.patch
 # Use correct libdir for PDAL_DRIVER_PATH when running tests
 Patch1:		PDAL_tests.patch
 
+# fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498)
+Patch2:		PDAL_sphinxconf.patch
+
 BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	eigen3-devel
@@ -42,11 +53,11 @@ BuildRequires:	geos-devel
 BuildRequires:	gtest-devel
 BuildRequires:	hdf5-devel
 BuildRequires:	jsoncpp-devel
-BuildRequires:	laszip-devel
 BuildRequires:	libgeotiff-devel
 BuildRequires:	libpq-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libzstd-devel
+BuildRequires:  make
 BuildRequires:	netcdf-cxx-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	postgresql-server
@@ -61,6 +72,7 @@ BuildRequires:	python3-sphinx
 %if 0%{?fedora}
 # yet missing for EPEL8
 BuildRequires:	python3-sphinxcontrib-bibtex
+BuildRequires:  python3-sphinxcontrib-spelling
 %endif
 BuildRequires:	python3-sphinx_rtd_theme
 BuildRequires:	qhull-devel
@@ -68,6 +80,7 @@ BuildRequires:	sqlite-devel
 BuildRequires:	zlib-devel
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Requires:	bash-completion
 
 # https://github.com/connormanning/arbiter bundled in vendor/arbiter
 Provides:	bundled(arbiter)
@@ -139,20 +152,16 @@ rm -rf vendor/{eigen,gtest,pdalboost}
 	-D CMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
 	-D CMAKE_VERBOSE_MAKEFILE=ON  \
 	-D GEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \
-	-D BUILD_PLUGIN_PYTHON=ON \
 	-D BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF \
-	-D WITH_LASZIP=ON \
+	-D WITH_COMPLETION=ON \
+	-D WITH_LAZPERF=ON \
 	-D WITH_TESTS=ON \
-	-D PDAL_HAVE_HEXER=ON \
-	-D PDAL_HAVE_GEOS=ON \
-	-D PDAL_HAVE_PYTHON=ON \
 	-D PDAL_HAVE_LIBGEOTIFF=ON \
 	-D PDAL_HAVE_LIBXML2=ON \
-	-D PDAL_HAVE_NITRO=OFF \
 	-D POSTGRESQL_INCLUDE_DIR=%{_includedir}/pgsql \
 	-D POSTGRESQL_LIBRARIES=%{_libdir}/libpq.so .
 
-%make_build
+%cmake_build
 
 # Build documentation
 %if 0%{?fedora}
@@ -164,7 +173,7 @@ sphinx-build -b html . build/html
 %endif
 
 %install
-%make_install
+%cmake_install
 
 # commented out due to size
 ## unpack vertical datums
@@ -181,30 +190,37 @@ sphinx-build -b html . build/html
 ## test the compiled code (see doc/project/testing.rst)
 # we skip tests for selected architectures which need upstream fixes
 %ifarch armv7hl aarch64 ppc64le s390x
-ctest || true
+(cd %{_vpath_builddir} && ctest --output-on-failure || true)
 %else
-## we skip the PG test (BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF): 
+## we skip the PG test (BUILD_PGPOINTCLOUD_TESTS:BOOL=OFF):
 # PGUSER=pdal PGPASSWORD=password PGHOST=localhost PGPORT=5432 ctest -V
-ctest -V
+
+# Use plain ctest as opposed to %%ctest, which runs tests in parallel, and appears to trigger
+# a race condition when running pdal_filters_overlay_test, leading to
+# "Unable to open stream for '/builddir/build/BUILD/PDAL-2.2.0-src/test/data/../temp/temp.laz' with error 'No such file or directory'".
+%ifarch i686
+# https://github.com/PDAL/PDAL/issues/3469
+# https://github.com/PDAL/PDAL/issues/3501
+%ctest || :
+%else
+# https://github.com/PDAL/PDAL/issues/3501
+%ctest || :
+%endif
 %endif
 
 %files
 %{_bindir}/pdal
+%{_datadir}/bash-completion/completions/pdal
 
 %files libs
 %license LICENSE.txt
 %license vendor/arbiter/LICENSE
 %license plugins/e57/libE57Format/LICENSE.md
-%{_libdir}/libpdal_base.so.10
-%{_libdir}/libpdal_base.so.11
-%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.10
-%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.11
-%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.10
-%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.11
-%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.10
-%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.11
-%{_libdir}/libpdal_util.so.10
-%{_libdir}/libpdal_util.so.11
+%{_libdir}/libpdal_base.so.15*
+%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.15*
+%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.15*
+%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.15*
+%{_libdir}/libpdal_util.so.15*
 
 %files devel
 %{_bindir}/pdal-config
@@ -230,6 +246,99 @@ ctest -V
 %license LICENSE.txt
 
 %changelog
+* Wed Mar 01 2023 Markus Neteler <neteler@mundialis.de> 2.5.2-1
+- Update to 2.5.2
+
+* Sat Feb 11 2023 Markus Neteler <neteler@mundialis.de> 2.5.1-1
+- Update to 2.5.1
+
+* Mon Feb 06 2023 Markus Neteler <neteler@mundialis.de> 2.5.0-3
+- patch to guard against bad return numbers (from upstream #3966), to be removed with PDAL 2.5.1
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jan 14 2023 Sandro Mani <manisandro@gmail.com> - 2.5.0-1
+- Update to 2.5.0
+
+* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 2.4.3-3
+- Rebuild (gdal)
+
+* Wed Nov 09 2022 Markus Neteler <neteler@mundialis.de> 2.4.3-2
+- SPDX license tag update
+
+* Sat Aug 06 2022 Sandro Mani <manisandro@gmail.com> - 2.4.3-1
+- Update to 2.4.3
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 07 2022 Sandro Mani <manisandro@gmail.com> - 2.4.2-1
+- Update to 2.4.2
+
+* Sat May 21 2022 Sandro Mani <manisandro@gmail.com> - 2.4.1-1
+- Update to 2.4.1
+
+* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 2.4.0-2
+- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
+
+* Mon Mar 28 2022 Markus Neteler <neteler@mundialis.de> 2.4.0-1
+- new upstream version
+- removed laszip requirement as lasperf is now used
+- deactivated unbundling of some bundled libraries, see https://github.com/PDAL/PDAL/issues/3719
+- fix https://github.com/PDAL/PDAL/pull/3720
+- ppc64le: workaround for BZ #1996330
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 22 2021 Orion Poplawski <orion@nwra.com> - 2.3.0-5
+- Rebuild for hdf5 1.12.1
+
+* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 2.3.0-4
+- Rebuild (gdal)
+
+* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 2.3.0-3
+- Rebuilt for Boost 1.76
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun May 30 2021 Markus Neteler <neteler@mundialis.de> 2.3.0-1
+- new upstream version
+- removed broken tests patch
+
+* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 2.2.0-8
+- Rebuild (gdal)
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 2.2.0-7
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 2.2.0-6
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Thu Jan 28 2021 Markus Neteler <neteler@mundialis.de> 2.2.0-6
+- fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498)
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 2.2.0-4
+- Rebuilt for Boost 1.75
+
+* Fri Nov  6 22:41:05 CET 2020 Sandro Mani <manisandro@gmail.com> - 2.2.0-3
+- Rebuild (proj, gdal)
+
+* Sat Oct 24 2020 Markus Neteler <neteler@mundialis.de> 2.2.0-2
+- add laszip-devel requirement to PDAL-devel (fixes BZ #1891154)
+- activated bash completion
+
+* Sat Oct 17 2020 Markus Neteler <neteler@mundialis.de> 2.2.0-1
+- new upstream version
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jun 03 2020 Markus Neteler <neteler@mundialis.de> 2.1.0-8
 - enable EPEL8 compilation by dropping sphinx docs for now
 

PDAL_bad_return_numbers.patch

@@ -0,0 +1,14 @@
+diff --git a/io/private/las/Summary.cpp b/io/private/las/Summary.cpp
+index e9232d4806..91059bfaf9 100644
+--- a/io/private/las/Summary.cpp
++++ b/io/private/las/Summary.cpp
+@@ -57,7 +57,8 @@ void Summary::addPoint(double x, double y, double z, int returnNumber)
+     m_bounds.grow(x, y, z);
+ 
+     // Returns numbers are indexed from one, but the array indexes from 0.
+-    m_returnCounts[returnNumber - 1]++;
++    if (returnNumber >= 1 && returnNumber <= m_returnCounts.size())
++        m_returnCounts[returnNumber - 1]++;
+ }
+ 
+ 

PDAL_sphinxconf.patch

@@ -0,0 +1,14 @@
+diff -rupN --no-dereference PDAL-2.5.2-src/doc/conf.py PDAL-2.5.2-src-new/doc/conf.py
+--- PDAL-2.5.2-src/doc/conf.py	2023-02-28 15:37:57.000000000 +0100
++++ PDAL-2.5.2-src-new/doc/conf.py	2023-03-07 08:22:48.766607840 +0100
+@@ -56,8 +56,9 @@ sys.path.insert(0, os.path.abspath('.'))
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['breathe', 'sphinx.ext.autodoc',
+               'sphinx.ext.mathjax', 'sphinx.ext.intersphinx',
+-              'sphinxcontrib.bibtex', 'embed','notfound.extension']
++              'sphinxcontrib.bibtex', 'embed']
+ 
++bibtex_bibfiles = ['bibliography.bib']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']

PDAL_tests.patch

@@ -1,7 +1,7 @@
-diff -rupN '--exclude=doc' PDAL-2.1.0-src/cmake/macros.cmake PDAL-2.1.0-src-new/cmake/macros.cmake
---- PDAL-2.1.0-src/cmake/macros.cmake	2020-03-20 22:18:17.000000000 +0100
-+++ PDAL-2.1.0-src-new/cmake/macros.cmake	2020-05-22 23:55:30.170681129 +0200
-@@ -206,6 +206,6 @@ macro(PDAL_ADD_TEST _name)
+diff -rupN --no-dereference PDAL-2.5.2-src/cmake/macros.cmake PDAL-2.5.2-src-new/cmake/macros.cmake
+--- PDAL-2.5.2-src/cmake/macros.cmake	2023-02-28 15:37:57.000000000 +0100
++++ PDAL-2.5.2-src-new/cmake/macros.cmake	2023-03-07 08:22:48.405612502 +0100
+@@ -228,6 +228,6 @@ macro(PDAL_ADD_TEST _name)
              "PDAL_DRIVER_PATH=${PROJECT_BINARY_DIR}/bin")
      else()
          set_property(TEST ${_name} PROPERTY ENVIRONMENT

PDAL_unbundle.patch

@@ -1,17 +1,9 @@
-diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt
---- PDAL-2.1.0-src/CMakeLists.txt	2020-03-20 22:18:17.000000000 +0100
-+++ PDAL-2.1.0-src-new/CMakeLists.txt	2020-05-27 11:09:43.675133404 +0200
-@@ -51,7 +51,6 @@ else()
- endif()
- set(PDAL_LIB_NAME pdalcpp)
- set(PDAL_UTIL_LIB_NAME pdal_util)
--set(PDAL_BOOST_LIB_NAME pdal_boost)
- set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan)
- set(PDAL_TEST_SUPPORT_OBJS pdal_test_support)
- 
-@@ -125,6 +124,9 @@ include(${PDAL_CMAKE_DIR}/arbiter.cmake)
- include(${PDAL_CMAKE_DIR}/nlohmann.cmake)
+diff -rupN --no-dereference PDAL-2.5.2-src/CMakeLists.txt PDAL-2.5.2-src-new/CMakeLists.txt
+--- PDAL-2.5.2-src/CMakeLists.txt	2023-02-28 15:37:59.000000000 +0100
++++ PDAL-2.5.2-src-new/CMakeLists.txt	2023-03-07 08:22:48.014617551 +0100
+@@ -140,6 +140,9 @@ include(${PDAL_CMAKE_DIR}/lazperf.cmake)
  include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional
+ include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
  
 +find_package(PkgConfig REQUIRED)
 +PKG_CHECK_MODULES(EIGEN REQUIRED eigen3)
@@ -19,201 +11,110 @@ diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt
  #------------------------------------------------------------------------------
  # generate the pdal_features.hpp header
  #------------------------------------------------------------------------------
-@@ -163,13 +165,10 @@ endif()
- 
+@@ -175,7 +178,6 @@ endif()
  add_subdirectory(plugins)
  
--#include_directories(vendor/pdalboost)
  if (WITH_TESTS)
 -    include (${PDAL_CMAKE_DIR}/gtest.cmake)
      add_subdirectory(test)
  endif()
  add_subdirectory(dimbuilder)
--add_subdirectory(vendor/pdalboost)
- add_subdirectory(vendor/arbiter)
- add_subdirectory(vendor/kazhdan)
- add_subdirectory(pdal/util)
-@@ -251,11 +250,10 @@ target_include_directories(${PDAL_BASE_L
+@@ -258,7 +260,7 @@ target_include_directories(${PDAL_BASE_L
          ${ROOT_DIR}
          ${PROJECT_BINARY_DIR}/include
          ${PDAL_VENDOR_DIR}
 -        ${PDAL_VENDOR_DIR}/eigen
--        ${PDAL_VENDOR_DIR}/pdalboost
++        ${EIGEN_INCLUDE_DIRS}
          ${LIBXML2_INCLUDE_DIR}
          ${ZSTD_INCLUDE_DIRS}
          ${NLOHMANN_INCLUDE_DIR}
-+        ${EIGEN_INCLUDE_DIRS}
-     PUBLIC
-         ${GDAL_INCLUDE_DIR}
-         ${LASZIP_INCLUDE_DIR}
-diff -rupN PDAL-2.1.0-src/pdal/util/CMakeLists.txt PDAL-2.1.0-src-new/pdal/util/CMakeLists.txt
---- PDAL-2.1.0-src/pdal/util/CMakeLists.txt	2020-03-20 22:18:17.000000000 +0100
-+++ PDAL-2.1.0-src-new/pdal/util/CMakeLists.txt	2020-05-27 11:10:04.732174032 +0200
-@@ -33,7 +33,7 @@ PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NA
- target_link_libraries(${PDAL_UTIL_LIB_NAME}
-     PRIVATE
-         ${BACKTRACE_LIBRARIES}
--        ${PDAL_BOOST_LIB_NAME}
-+        boost_filesystem
-         ${CMAKE_DL_LIBS}
- )
- target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE
-diff -rupN PDAL-2.1.0-src/pdal/util/FileUtils.cpp PDAL-2.1.0-src-new/pdal/util/FileUtils.cpp
---- PDAL-2.1.0-src/pdal/util/FileUtils.cpp	2020-03-20 22:18:17.000000000 +0100
-+++ PDAL-2.1.0-src-new/pdal/util/FileUtils.cpp	2020-05-27 11:08:56.736043058 +0200
-@@ -149,25 +149,25 @@ std::ostream *createFile(std::string con
- bool directoryExists(const std::string& dirname)
- {
-     //ABELL - Seems we should be calling is_directory
--    return pdalboost::filesystem::exists(toNative(dirname));
-+    return boost::filesystem::exists(toNative(dirname));
- }
+diff -rupN --no-dereference PDAL-2.5.2-src/plugins/cpd/CMakeLists.txt PDAL-2.5.2-src-new/plugins/cpd/CMakeLists.txt
+--- PDAL-2.5.2-src/plugins/cpd/CMakeLists.txt	2023-02-28 15:37:58.000000000 +0100
++++ PDAL-2.5.2-src-new/plugins/cpd/CMakeLists.txt	2023-03-07 08:22:48.015617538 +0100
+@@ -4,7 +4,7 @@ find_package(Cpd ${Cpd_VERSION} REQUIRED
+ option(BUILD_PLUGIN_CPD "Build Coherent Point Drift support" ${Cpd_FOUND})
  
+ set(files filters/CpdFilter.cpp)
+-set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${PDAL_VENDOR_DIR}/eigen")
++set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${EIGEN_INCLUDE_DIRS}")
  
- bool createDirectory(const std::string& dirname)
- {
--    return pdalboost::filesystem::create_directory(toNative(dirname));
-+    return boost::filesystem::create_directory(toNative(dirname));
- }
- 
- 
- bool createDirectories(const std::string& dirname)
- {
--    return pdalboost::filesystem::create_directories(toNative(dirname));
-+    return boost::filesystem::create_directories(toNative(dirname));
- }
- 
- 
- void deleteDirectory(const std::string& dirname)
- {
--    pdalboost::filesystem::remove_all(toNative(dirname));
-+    boost::filesystem::remove_all(toNative(dirname));
- }
- 
- 
-@@ -177,15 +177,15 @@ std::vector<std::string> directoryList(c
- 
-     try
-     {
--        pdalboost::filesystem::directory_iterator it(dir);
--        pdalboost::filesystem::directory_iterator end;
-+        boost::filesystem::directory_iterator it(dir);
-+        boost::filesystem::directory_iterator end;
-         while (it != end)
-         {
-             files.push_back(it->path().string());
-             it++;
-         }
-     }
--    catch (pdalboost::filesystem::filesystem_error&)
-+    catch (boost::filesystem::filesystem_error&)
-     {
-         files.clear();
-     }
-@@ -225,13 +225,13 @@ void closeFile(std::istream* in)
- 
- bool deleteFile(const std::string& file)
- {
--    return pdalboost::filesystem::remove(toNative(file));
-+    return boost::filesystem::remove(toNative(file));
- }
- 
- 
- void renameFile(const std::string& dest, const std::string& src)
- {
--    pdalboost::filesystem::rename(toNative(src), toNative(dest));
-+    boost::filesystem::rename(toNative(src), toNative(dest));
- }
- 
- 
-@@ -242,9 +242,9 @@ bool fileExists(const std::string& name)
- 
-     try
-     {
--        return pdalboost::filesystem::exists(toNative(name));
-+        return boost::filesystem::exists(toNative(name));
-     }
--    catch (pdalboost::filesystem::filesystem_error&)
-+    catch (boost::filesystem::filesystem_error&)
-     {
-     }
-     return false;
-@@ -253,7 +253,7 @@ bool fileExists(const std::string& name)
- 
- uintmax_t fileSize(const std::string& file)
- {
--    return pdalboost::filesystem::file_size(toNative(file));
-+    return boost::filesystem::file_size(toNative(file));
- }
- 
- 
-@@ -274,7 +274,7 @@ std::string readFileIntoString(const std
- 
- std::string getcwd()
- {
--    const pdalboost::filesystem::path p = pdalboost::filesystem::current_path();
-+    const boost::filesystem::path p = boost::filesystem::current_path();
-     return addTrailingSlash(p.string());
- }
- 
-@@ -302,7 +302,7 @@ std::string toAbsolutePath(const std::st
- // otherwise, make it absolute (relative to current working dir) and return that
- std::string toAbsolutePath(const std::string& filename)
- {
--    return pdalboost::filesystem::absolute(toNative(filename)).string();
-+    return boost::filesystem::absolute(toNative(filename)).string();
- }
- 
- 
-@@ -314,7 +314,7 @@ std::string toAbsolutePath(const std::st
- std::string toAbsolutePath(const std::string& filename, const std::string base)
- {
-     const std::string newbase = toAbsolutePath(base);
--    return pdalboost::filesystem::absolute(toNative(filename),
-+    return boost::filesystem::absolute(toNative(filename),
-         toNative(newbase)).string();
- }
- 
-@@ -337,8 +337,8 @@ std::string getFilename(const std::strin
- // Get the directory part of a filename.
- std::string getDirectory(const std::string& path)
- {
--    const pdalboost::filesystem::path dir =
--         pdalboost::filesystem::path(toNative(path)).parent_path();
-+    const boost::filesystem::path dir =
-+         boost::filesystem::path(toNative(path)).parent_path();
-     return addTrailingSlash(dir.string());
- }
- 
-@@ -359,13 +359,13 @@ std::string stem(const std::string& path
- // Determine if the path represents a directory.
- bool isDirectory(const std::string& path)
- {
--    return pdalboost::filesystem::is_directory(toNative(path));
-+    return boost::filesystem::is_directory(toNative(path));
- }
- 
- // Determine if the path is an absolute path
- bool isAbsolutePath(const std::string& path)
- {
--    return pdalboost::filesystem::path(toNative(path)).is_absolute();
-+    return boost::filesystem::path(toNative(path)).is_absolute();
- }
- 
- 
-diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/CMakeLists.txt
---- PDAL-2.1.0-src/test/unit/CMakeLists.txt	2020-03-20 22:18:18.000000000 +0100
-+++ PDAL-2.1.0-src-new/test/unit/CMakeLists.txt	2020-05-27 11:03:27.686421679 +0200
-@@ -32,7 +32,7 @@ PDAL_ADD_TEST(pdal_eigen_test
+ PDAL_ADD_PLUGIN(filter_libname filter cpd
      FILES
-         EigenTest.cpp
+diff -rupN --no-dereference PDAL-2.5.2-src/plugins/i3s/CMakeLists.txt PDAL-2.5.2-src-new/plugins/i3s/CMakeLists.txt
+--- PDAL-2.5.2-src/plugins/i3s/CMakeLists.txt	2023-02-28 15:37:58.000000000 +0100
++++ PDAL-2.5.2-src-new/plugins/i3s/CMakeLists.txt	2023-03-07 08:22:48.015617538 +0100
+@@ -20,7 +20,7 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reade
+     INCLUDES
+         ${NLOHMANN_INCLUDE_DIR}
+         ${PDAL_VENDOR_DIR}
+-        ${PDAL_VENDOR_DIR}/eigen
++        ${EIGEN_INCLUDE_DIRS}
+ )
+ target_compile_definitions(${i3s_reader_libname}
+     PRIVATE
+@@ -41,7 +41,7 @@ PDAL_ADD_PLUGIN(slpk_reader_libname read
+     INCLUDES
+         ${NLOHMANN_INCLUDE_DIR}
+         ${PDAL_VENDOR_DIR}
+-        ${PDAL_VENDOR_DIR}/eigen
++        ${EIGEN_INCLUDE_DIRS}
+ )
+ target_compile_definitions(${slpk_reader_libname}
+     PRIVATE
+@@ -61,7 +61,7 @@ if (WITH_TESTS)
+             ${PDAL_SRC_DIR}/private/MathUtils.cpp
+         INCLUDES
+             ${NLOHMANN_INCLUDE_DIR}
+-            ${PDAL_VENDOR_DIR}/eigen
++            ${EIGEN_INCLUDE_DIRS}
+     )
+ 
+     if (BUILD_I3S_TESTS)
+diff -rupN --no-dereference PDAL-2.5.2-src/plugins/rdb/CMakeLists.txt PDAL-2.5.2-src-new/plugins/rdb/CMakeLists.txt
+--- PDAL-2.5.2-src/plugins/rdb/CMakeLists.txt	2023-02-28 15:37:58.000000000 +0100
++++ PDAL-2.5.2-src-new/plugins/rdb/CMakeLists.txt	2023-03-07 08:22:48.015617538 +0100
+@@ -28,7 +28,7 @@ PDAL_ADD_PLUGIN(libname reader rdb
+         ${RDB_INCLUDE_C_DIR}
+         ${PDAL_INCLUDE_DIRS}
+ )
+-target_include_directories(${libname} PRIVATE "${PDAL_VENDOR_DIR}/eigen")
++target_include_directories(${libname} PRIVATE "${EIGEN_INCLUDE_DIRS}")
+ target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/nlohmann/")
+ target_include_directories(${libname} PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../../vendor/eigen/")
+ 
+@@ -57,7 +57,7 @@ if (BUILD_RDBLIB_TESTS)
+             ${PROJECT_SOURCE_DIR}/plugins/rdb/io
+             ${RDB_INCLUDE_CPP_DIR}
+             ${RDB_INCLUDE_C_DIR}
+-            ${PDAL_VENDOR_DIR}/eigen
++            ${EIGEN_INCLUDE_DIRS}
+ 
+     )
+ endif()
+diff -rupN --no-dereference PDAL-2.5.2-src/plugins/teaser/CMakeLists.txt PDAL-2.5.2-src-new/plugins/teaser/CMakeLists.txt
+--- PDAL-2.5.2-src/plugins/teaser/CMakeLists.txt	2023-02-28 15:37:58.000000000 +0100
++++ PDAL-2.5.2-src-new/plugins/teaser/CMakeLists.txt	2023-03-07 08:22:48.015617538 +0100
+@@ -63,6 +63,6 @@ if (WITH_TESTS)
+         LINK_WITH
+             ${filter_libname}
+         INCLUDES
+-            "${PDAL_VENDOR_DIR}/eigen"
++            "${EIGEN_INCLUDE_DIRS}"
+     )
+ endif()
+diff -rupN --no-dereference PDAL-2.5.2-src/test/unit/CMakeLists.txt PDAL-2.5.2-src-new/test/unit/CMakeLists.txt
+--- PDAL-2.5.2-src/test/unit/CMakeLists.txt	2023-02-28 15:37:59.000000000 +0100
++++ PDAL-2.5.2-src-new/test/unit/CMakeLists.txt	2023-03-07 08:22:48.015617538 +0100
+@@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test
+         ${PDAL_SRC_DIR}/private/MathUtils.cpp
+ 
      INCLUDES
 -        ${PDAL_VENDOR_DIR}/eigen
 +        ${EIGEN_INCLUDE_DIRS}
  )
  PDAL_ADD_TEST(pdal_file_utils_test FILES FileUtilsTest.cpp)
  PDAL_ADD_TEST(pdal_georeference_test FILES GeoreferenceTest.cpp)
-@@ -41,7 +41,7 @@ PDAL_ADD_TEST(pdal_kdindex_test
+@@ -43,7 +43,7 @@ PDAL_ADD_TEST(pdal_kdindex_test
          KDIndexTest.cpp
      INCLUDES
          ${PDAL_VENDOR_DIR}
@@ -222,7 +123,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/
  )
  PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp)
  PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp)
-@@ -68,7 +68,7 @@ PDAL_ADD_TEST(pdal_point_view_test
+@@ -77,7 +77,7 @@ PDAL_ADD_TEST(pdal_point_view_test
      FILES
          PointViewTest.cpp
      INCLUDES
@@ -231,7 +132,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/
  )
  PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp)
  
-@@ -178,13 +178,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
+@@ -212,13 +212,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test
      FILES
          io/PcdReaderTest.cpp
      INCLUDES
@@ -247,7 +148,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/
  )
  PDAL_ADD_TEST(pdal_io_ply_reader_test
      FILES
-@@ -219,7 +219,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
+@@ -257,7 +257,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test
          filters/ChipperTest.cpp
      INCLUDES
          ${NLOHMANN_INCLUDE_DIR}
@@ -256,7 +157,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/
  )
  PDAL_ADD_TEST(pdal_filters_nndistance_test
      FILES
-@@ -266,7 +266,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
+@@ -316,7 +316,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test
      FILES
          filters/IcpFilterTest.cpp
      INCLUDES
@@ -264,8 +165,17 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/
 +        ${EIGEN_INCLUDE_DIRS}
  )
  PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp)
- PDAL_ADD_TEST(pdal_filters_neighborclassifier_test FILES filters/NeighborClassifierFilterTest.cpp)
-@@ -305,7 +305,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
+ PDAL_ADD_TEST(pdal_filters_lloydkmeans_test FILES filters/LloydKMeansFilterTest.cpp)
+@@ -337,7 +337,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test
+     FILES
+         filters/PlaneFitFilterTest.cpp
+     INCLUDES
+-        ${PDAL_VENDOR_DIR}/eigen)
++        ${EIGEN_INCLUDE_DIRS})
+ PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp)
+ PDAL_ADD_TEST(pdal_filters_reprojection_test FILES
+     filters/ReprojectionFilterTest.cpp)
+@@ -363,7 +363,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test
      FILES
          filters/SplitterTest.cpp
      INCLUDES

sources

@@ -1 +1 @@
-SHA512 (PDAL-2.1.0-src.tar.gz) = 273e43bc02039ef56e22d6496d74c645c947dec7961024f419232b3f70ad5de030d5ee9fb74f44649016da67ff39179b06fa0d85f17a3b7db5fcce3cd0e35ac5
+SHA512 (PDAL-2.5.2-src.tar.gz) = 64762486ae4b0e1435c9e18846354daeee1de471b3e4754a33c06e5f7b38819a11ccf3ee37155e0af3de501cbb9763cf72f0647a4bf92e93ea2a7f72c01ca4ce