From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 May 2020 11:44:06 +0100
Subject: gentoo resync : 30.05.2020

---
 sci-libs/rtabmap/files/boost173.patch | 13 ++++++++++
 sci-libs/rtabmap/files/ocv.patch      | 24 +++++++++++++++++
 sci-libs/rtabmap/files/pcl111.patch   | 49 +++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 sci-libs/rtabmap/files/boost173.patch
 create mode 100644 sci-libs/rtabmap/files/ocv.patch
 create mode 100644 sci-libs/rtabmap/files/pcl111.patch

(limited to 'sci-libs/rtabmap/files')

diff --git a/sci-libs/rtabmap/files/boost173.patch b/sci-libs/rtabmap/files/boost173.patch
new file mode 100644
index 000000000000..4549e9bc8426
--- /dev/null
+++ b/sci-libs/rtabmap/files/boost173.patch
@@ -0,0 +1,13 @@
+Index: rtabmap-0.19.7/corelib/src/camera/CameraOpenni.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/camera/CameraOpenni.cpp
++++ rtabmap-0.19.7/corelib/src/camera/CameraOpenni.cpp
+@@ -126,7 +126,7 @@ bool CameraOpenni::init(const std::strin
+ 		boost::function<void (
+ 				const boost::shared_ptr<openni_wrapper::Image>&,
+ 				const boost::shared_ptr<openni_wrapper::DepthImage>&,
+-				float)> f = boost::bind (&CameraOpenni::image_cb, this, _1, _2, _3);
++				float)> f = boost::bind (&CameraOpenni::image_cb, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3);
+ 		connection_ = interface_->registerCallback (f);
+ 
+ 		interface_->start ();
diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch
new file mode 100644
index 000000000000..0802b7899a26
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv.patch
@@ -0,0 +1,24 @@
+From 7041d5fd34fb34851ad3287891aa5c383d73b5c2 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Sun, 3 May 2020 22:59:35 -0400
+Subject: [PATCH] Fixed #541
+
+---
+ corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: rtabmap-0.19.7/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h
++++ rtabmap-0.19.7/corelib/include/rtabmap/core/stereo/stereoRectifyFisheye.h
+@@ -37,10 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <opencv2/calib3d/calib3d_c.h>
+ 
+ #if CV_MAJOR_VERSION >= 4
+-
+-#if CV_MINOR_VERSION >= 3
+ #include <opencv2/core/core_c.h>
+-#endif
+ 
+ // Opencv4 doesn't expose those functions below anymore, we should recopy all of them!
+ int cvRodrigues2( const CvMat* src, CvMat* dst, CvMat* jacobian CV_DEFAULT(0))
diff --git a/sci-libs/rtabmap/files/pcl111.patch b/sci-libs/rtabmap/files/pcl111.patch
new file mode 100644
index 000000000000..3ff5d6be452d
--- /dev/null
+++ b/sci-libs/rtabmap/files/pcl111.patch
@@ -0,0 +1,49 @@
+Index: rtabmap-0.19.7/corelib/src/Graph.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/Graph.cpp
++++ rtabmap-0.19.7/corelib/src/Graph.cpp
+@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <pcl/search/kdtree.h>
+ #include <pcl/common/eigen.h>
+ #include <pcl/common/common.h>
++#include <pcl/common/point_tests.h>
+ #include <set>
+ #include <queue>
+ #include <fstream>
+Index: rtabmap-0.19.7/corelib/src/clams/frame_projector.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/clams/frame_projector.cpp
++++ rtabmap-0.19.7/corelib/src/clams/frame_projector.cpp
+@@ -33,6 +33,7 @@ RTAB-Map integration: Mathieu Labbe
+ #include <rtabmap/core/util3d.h>
+ #include <opencv2/highgui/highgui.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
++#include <pcl/common/point_tests.h>
+ 
+ using namespace std;
+ using namespace Eigen;
+Index: rtabmap-0.19.7/corelib/src/util3d_correspondences.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/util3d_correspondences.cpp
++++ rtabmap-0.19.7/corelib/src/util3d_correspondences.cpp
+@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ #include <rtabmap/core/EpipolarGeometry.h>
+ #include <opencv2/calib3d/calib3d.hpp>
+ #include <pcl/search/kdtree.h>
++#include <pcl/common/point_tests.h>
+ 
+ namespace rtabmap
+ {
+Index: rtabmap-0.19.7/corelib/src/util3d_features.cpp
+===================================================================
+--- rtabmap-0.19.7.orig/corelib/src/util3d_features.cpp
++++ rtabmap-0.19.7/corelib/src/util3d_features.cpp
+@@ -42,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 
+ #include <opencv2/video/tracking.hpp>
+ 
++#include <pcl/common/point_tests.h>
++
+ namespace rtabmap
+ {
+ 
-- 
cgit v1.2.3