dev-ros/laser_cb_detector: fix build with opencv4
authorAlexis Ballier <aballier@gentoo.org>
Tue, 10 Dec 2019 17:25:54 +0000 (18:25 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Tue, 10 Dec 2019 17:34:50 +0000 (18:34 +0100)
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
dev-ros/laser_cb_detector/files/ocv4.patch [new file with mode: 0644]
dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild

diff --git a/dev-ros/laser_cb_detector/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch
new file mode 100644 (file)
index 0000000..4bbb000
--- /dev/null
@@ -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>
index 888eec2019d88e804bdfa0913d6de525f2e27778..6a7531529b404310e006a4a33aaf5c4904d6c57b 100644 (file)
@@ -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" )