From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 10 Dec 2019 17:25:54 +0000 (+0100)
Subject: dev-ros/laser_cb_detector: fix build with opencv4
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=917b6d1797f7aa96a5070fc0b7cf7a92fd95bb60;p=gentoo.git

dev-ros/laser_cb_detector: fix build with opencv4

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---

diff --git a/dev-ros/laser_cb_detector/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch
new file mode 100644
index 000000000000..4bbb0005fda0
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/ocv4.patch
@@ -0,0 +1,13 @@
+Index: laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
+===================================================================
+--- laser_cb_detector.orig/include/laser_cb_detector/laser_cb_detector.h
++++ laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
+@@ -37,7 +37,7 @@
+ #ifndef LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
+ #define LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
+ 
+-#include <opencv/cv.h>
++#include <opencv2/core/core_c.h>
+ #include <calibration_msgs/DenseLaserSnapshot.h>
+ #include <laser_cb_detector/ConfigAction.h>
+ #include <laser_cb_detector/cv_laser_bridge.h>
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 888eec2019d8..6a7531529b40 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
@@ -27,4 +27,4 @@ RDEPEND="
 	dev-ros/settlerlib
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )