[gentoo-commits] repo/gentoo:master commit in: dev-ros/pcl_ros/files/, dev-ros/pcl_ros/

2020-10-11 Thread Alexis Ballier
commit: a1b931d3d1a2a56977d40f9be8244fc6671a8e84
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Oct 11 11:33:23 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Oct 11 11:50:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b931d3

dev-ros/pcl_ros: fix build

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/pcl_ros/files/kdtree.patch   | 12 
 dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev-ros/pcl_ros/files/kdtree.patch 
b/dev-ros/pcl_ros/files/kdtree.patch
new file mode 100644
index 000..ee5571f0715
--- /dev/null
+++ b/dev-ros/pcl_ros/files/kdtree.patch
@@ -0,0 +1,12 @@
+Index: pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+===
+--- pcl_ros.orig/include/pcl_ros/surface/moving_least_squares.h
 pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+@@ -42,6 +42,7 @@
+ 
+ // PCL includes
+ #include 
++#include  // for KdTree
+ 
+ // Dynamic reconfigure
+ #include 

diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild 
b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
index 5d3ff3e64a2..a656236b0bc 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
@@ -42,4 +42,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
)
 "
-PATCHES=( "${FILESDIR}/pcl111.patch" )
+PATCHES=( "${FILESDIR}/pcl111.patch" "${FILESDIR}/kdtree.patch" )



[gentoo-commits] repo/gentoo:master commit in: dev-ros/pcl_ros/files/, dev-ros/pcl_ros/

2020-05-18 Thread Alexis Ballier
commit: 8c677175e10a171210246d3e8d0caf1b86bd1633
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon May 18 10:20:56 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon May 18 11:22:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c677175

dev-ros/pcl_ros: upstream patch to build with pcl 1.11

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/pcl_ros/files/pcl111.patch   | 963 +++
 dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild |   1 +
 2 files changed, 964 insertions(+)

