summaryrefslogtreecommitdiff
path: root/dev-ros/laser_cb_detector
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/laser_cb_detector
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/laser_cb_detector')
-rw-r--r--dev-ros/laser_cb_detector/Manifest3
-rw-r--r--dev-ros/laser_cb_detector/files/ocv4.patch13
-rw-r--r--dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild2
3 files changed, 16 insertions, 2 deletions
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index 4b6f47a9e756..a73b200b3d34 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,6 +1,7 @@
AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
+AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 754 BLAKE2B 754aa6caa3919022243c83f10857e83ec60befd0f7d2fc6be4fce31eea3884774252bd94ad853fbc9d2ce8df2d283290273ef40c8f6992ccba8328243080d1ed SHA512 823d9e615b926cff6fa41bd911a06e04c7c3afb153d03e75cefc1024ff5fb2a4195eff1f6546f703993f521b6558013c9998254b50c99f73c424b9127dc64898
+EBUILD laser_cb_detector-0.10.14.ebuild 779 BLAKE2B 9a79d3cc8112ff1d5d6d3eb4e41f5a38c494a60270aa44957667dc9f2673d72aaa3003a55643b8d7a56032f496a118c7575395458a5802baa5cc6d06cb7a2bf1 SHA512 34593b76cbf879b9c04ec3d14be9e7f6467302a7d19d347cb2e2d21c6977ae2bd9a635bff5012b35c0ac2b5ee6c996b75d9652c2322969d0d777147837f09d6f
EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
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" )