From b12a94f1798082d3d62ade20b75ef9cf48ddd321 Mon Sep 17 00:00:00 2001
From: Markus Neteler <neteler@gmail.com>
Date: Mon, 28 Mar 2022 20:23:25 +0200
Subject: [PATCH] reinstate vedor libs; fix missing memory declaration

---
 PDAL.spec                  | 13 ++++++++++---
 PDAL_240_include_fix.patch | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 PDAL_240_include_fix.patch

diff --git a/PDAL.spec b/PDAL.spec
index 34a7ef0..bdaed61 100644
--- a/PDAL.spec
+++ b/PDAL.spec
@@ -30,11 +30,15 @@ Source:		https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}
 #Source13:  http://download.osgeo.org/proj/vdatum/usa_geoid2012b.zip
 
 # Unbundle some bundled libraries
-Patch0:		PDAL_unbundle.patch
+# 03/2022: deactivated, see https://github.com/PDAL/PDAL/issues/3719
+#Patch0:		PDAL_unbundle.patch
 
 # Use correct libdir for PDAL_DRIVER_PATH when running tests
 Patch1:		PDAL_tests.patch
 
+# Compiler error suppression https://github.com/PDAL/PDAL/pull/3720
+Patch2:		PDAL_240_include_fix.patch
+
 # fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498)
 Patch3:		PDAL_sphinxconf.patch
 
@@ -139,7 +143,8 @@ This package contains documentation for PDAL.
 %autosetup -p1 -n %{name}-%{version}-src
 
 # Remove some bundled libraries
-rm -rf vendor/{eigen,gtest,pdalboost}
+# 03/2022: deactivated, see https://github.com/PDAL/PDAL/issues/3719
+# rm -rf vendor/{eigen,gtest,pdalboost}
 
 
 %build
@@ -241,9 +246,11 @@ sphinx-build -b html . build/html
 %license LICENSE.txt
 
 %changelog
-* Sat Mar 26 2022 Markus Neteler <neteler@mundialis.de> 2.4.0-1
+* 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
 
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/PDAL_240_include_fix.patch b/PDAL_240_include_fix.patch
new file mode 100644
index 0000000..ba4f2b4
--- /dev/null
+++ b/PDAL_240_include_fix.patch
@@ -0,0 +1,25 @@
+diff --git a/filters/VoxelCentroidNearestNeighborFilter.cpp b/filters/VoxelCentroidNearestNeighborFilter.cpp
+index 4be4d5d92e..cdcdf29d14 100644
+--- a/filters/VoxelCentroidNearestNeighborFilter.cpp
++++ b/filters/VoxelCentroidNearestNeighborFilter.cpp
+@@ -134,7 +134,7 @@ PointViewSet VoxelCentroidNearestNeighborFilter::run(PointViewPtr view)
+ 
+             // Compute distance from each point in the voxel to the centroid,
+             // retaining only the closest.
+-            PointId pmin;
++            PointId pmin = 0;
+             double dmin((std::numeric_limits<double>::max)());
+             for (auto const& p : t.second)
+             {
+diff --git a/io/LasVLR.hpp b/io/LasVLR.hpp
+index 7120511eb4..e90d27ee4e 100644
+--- a/io/LasVLR.hpp
++++ b/io/LasVLR.hpp
+@@ -34,6 +34,7 @@
+ 
+ #pragma once
+ 
++#include <memory>
+ #include <vector>
+ 
+ #include <pdal/pdal_export.hpp>