diff --git a/dev-ros/pcl_ros/files/pcl111.patch 
b/dev-ros/pcl_ros/files/pcl111.patch
new file mode 100644
index 000..8f3433ffcca
--- /dev/null
+++ b/dev-ros/pcl_ros/files/pcl111.patch
@@ -0,0 +1,963 @@
+From e812d3cf1b67cc73841b41e690d53c74e5077a05 Mon Sep 17 00:00:00 2001
+From: Kunal Tyagi 
+Date: Wed, 6 May 2020 08:41:07 +0900
+Subject: [PATCH] Changes in preparation for PCL 1.11 (#273)
+
+* Deriving typedef from pcl type
+
+* Explicit boost shared_ptr for function parameters
+
+* Use boost::shared_ptr instead of PCL::Ptr
+
+* Implementing boost-std compatibility
+
+* Using the compatibility layer
+---
+ pcl_ros/include/pcl_ros/features/feature.h|  14 +-
+ pcl_ros/include/pcl_ros/filters/filter.h  |   4 +-
+ pcl_ros/include/pcl_ros/pcl_nodelet.h |   9 +-
+ pcl_ros/include/pcl_ros/point_cloud.h | 121 ++
+ .../extract_polygonal_prism_data.h|   4 +-
+ .../pcl_ros/segmentation/sac_segmentation.h   |  12 +-
+ .../segmentation/segment_differences.h|   4 +-
+ pcl_ros/include/pcl_ros/surface/convex_hull.h |   4 +-
+ .../pcl_ros/surface/moving_least_squares.h|   4 +-
+ pcl_ros/src/pcl_ros/features/boundary.cpp |  10 +-
+ pcl_ros/src/pcl_ros/features/fpfh.cpp |  10 +-
+ pcl_ros/src/pcl_ros/features/fpfh_omp.cpp |  10 +-
+ .../pcl_ros/features/moment_invariants.cpp|   8 +-
+ pcl_ros/src/pcl_ros/features/normal_3d.cpp|   8 +-
+ .../src/pcl_ros/features/normal_3d_omp.cpp|   8 +-
+ .../src/pcl_ros/features/normal_3d_tbb.cpp|   4 +-
+ pcl_ros/src/pcl_ros/features/pfh.cpp  |  10 +-
+ .../pcl_ros/features/principal_curvatures.cpp |  10 +-
+ pcl_ros/src/pcl_ros/features/shot.cpp |  10 +-
+ pcl_ros/src/pcl_ros/features/shot_omp.cpp |  10 +-
+ pcl_ros/src/pcl_ros/features/vfh.cpp  |  10 +-
+ .../pcl_ros/segmentation/extract_clusters.cpp |   4 +-
+ .../extract_polygonal_prism_data.cpp  |   6 +-
+ .../pcl_ros/segmentation/sac_segmentation.cpp |   6 +-
+ .../segmentation/segment_differences.cpp  |   8 +-
+ pcl_ros/src/pcl_ros/surface/convex_hull.cpp   |   8 +-
+ .../pcl_ros/surface/moving_least_squares.cpp  |  10 +-
+ pcl_ros/tools/pointcloud_to_pcd.cpp   |   2 +-
+ 28 files changed, 225 insertions(+), 103 deletions(-)
+
+diff --git a/pcl_ros/include/pcl_ros/features/feature.h 
b/pcl_ros/include/pcl_ros/features/feature.h
+index 26bcfe6b..098c20bc 100644
+--- a/pcl_ros/include/pcl_ros/features/feature.h
 b/pcl_ros/include/pcl_ros/features/feature.h
+@@ -69,11 +69,11 @@ namespace pcl_ros
+   typedef pcl::KdTree::Ptr KdTreePtr;
+ 
+   typedef pcl::PointCloud PointCloudIn;
+-  typedef PointCloudIn::Ptr PointCloudInPtr;
+-  typedef PointCloudIn::ConstPtr PointCloudInConstPtr;
++  typedef boost::shared_ptr PointCloudInPtr;
++  typedef boost::shared_ptr PointCloudInConstPtr;
+ 
+-  typedef boost::shared_ptr  > IndicesPtr;
+-  typedef boost::shared_ptr  > IndicesConstPtr;
++  typedef pcl::IndicesPtr IndicesPtr;
++  typedef pcl::IndicesConstPtr IndicesConstPtr;
+ 
+   /** \brief Empty constructor. */
+   Feature () : /*input_(), indices_(), surface_(), */tree_(), k_(0), 
search_radius_(0),
+@@ -152,7 +152,7 @@ namespace pcl_ros
+ indices.header.stamp = pcl_conversions::fromPCL(input->header).stamp;
+ PointCloudIn cloud;
+ cloud.header.stamp = input->header.stamp;
+-nf_pc_.add (cloud.makeShared ());
++nf_pc_.add (ros_ptr(cloud.makeShared ()));
+ nf_pi_.add (boost::make_shared (indices));
+   }
+ 
+@@ -190,8 +190,8 @@ namespace pcl_ros
+   typedef sensor_msgs::PointCloud2 PointCloud2;
+ 
+   typedef pcl::PointCloud PointCloudN;
+-  typedef PointCloudN::Ptr PointCloudNPtr;
+-  typedef PointCloudN::ConstPtr PointCloudNConstPtr;
++  typedef boost::shared_ptr PointCloudNPtr;
++  typedef boost::shared_ptr PointCloudNConstPtr;
+ 
+   FeatureFromNormals () : normals_() {};
+ 
+diff --git a/pcl_ros/include/pcl_ros/filters/filter.h 
b/pcl_ros/include/pcl_ros/filters/filter.h
+index 94c1e883..b4e79538 100644
+--- a/pcl_ros/include/pcl_ros/filters/filter.h
 b/pcl_ros/include/pcl_ros/filters/filter.h
+@@ -58,8 +58,8 @@ namespace pcl_ros
+ public:
+   typedef sensor_msgs::PointCloud2 PointCloud2;
+ 
+-  typedef boost::shared_ptr  > IndicesPtr;
+-