aboutsummaryrefslogtreecommitdiff
path: root/ports/pdal
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2020-11-04 15:10:51 +0800
committerGitHub <noreply@github.com>2020-11-03 23:10:51 -0800
commit74ae197d7b333d9e2c19a058f3c88aabffdfdff4 (patch)
treeb2d7736f08f89264ccdd64d8048918023064bd38 /ports/pdal
parent5c36967f365db6daf07a6e3d192814f6b9d6104c (diff)
downloadvcpkg-74ae197d7b333d9e2c19a058f3c88aabffdfdff4.tar.gz
vcpkg-74ae197d7b333d9e2c19a058f3c88aabffdfdff4.zip
[kenlm, pdal] Fix const overload on Visual Studio 2019 version 16.8 (#14382)
Diffstat (limited to 'ports/pdal')
-rw-r--r--ports/pdal/0004-fix-const-overloaded.patch13
-rw-r--r--ports/pdal/CONTROL2
-rw-r--r--ports/pdal/portfile.cmake1
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/pdal/0004-fix-const-overloaded.patch b/ports/pdal/0004-fix-const-overloaded.patch
new file mode 100644
index 000000000..1f820aef3
--- /dev/null
+++ b/ports/pdal/0004-fix-const-overloaded.patch
@@ -0,0 +1,13 @@
+diff --git a/pdal/PointViewIter.hpp b/pdal/PointViewIter.hpp
+index 0c387be..ccb0721 100644
+--- a/pdal/PointViewIter.hpp
++++ b/pdal/PointViewIter.hpp
+@@ -139,7 +139,7 @@ public:
+
+ bool operator==(const PointViewIter& i)
+ { return m_id == i.m_id; }
+- bool operator!=(const PointViewIter& i)
++ bool operator!=(const PointViewIter& i) const
+ { return m_id != i.m_id; }
+ bool operator<=(const PointViewIter& i)
+ { return m_id <= i.m_id; }
diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL
index dfaaf0daf..9098db285 100644
--- a/ports/pdal/CONTROL
+++ b/ports/pdal/CONTROL
@@ -1,5 +1,5 @@
Source: pdal
Version: 1.7.1
-Port-Version: 9
+Port-Version: 10
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip, boost-system, boost-filesystem
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index 44654a4eb..b6c503d16 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex(
fix-dependency.patch
libpq.patch
fix-CPL_DLL.patch
+ 0004-fix-const-overloaded.patch
)
file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")