* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/
@ 2019-12-10 17:35 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2019-12-10 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 8dad73f807fe1bd4d356a752473847ca0a5d500e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 16:37:43 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 17:34:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dad73f8
sci-libs/rtabmap: fix buidl with opencv4
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/rtabmap/files/ocv4.patch | 23 +++++++++++++++++++++++
sci-libs/rtabmap/rtabmap-0.19.3.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/sci-libs/rtabmap/files/ocv4.patch b/sci-libs/rtabmap/files/ocv4.patch
new file mode 100644
index 00000000000..465b364ef01
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv4.patch
@@ -0,0 +1,23 @@
+From d5b4b252870e4225ed00bd544a102015e5172c85 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Fri, 9 Aug 2019 15:31:47 -0400
+Subject: [PATCH] updated ORBExtractor opencv include (compatibility issue
+ https://github.com/introlab/rtabmap_ros/issues/333)
+
+---
+ corelib/src/opencv/ORBextractor.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/corelib/src/opencv/ORBextractor.h b/corelib/src/opencv/ORBextractor.h
+index 0f06c395..58619a15 100644
+--- a/corelib/src/opencv/ORBextractor.h
++++ b/corelib/src/opencv/ORBextractor.h
+@@ -31,7 +31,7 @@
+
+ #include <vector>
+ #include <list>
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
+
+
+ namespace rtabmap
diff --git a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
index da61f393cbd..a76c02847b1 100644
--- a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/
@ 2020-05-18 11:22 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2020-05-18 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 4a6106b7a6ace022aaa3a91388115b7085511abf
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 11:22:13 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon May 18 11:22:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6106b7
sci-libs/rtabmap: Bump to 0.19.7
Fixes build with:
- PCL 1.11
- Boost 1.73
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/rtabmap/Manifest | 1 +
sci-libs/rtabmap/files/boost173.patch | 13 +++++++
sci-libs/rtabmap/files/ocv.patch | 24 ++++++++++++
sci-libs/rtabmap/files/pcl111.patch | 49 ++++++++++++++++++++++++
sci-libs/rtabmap/rtabmap-0.19.7.ebuild | 69 ++++++++++++++++++++++++++++++++++
5 files changed, 156 insertions(+)
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 58164b23bff..e9ed362ac60 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1,2 @@
DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509
+DIST rtabmap-0.19.7.tar.gz 19936131 BLAKE2B ec640bb8dddb2acac9eb70e828edc88e76d90b287dc5be0c99f0943dac3df448b0a06bde79b1288e0b84a1b2a022e5713346f87e68f11a6f25be486e3122b62a SHA512 d02fec1db427092867b32d464e4b2450a729923260088b75dd0a813fc6d3e2539b3694035cddffc33b8fcd5a56a2a5c3dedb7c7a998b72f2094e1916f2a99084
diff --git a/sci-libs/rtabmap/files/boost173.patch b/sci-libs/rtabmap/files/boost173.patch
new file mode 100644
index 00000000000..4549e9bc842
--- /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 00000000000..0802b7899a2
--- /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 00000000000..3ff5d6be452
--- /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
+ {
+
diff --git a/sci-libs/rtabmap/rtabmap-0.19.7.ebuild b/sci-libs/rtabmap/rtabmap-0.19.7.ebuild
new file mode 100644
index 00000000000..4640d13e9cf
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.19.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64"
+ SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+ media-libs/opencv:=[qt5(-)?]
+ sci-libs/pcl:=[openni,vtk,qt5(-)?]
+ sci-libs/vtk:=[qt5(-)?]
+ sys-libs/zlib
+ sci-libs/octomap:=
+ dev-libs/boost:=
+ ieee1394? ( media-libs/libdc1394 )
+ openni2? ( dev-libs/OpenNI2 )
+ qt5? (
+ dev-qt/qtwidgets:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/pcl111.patch"
+ "${FILESDIR}/boost173.patch"
+ "${FILESDIR}/ocv.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ "-DWITH_QT=$(usex qt5 ON OFF)"
+ "-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+ "-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+ "-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ # Needed since we force ros crawling to be done only in
+ # /usr/share/ros_packages/
+ insinto /usr/share/ros_packages/${PN}
+ doins "${ED}/usr/share/${PN}/package.xml"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/
@ 2020-08-31 9:10 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2020-08-31 9:10 UTC (permalink / raw
To: gentoo-commits
commit: ba429326b215c417fcfaa65c6ee98e5f0f96c67d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 09:09:19 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 09:10:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba429326
sci-libs/rtabmap: fix build with latest pcl
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/rtabmap/files/pcl.patch | 22 ++++++++++++++++++++++
sci-libs/rtabmap/rtabmap-0.20.3.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/sci-libs/rtabmap/files/pcl.patch b/sci-libs/rtabmap/files/pcl.patch
new file mode 100644
index 00000000000..249d93d1c59
--- /dev/null
+++ b/sci-libs/rtabmap/files/pcl.patch
@@ -0,0 +1,22 @@
+From 24052a6ebe65fb260ee1d838ca5305b12b15d928 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Tue, 25 Aug 2020 10:56:30 -0400
+Subject: [PATCH] fixed pcl::getAngle3D not found error on latest pcl version
+ (https://github.com/PointCloudLibrary/pcl/commit/6df3e602a72ea16657f901c9a6911d95b263ba08#diff-8e08415b9972a447d115dbca3f8fa0a1)
+
+---
+ corelib/src/pcl18/surface/impl/texture_mapping.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/corelib/src/pcl18/surface/impl/texture_mapping.hpp b/corelib/src/pcl18/surface/impl/texture_mapping.hpp
+index a30f5766f..fbeedb221 100644
+--- a/corelib/src/pcl18/surface/impl/texture_mapping.hpp
++++ b/corelib/src/pcl18/surface/impl/texture_mapping.hpp
+@@ -41,6 +41,7 @@
+ #include <pcl/common/distances.h>
+ #include <pcl18/surface/texture_mapping.h>
+ #include <pcl/search/octree.h>
++#include <pcl/common/common.h> // for getAngle3D
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////
+ template<typename PointInT> std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >
diff --git a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
index 5519717519d..1fd30dc27ec 100644
--- a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/pcl.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/
@ 2020-08-31 9:10 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2020-08-31 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 3d61dabb8f91363f556d53f69f9e592a49130c35
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 07:20:54 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 09:10:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d61dabb
sci-libs/rtabmap: Remove old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/rtabmap/Manifest | 2 -
sci-libs/rtabmap/files/boost173.patch | 13 ------
sci-libs/rtabmap/files/ocv.patch | 24 -----------
sci-libs/rtabmap/files/ocv4.patch | 23 -----------
sci-libs/rtabmap/files/pcl111.patch | 49 ----------------------
sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild | 65 -----------------------------
sci-libs/rtabmap/rtabmap-0.19.7.ebuild | 69 -------------------------------
7 files changed, 245 deletions(-)
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 3cafd44ce7f..d2e1c860aaf 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,3 +1 @@
-DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509
-DIST rtabmap-0.19.7.tar.gz 19936131 BLAKE2B ec640bb8dddb2acac9eb70e828edc88e76d90b287dc5be0c99f0943dac3df448b0a06bde79b1288e0b84a1b2a022e5713346f87e68f11a6f25be486e3122b62a SHA512 d02fec1db427092867b32d464e4b2450a729923260088b75dd0a813fc6d3e2539b3694035cddffc33b8fcd5a56a2a5c3dedb7c7a998b72f2094e1916f2a99084
DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7
diff --git a/sci-libs/rtabmap/files/boost173.patch b/sci-libs/rtabmap/files/boost173.patch
deleted file mode 100644
index 4549e9bc842..00000000000
--- a/sci-libs/rtabmap/files/boost173.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 0802b7899a2..00000000000
--- a/sci-libs/rtabmap/files/ocv.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/ocv4.patch b/sci-libs/rtabmap/files/ocv4.patch
deleted file mode 100644
index 465b364ef01..00000000000
--- a/sci-libs/rtabmap/files/ocv4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d5b4b252870e4225ed00bd544a102015e5172c85 Mon Sep 17 00:00:00 2001
-From: matlabbe <matlabbe@gmail.com>
-Date: Fri, 9 Aug 2019 15:31:47 -0400
-Subject: [PATCH] updated ORBExtractor opencv include (compatibility issue
- https://github.com/introlab/rtabmap_ros/issues/333)
-
----
- corelib/src/opencv/ORBextractor.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/corelib/src/opencv/ORBextractor.h b/corelib/src/opencv/ORBextractor.h
-index 0f06c395..58619a15 100644
---- a/corelib/src/opencv/ORBextractor.h
-+++ b/corelib/src/opencv/ORBextractor.h
-@@ -31,7 +31,7 @@
-
- #include <vector>
- #include <list>
--#include <opencv/cv.h>
-+#include <opencv2/core/core_c.h>
-
-
- namespace rtabmap
diff --git a/sci-libs/rtabmap/files/pcl111.patch b/sci-libs/rtabmap/files/pcl111.patch
deleted file mode 100644
index 3ff5d6be452..00000000000
--- a/sci-libs/rtabmap/files/pcl111.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
- {
-
diff --git a/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild
deleted file mode 100644
index df3b781baf7..00000000000
--- a/sci-libs/rtabmap/rtabmap-0.19.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
- media-libs/opencv:=[qt5(-)?]
- sci-libs/pcl:=[openni,vtk,qt5(-)?]
- sci-libs/vtk:=[qt5(-)?]
- sys-libs/zlib
- sci-libs/octomap:=
- dev-libs/boost:=
- ieee1394? ( media-libs/libdc1394 )
- openni2? ( dev-libs/OpenNI2 )
- qt5? (
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/ocv4.patch" )
-
-src_configure() {
- local mycmakeargs=(
- "-DWITH_QT=$(usex qt5 ON OFF)"
- "-DWITH_DC1394=$(usex ieee1394 ON OFF)"
- "-DWITH_OPENNI2=$(usex openni2 ON OFF)"
- "-DBUILD_EXAMPLES=$(usex examples ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- # Needed since we force ros crawling to be done only in
- # /usr/share/ros_packages/
- insinto /usr/share/ros_packages/${PN}
- doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/rtabmap/rtabmap-0.19.7.ebuild b/sci-libs/rtabmap/rtabmap-0.19.7.ebuild
deleted file mode 100644
index 4640d13e9cf..00000000000
--- a/sci-libs/rtabmap/rtabmap-0.19.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
- media-libs/opencv:=[qt5(-)?]
- sci-libs/pcl:=[openni,vtk,qt5(-)?]
- sci-libs/vtk:=[qt5(-)?]
- sys-libs/zlib
- sci-libs/octomap:=
- dev-libs/boost:=
- ieee1394? ( media-libs/libdc1394 )
- openni2? ( dev-libs/OpenNI2 )
- qt5? (
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}/pcl111.patch"
- "${FILESDIR}/boost173.patch"
- "${FILESDIR}/ocv.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- "-DWITH_QT=$(usex qt5 ON OFF)"
- "-DWITH_DC1394=$(usex ieee1394 ON OFF)"
- "-DWITH_OPENNI2=$(usex openni2 ON OFF)"
- "-DBUILD_EXAMPLES=$(usex examples ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- # Needed since we force ros crawling to be done only in
- # /usr/share/ros_packages/
- insinto /usr/share/ros_packages/${PN}
- doins "${ED}/usr/share/${PN}/package.xml"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/
@ 2021-08-03 7:35 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2021-08-03 7:35 UTC (permalink / raw
To: gentoo-commits
commit: abbebc3eb416a0c6c47f3ae05e13deef0f912af3
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 07:25:55 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 07:35:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbebc3e
sci-libs/rtabmap: bump to 0.20.13
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/rtabmap/Manifest | 2 +-
sci-libs/rtabmap/files/pcl.patch | 22 ----------------------
...tabmap-0.20.3.ebuild => rtabmap-0.20.13.ebuild} | 13 +++++++------
sci-libs/rtabmap/rtabmap-9999.ebuild | 12 +++++++-----
4 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index d2e1c860aaf..194e9590c78 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1 @@
-DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7
+DIST rtabmap-0.20.13.tar.gz 21501493 BLAKE2B eddec6e4812cea231f88263ce136eb535bc099939a482d6fb6de0e6ab3a302c395eb5f6c824d04da8d48a7f7ad9d63b8fa313ae3c21dcada74ec89c7e8130af5 SHA512 4014ec3b7bc2edbd7f361026d5a4be9222b094e398fde68512aab37b3edcb01d47256e4931de6ea1b3bcada9ac81405946e85e774220b9cf43d14a2db6c91118
diff --git a/sci-libs/rtabmap/files/pcl.patch b/sci-libs/rtabmap/files/pcl.patch
deleted file mode 100644
index 249d93d1c59..00000000000
--- a/sci-libs/rtabmap/files/pcl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 24052a6ebe65fb260ee1d838ca5305b12b15d928 Mon Sep 17 00:00:00 2001
-From: matlabbe <matlabbe@gmail.com>
-Date: Tue, 25 Aug 2020 10:56:30 -0400
-Subject: [PATCH] fixed pcl::getAngle3D not found error on latest pcl version
- (https://github.com/PointCloudLibrary/pcl/commit/6df3e602a72ea16657f901c9a6911d95b263ba08#diff-8e08415b9972a447d115dbca3f8fa0a1)
-
----
- corelib/src/pcl18/surface/impl/texture_mapping.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/corelib/src/pcl18/surface/impl/texture_mapping.hpp b/corelib/src/pcl18/surface/impl/texture_mapping.hpp
-index a30f5766f..fbeedb221 100644
---- a/corelib/src/pcl18/surface/impl/texture_mapping.hpp
-+++ b/corelib/src/pcl18/surface/impl/texture_mapping.hpp
-@@ -41,6 +41,7 @@
- #include <pcl/common/distances.h>
- #include <pcl18/surface/texture_mapping.h>
- #include <pcl/search/octree.h>
-+#include <pcl/common/common.h> // for getAngle3D
-
- ///////////////////////////////////////////////////////////////////////////////////////////////
- template<typename PointInT> std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >
diff --git a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild
similarity index 84%
rename from sci-libs/rtabmap/rtabmap-0.20.3.ebuild
rename to sci-libs/rtabmap/rtabmap-0.20.13.ebuild
index 38dc4acd24e..906a00d0ba7 100644
--- a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild
@@ -9,14 +9,16 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/introlab/rtabmap"
fi
-inherit ${SCM} cmake-utils multilib
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=rolling
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
else
KEYWORDS="~amd64"
- SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P}"
+ SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P}-${VER_SUFFIX}"
fi
DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
@@ -43,7 +45,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/pcl.patch" )
src_configure() {
local mycmakeargs=(
@@ -52,11 +53,11 @@ src_configure() {
"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# Needed since we force ros crawling to be done only in
# /usr/share/ros_packages/
insinto /usr/share/ros_packages/${PN}
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index d05ebf85b04..906a00d0ba7 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -9,14 +9,16 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/introlab/rtabmap"
fi
-inherit ${SCM} cmake-utils multilib
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=rolling
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
else
KEYWORDS="~amd64"
- SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P}"
+ SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P}-${VER_SUFFIX}"
fi
DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
@@ -51,11 +53,11 @@ src_configure() {
"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# Needed since we force ros crawling to be done only in
# /usr/share/ros_packages/
insinto /usr/share/ros_packages/${PN}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/
@ 2023-02-23 16:34 Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2023-02-23 16:34 UTC (permalink / raw
To: gentoo-commits
commit: b1dfbf66cdb74748792875e54ca5c3380955fb3d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 2 16:55:17 2023 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 16:34:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1dfbf66
sci-libs/rtabmap: bump to 0.20.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-libs/rtabmap/Manifest | 1 +
sci-libs/rtabmap/files/vtk.patch | 12 ++++++
sci-libs/rtabmap/rtabmap-0.20.22.ebuild | 68 +++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 691d91fcd682..c98c0621d010 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1,2 @@
DIST rtabmap-0.20.18.tar.gz 21545395 BLAKE2B 1cd7727cc499f0c78fa62f94fca4517e9a5f1eb79e0690683da1c61536542a6d3e342794f4282c92aa725be221fd88afb1f730cc8e431bb9ac293bd73e7146cf SHA512 313b95ba741ecbbec721ce3c339b508e75578f2b85f23739d22ddda5be28c03104e9bb6c4ab8a45ac2225bd72c7b9e84b4c5a5ae7bd4d04b1bb054566be23fff
+DIST rtabmap-0.20.22.tar.gz 21920843 BLAKE2B a430d6ba52a6496adb3dda2cec636d351f541a4052daff75edd69af5318ed24351205c7fe3c4740f490d1a999b90608f70630a78ce3e6bceed85b26a3d81e9ad SHA512 29554bf62f09d55fe4df2c777495ab849e3911119493cb3fd6cdf3319cb6e7f2d9b2b25930a49e40403f64049b0bcbd514e7ae7b2f6a3ac3affe61c19f1e7e39
diff --git a/sci-libs/rtabmap/files/vtk.patch b/sci-libs/rtabmap/files/vtk.patch
new file mode 100644
index 000000000000..adb80216a8da
--- /dev/null
+++ b/sci-libs/rtabmap/files/vtk.patch
@@ -0,0 +1,12 @@
+Index: rtabmap-0.20.22-rolling/guilib/src/opencv/vtkImageMatSource.cpp
+===================================================================
+--- rtabmap-0.20.22-rolling.orig/guilib/src/opencv/vtkImageMatSource.cpp
++++ rtabmap-0.20.22-rolling/guilib/src/opencv/vtkImageMatSource.cpp
+@@ -48,6 +48,7 @@
+ #include <vtkInformationVector.h>
+ #include <vtkStreamingDemandDrivenPipeline.h>
+ #include <vtkObjectFactory.h>
++#include <vtkVersionMacros.h>
+
+ namespace rtabmap {
+ vtkStandardNewMacro(vtkImageMatSource);
diff --git a/sci-libs/rtabmap/rtabmap-0.20.22.ebuild b/sci-libs/rtabmap/rtabmap-0.20.22.ebuild
new file mode 100644
index 000000000000..480f83d5b6bb
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.20.22.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=rolling
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+else
+ KEYWORDS="~amd64"
+ SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P}-${VER_SUFFIX}"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+ media-libs/opencv:=[qt5(-)?]
+ sci-libs/pcl:=[openni,vtk,qt5(-)?]
+ sci-libs/vtk:=[qt5(-)?]
+ sys-libs/zlib
+ sci-libs/octomap:=
+ dev-libs/boost:=
+ dev-cpp/yaml-cpp:=
+ ieee1394? ( media-libs/libdc1394:2= )
+ openni2? ( dev-libs/OpenNI2 )
+ qt5? (
+ dev-qt/qtwidgets:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/yamlcpp.patch" "${FILESDIR}/vtk.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ "-DWITH_QT=$(usex qt5 ON OFF)"
+ "-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+ "-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+ "-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ # Needed since we force ros crawling to be done only in
+ # /usr/share/ros_packages/
+ insinto /usr/share/ros_packages/${PN}
+ doins "${ED}/usr/share/${PN}/package.xml"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-23 16:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-31 9:10 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2023-02-23 16:34 Alexis Ballier
2021-08-03 7:35 Alexis Ballier
2020-08-31 9:10 Alexis Ballier
2020-05-18 11:22 Alexis Ballier
2019-12-10 17:35 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox