From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- sci-libs/rtabmap/Manifest | 7 ++-- sci-libs/rtabmap/files/pcl.patch | 22 ----------- sci-libs/rtabmap/rtabmap-0.20.13.ebuild | 65 +++++++++++++++++++++++++++++++++ sci-libs/rtabmap/rtabmap-0.20.3.ebuild | 64 -------------------------------- sci-libs/rtabmap/rtabmap-9999.ebuild | 12 +++--- 5 files changed, 75 insertions(+), 95 deletions(-) delete mode 100644 sci-libs/rtabmap/files/pcl.patch create mode 100644 sci-libs/rtabmap/rtabmap-0.20.13.ebuild delete mode 100644 sci-libs/rtabmap/rtabmap-0.20.3.ebuild (limited to 'sci-libs/rtabmap') diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 338a5d4c5f60..3a54a8235e24 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,5 +1,4 @@ -AUX pcl.patch 1093 BLAKE2B 16faab539f13f54db1518babe02d208b438d984fd462098ac4c1babc9b6f509e14b307c58f59e66a177e66bdaadd8ccc3e509aac9da4c207104f0a967e790843 SHA512 5a5b97f9c028adff316ad50cf4e002b54d8603f3394d631330109c986b7184aaae6cba08e2bbcc1c21f9b97f77fbabe2fab344fa1119b47a1c24a774ed637bd6 -DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7 -EBUILD rtabmap-0.20.3.ebuild 1462 BLAKE2B c01fe814a8d4c300705bbf4116633d5e9670274cfcadda21ef38139111e35a0d37fb147800dabe36ab48bcfb1796f1ea35fad285661e4a53745c961f7dc9cb2e SHA512 aa238a9379b985357223cd9356d6effb5344a4f5c627d747207e2bca0e2cb8127a35ad5a63852cabd5b52a7461fcc41279f6416b4b03ca762968f0e1408bae38 -EBUILD rtabmap-9999.ebuild 1426 BLAKE2B 8f75d91b8b718f4aa724b9e3b3b2abd38e84760606818eb4d1d1f26958aadd7f907e0b43cad24a0f3e132e83d19efcce15960d8f9b8235d4c08976ebb0496973 SHA512 291b0a6427444d18a36aa883e83c4a42696080caea646b8e44f2236a1f74c9ec361cf5022e346c11fa621185b672c6fbfc76de5022da1908b8ef95757267feb6 +DIST rtabmap-0.20.13.tar.gz 21501493 BLAKE2B eddec6e4812cea231f88263ce136eb535bc099939a482d6fb6de0e6ab3a302c395eb5f6c824d04da8d48a7f7ad9d63b8fa313ae3c21dcada74ec89c7e8130af5 SHA512 4014ec3b7bc2edbd7f361026d5a4be9222b094e398fde68512aab37b3edcb01d47256e4931de6ea1b3bcada9ac81405946e85e774220b9cf43d14a2db6c91118 +EBUILD rtabmap-0.20.13.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304 +EBUILD rtabmap-9999.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81 diff --git a/sci-libs/rtabmap/files/pcl.patch b/sci-libs/rtabmap/files/pcl.patch deleted file mode 100644 index 249d93d1c595..000000000000 --- a/sci-libs/rtabmap/files/pcl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 24052a6ebe65fb260ee1d838ca5305b12b15d928 Mon Sep 17 00:00:00 2001 -From: matlabbe -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 - #include - #include -+#include // for getAngle3D - - /////////////////////////////////////////////////////////////////////////////////////////////// - template std::vector > diff --git a/sci-libs/rtabmap/rtabmap-0.20.13.ebuild b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild new file mode 100644 index 000000000000..906a00d0ba74 --- /dev/null +++ b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 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:= + 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" + +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" +} diff --git a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild deleted file mode 100644 index 38dc4acd24e8..000000000000 --- a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 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 - 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: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}/pcl.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-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild index d05ebf85b047..906a00d0ba74 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} -- cgit v1.2.3