summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2019-12-10 17:37:43 +0100
committerAlexis Ballier <aballier@gentoo.org>2019-12-10 18:34:47 +0100
commit8dad73f807fe1bd4d356a752473847ca0a5d500e (patch)
treeecb93a3b21ef16dfcefc72c3c564f1a871f6c99b
parentsci-libs/rtabmap: Remove old (diff)
downloadgentoo-8dad73f807fe1bd4d356a752473847ca0a5d500e.tar.gz
gentoo-8dad73f807fe1bd4d356a752473847ca0a5d500e.tar.bz2
gentoo-8dad73f807fe1bd4d356a752473847ca0a5d500e.zip
sci-libs/rtabmap: fix buidl with opencv4
Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
-rw-r--r--sci-libs/rtabmap/files/ocv4.patch23
-rw-r--r--sci-libs/rtabmap/rtabmap-0.19.3.ebuild1
2 files changed, 24 insertions, 0 deletions
diff --git a/sci-libs/rtabmap/files/ocv4.patch b/sci-libs/rtabmap/files/ocv4.patch
new file mode 100644
index 000000000000..465b364ef013
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv4.patch
@@ -0,0 +1,23 @@
+From d5b4b252870e4225ed00bd544a102015e5172c85 Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Fri, 9 Aug 2019 15:31:47 -0400
+Subject: [PATCH] updated ORBExtractor opencv include (compatibility issue
+ https://github.com/introlab/rtabmap_ros/issues/333)
+
+---
+ corelib/src/opencv/ORBextractor.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/corelib/src/opencv/ORBextractor.h b/corelib/src/opencv/ORBextractor.h
+index 0f06c395..58619a15 100644
+--- a/corelib/src/opencv/ORBextractor.h
++++ b/corelib/src/opencv/ORBextractor.h
+@@ -31,7 +31,7 @@
+
+ #include <vector>
+ #include <list>
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
+
+
+ namespace rtabmap
diff --git a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
index da61f393cbde..a76c02847b15 100644
--- a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/ocv4.patch" )
src_configure() {
local mycmakeargs=(