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 <matla...@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}
