<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ba814abb24ae32deb53923cab66b05ecb61dc4cb">https://github.com/macports/macports-ports/commit/ba814abb24ae32deb53923cab66b05ecb61dc4cb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ba814abb24a libpcl: fix build for Boost 1.70+
</span>ba814abb24a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba814abb24ae32deb53923cab66b05ecb61dc4cb
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Apr 20 18:16:08 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libpcl: fix build for Boost 1.70+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply patch posted to upstream issue
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use compiler.openmp_version instead of compiler blacklisting
</span><span style='display:block; white-space:pre;color:#404040;'> Option was introduced in MacPorts 2.6.0:
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/wiki/CompilerSelection
</span>---
gis/libpcl/Portfile | 11 ++++++-----
gis/libpcl/files/boost170.patch | 17 +++++++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libpcl/Portfile b/gis/libpcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 162fc65db61..bee3fea9f82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/libpcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libpcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup active_variants 1.1
github.setup PointCloudLibrary pcl 1.9.1 pcl-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 223b36b48c9a77a1092bf0cbe8ed15e843c46386 \
sha256 943c618003c0a57046bca7c3b8e9a1e9a51b5f44545ffff9e1e744dd9304cf19 \
size 67161112
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,8 @@ depends_test port:gtest
</span>
require_active_variants vtk qt5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append boost170.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace -DCMAKE_BUILD_TYPE=MacPorts -DCMAKE_BUILD_TYPE=Release
configure.args-append -DBUILD_apps=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +46,9 @@ configure.args-append -DBUILD_apps=ON \
</span> -DWITH_DOCS=OFF \
-DWITH_QT=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openmp description {Build with macports-clang >= 5.0 to enable OpenMP for speed} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append *gcc* {clang}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append macports-clang-3.3 macports-clang-3.4 macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openmp description {Enable OpenMP for speed} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: verify OpenMP version required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 3.1
</span> }
variant test description {Configure to run unit tests} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libpcl/files/boost170.patch b/gis/libpcl/files/boost170.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e78b3b4828
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libpcl/files/boost170.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch to fix build with Boost 1.70 obtained from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/PointCloudLibrary/pcl/files/2975614/patch.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See issue https://github.com/PointCloudLibrary/pcl/issues/2931
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/segmentation/include/pcl/segmentation/supervoxel_clustering.h b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0fad772..bed6c1a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- segmentation/include/pcl/segmentation/supervoxel_clustering.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ segmentation/include/pcl/segmentation/supervoxel_clustering.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -524,7 +524,7 @@ namespace pcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //Make boost::ptr_list can access the private class SupervoxelHelper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *) BOOST_NOEXCEPT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef boost::ptr_list<SupervoxelHelper> HelperListT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HelperListT supervoxel_helpers_;
</span></pre><pre style='margin:0'>
</pre>