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

[Alexis Ballier]

commit:     beb2c9a50dcdcdc7dc204a62f723a11f638129f4
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 10:58:22 2021 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 10:58:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb2c9a5

sci-libs/rtabmap: fix automagic & build against latest yaml-cpp

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-libs/rtabmap/files/yamlcpp.patch                | 21 +++++++++++++++++++++
 ...map-0.20.13.ebuild => rtabmap-0.20.13-r1.ebuild} |  3 +++
 sci-libs/rtabmap/rtabmap-9999.ebuild                |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/sci-libs/rtabmap/files/yamlcpp.patch 
b/sci-libs/rtabmap/files/yamlcpp.patch
new file mode 100644
index 00000000000..e6a3b74f5e0
--- /dev/null
+++ b/sci-libs/rtabmap/files/yamlcpp.patch
@@ -0,0 +1,21 @@
+Index: rtabmap-0.20.13-rolling/tools/EurocDataset/CMakeLists.txt
+===================================================================
+--- rtabmap-0.20.13-rolling.orig/tools/EurocDataset/CMakeLists.txt
++++ rtabmap-0.20.13-rolling/tools/EurocDataset/CMakeLists.txt
+@@ -1,8 +1,5 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+-FIND_PACKAGE(yaml-cpp QUIET)
+-
+-IF(NOT yaml-cpp_FOUND)
+    find_package(PkgConfig QUIET)
+    IF(PKG_CONFIG_FOUND)
+       pkg_check_modules(yaml_cpp QUIET yaml-cpp)
+@@ -12,7 +9,6 @@ IF(NOT yaml-cpp_FOUND)
+          SET(yaml-cpp_FOUND ${yaml_cpp_FOUND})
+         ENDIF(yaml_cpp_FOUND)
+    ENDIF(PKG_CONFIG_FOUND)
+-ENDIF(NOT yaml-cpp_FOUND)
+ 
+ IF(yaml-cpp_FOUND)
+ 

diff --git a/sci-libs/rtabmap/rtabmap-0.20.13.ebuild 
b/sci-libs/rtabmap/rtabmap-0.20.13-r1.ebuild
similarity index 95%
rename from sci-libs/rtabmap/rtabmap-0.20.13.ebuild
rename to sci-libs/rtabmap/rtabmap-0.20.13-r1.ebuild
index 906a00d0ba7..86bb221427f 100644
--- a/sci-libs/rtabmap/rtabmap-0.20.13.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.20.13-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
        sys-libs/zlib
        sci-libs/octomap:=
        dev-libs/boost:=
+       dev-cpp/yaml-cpp:=
        ieee1394? ( media-libs/libdc1394:2= )
        openni2? ( dev-libs/OpenNI2 )
        qt5? (
@@ -46,6 +47,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+
 src_configure() {
        local mycmakeargs=(
                "-DWITH_QT=$(usex qt5 ON OFF)"

diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild 
b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 906a00d0ba7..86bb221427f 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
        sys-libs/zlib
        sci-libs/octomap:=
        dev-libs/boost:=
+       dev-cpp/yaml-cpp:=
        ieee1394? ( media-libs/libdc1394:2= )
        openni2? ( dev-libs/OpenNI2 )
        qt5? (
@@ -46,6 +47,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+
 src_configure() {
        local mycmakeargs=(
                "-DWITH_QT=$(usex qt5 ON OFF)"