rpms
/
PDAL
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reinstate vedor libs; fix missing memory declaration

This commit is contained in:
Markus Neteler 2022-03-28 20:23:25 +02:00
parent eeb683d5a0
commit b12a94f179
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PDAL.spec
View File

@ -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

25
PDAL_240_include_fix.patch Normal file
View File

@ -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>