From 153fd195574cc30040446316bb666af0e58d985f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 14 May 2023 16:01:32 +0100 Subject: gentoo auto-resync : 14:05:2023 - 16:01:32 --- sci-libs/rtabmap/Manifest | 3 -- sci-libs/rtabmap/files/ocv.patch | 30 --------------- sci-libs/rtabmap/rtabmap-0.20.18.ebuild | 68 --------------------------------- 3 files changed, 101 deletions(-) delete mode 100644 sci-libs/rtabmap/files/ocv.patch delete mode 100644 sci-libs/rtabmap/rtabmap-0.20.18.ebuild (limited to 'sci-libs/rtabmap') diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 543be0235736..524c95684aab 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,9 +1,6 @@ -AUX ocv.patch 1361 BLAKE2B a1d019c791e4d5d1fd9546fd5756f18a695ad3702c2dae9b83e989723a7aef497eeabc46058f151984e7e6c8e8134fa0f256cb637587e063496bf6becfb72c19 SHA512 6573dfddad74d5b75e59df6122fe42701e5b4e72b4d52c6c0fb41dba207d3261edd27f9e6ec3e548b42a70f65e37cb72615259402b391ebff1a8926c12a63964 AUX vtk.patch 507 BLAKE2B c6de651fa6bf13fb650f40232d27057f1bea78e2f3b45b2a6576d25bbde33bd3fea0b518f3317aa58238452e338f92d1f35f584017fb6a805cbb33230605a8a6 SHA512 c9fcb0352dd81c4440da0a8e4664497aebffa6c81e295cc304a43fa43b984b97d23d5dedd84b4d16dd979d509c7882c35aebecdb191b6c33c32b9183c053ad6b AUX yamlcpp.patch 675 BLAKE2B 269eb1d6f0e276cc6863d4ae8e8a3c73c6264b681a76f9bc32db185ed0c7b3a115b0fd1871569ff0ddb34dfd10c5aaafe658a620f70e4964bf196fd6ad57780c SHA512 fa8aabe06b75c2fdd3be222c4c51de6c5bc9ca9f2444c4e97cb63c910bf572f616cf0ac6381d4bf0a5f5fe07cb520eb6f748a4fcd19cf7cdd89f76a52da6a5bc -DIST rtabmap-0.20.18.tar.gz 21545395 BLAKE2B 1cd7727cc499f0c78fa62f94fca4517e9a5f1eb79e0690683da1c61536542a6d3e342794f4282c92aa725be221fd88afb1f730cc8e431bb9ac293bd73e7146cf SHA512 313b95ba741ecbbec721ce3c339b508e75578f2b85f23739d22ddda5be28c03104e9bb6c4ab8a45ac2225bd72c7b9e84b4c5a5ae7bd4d04b1bb054566be23fff DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f SHA512 bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942 -EBUILD rtabmap-0.20.18.ebuild 1541 BLAKE2B c30a4dd87b128e3f95b9efe8711a12cfcec05c08f727f97f2743ad92f332572a41445509c64476d3f8d2acb2ecac159f0872afb1d320552498ebfb3b77ff60f8 SHA512 42ce75938cf5960752a8cf1ea3e5b75c72480634c6d6b1df33baebd276ce060c9046fb30c732338ae2bc65c3e4627a8ca58f5713de0579e6b906a70df43c5038 EBUILD rtabmap-0.20.23.ebuild 1541 BLAKE2B 251451eb169e84f70109f7f43220e24187bd13089858e2de4005223ac6811a80f31b945512dcf4f68cf469b51878416b9323ee267aa0a7830b249d4eef3fcf15 SHA512 e84a9ab2203e9a45455da222a9d91fd48846c58a994425c32c7467e65ca0e260b4d11fa46306f47fee8d5701d4efd3de52236ab62f42c971d84a2b1aa18a7890 EBUILD rtabmap-9999.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99 MISC metadata.xml 472 BLAKE2B 141f2e2a39f7e3e8543c255995ecc14ee3168985e47a4c0882d32fdd884a81ca0aeade5a41092ce5525a54a0ac2802714e2c6031c09af9671682231378918c64 SHA512 a472fd8de805c23ebf8de91fdecab35cb5af78bb971ad10f8e4b23ab97efaffc3f7fa3ffbec457ab120d3fe75f4d021079a67d426f0df022be389f00bc311651 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 -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 MarkerDetector::detect(const cv::Mat & image, - std::map::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" -} -- cgit v1.2.3