commit: 18fe6adea16b680a1aa527944342673df2cb9af0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 07:29:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fe6ade
sci-libs/rtabmap: drop 0.20.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/rtabmap/Manifest | 1 -
sci-libs/rtabmap/files/ocv.patch | 30 ---------------
sci-libs/rtabmap/rtabmap-0.20.18.ebuild | 68 ---------------------------------
3 files changed, 99 deletions(-)
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 181de12c7f42..bcfb111fbf90 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,2 +1 @@
-DIST rtabmap-0.20.18.tar.gz 21545395 BLAKE2B
1cd7727cc499f0c78fa62f94fca4517e9a5f1eb79e0690683da1c61536542a6d3e342794f4282c92aa725be221fd88afb1f730cc8e431bb9ac293bd73e7146cf
SHA512
313b95ba741ecbbec721ce3c339b508e75578f2b85f23739d22ddda5be28c03104e9bb6c4ab8a45ac2225bd72c7b9e84b4c5a5ae7bd4d04b1bb054566be23fff
DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B
ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f
SHA512
bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942
diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch
deleted file mode 100644
index 642f2e1e911b..000000000000
--- a/sci-libs/rtabmap/files/ocv.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cf64b20e1fd5b7aca6f5f708e9b790aa41e799db Mon Sep 17 00:00:00 2001
-From: matlabbe <matla...@gmail.com>
-Date: Tue, 10 May 2022 22:47:15 -0400
-Subject: [PATCH] =?UTF-8?q?Fixed=20error:=20=E2=80=98drawAxis=E2=80=99=20i?=
- =?UTF-8?q?s=20not=20a=20member=20of=20=E2=80=98cv::aruco=E2=80=99=20(open?=
- =?UTF-8?q?cv=204.5.5)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- corelib/src/MarkerDetector.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/corelib/src/MarkerDetector.cpp b/corelib/src/MarkerDetector.cpp
-index b59cb9468..2a3957f90 100644
---- a/corelib/src/MarkerDetector.cpp
-+++ b/corelib/src/MarkerDetector.cpp
-@@ -304,7 +304,11 @@ std::map<int, MarkerInfo> MarkerDetector::detect(const
cv::Mat & image,
- std::map<int, MarkerInfo>::iterator iter =
detections.find(ids[i]);
- if(iter!=detections.end())
- {
-+#if CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && (CV_MINOR_VERSION >1 ||
(CV_MINOR_VERSION==1 && CV_PATCH_VERSION>=1)))
-+ cv::drawFrameAxes(*imageWithDetections, model.K(),
model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f);
-+#else
- cv::aruco::drawAxis(*imageWithDetections, model.K(),
model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f);
-+#endif
- }
- }
- }
diff --git a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
b/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
deleted file mode 100644
index 61f45ae6ab9f..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 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}/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_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"
-}
