[gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/, sci-libs/rtabmap/files/

[Alexis Ballier]

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@×××××.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@×××××.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"
-}