summaryrefslogtreecommitdiff
path: root/dev-ros/laser_cb_detector
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/laser_cb_detector
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/laser_cb_detector')
-rw-r--r--dev-ros/laser_cb_detector/Manifest5
-rw-r--r--dev-ros/laser_cb_detector/files/ocv4-2.patch34
-rw-r--r--dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild18
-rw-r--r--dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild18
4 files changed, 61 insertions, 14 deletions
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index a73b200b3d34..a9ad4fb9fbc3 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,7 +1,8 @@
AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
+AUX ocv4-2.patch 1116 BLAKE2B 2de5c0aaf13b30ef81094fe70ca5634de8575817125e36217d3cf1944112b8944231dcef9b075990d113ec6e06b281a14d018328492693007a3ad581621d42ea SHA512 e1f93dcbd8b829bb0ad99d45295f13f4f791c9c92962aa39ef436b6b81b014fb52b022a231a942a28b266763e8374d80543c7c606a4cf7fecbc539930b630077
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 779 BLAKE2B 9a79d3cc8112ff1d5d6d3eb4e41f5a38c494a60270aa44957667dc9f2673d72aaa3003a55643b8d7a56032f496a118c7575395458a5802baa5cc6d06cb7a2bf1 SHA512 34593b76cbf879b9c04ec3d14be9e7f6467302a7d19d347cb2e2d21c6977ae2bd9a635bff5012b35c0ac2b5ee6c996b75d9652c2322969d0d777147837f09d6f
-EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
+EBUILD laser_cb_detector-0.10.14.ebuild 943 BLAKE2B d58ada10a565399e33d5f800d08a597985a26197a92e6f55fe11dd1586834c920a1b4a9f01b16b0e5157af11fe5d4f06387467693688a747bd9614c3b35b0c37 SHA512 2e8b5d31591bd7a0c2ab26eda7d7a99a5d37e98ef968e46c4dba1ad947de1d49b1fcf4a305b1339fa3727bab3114af5bf80a2b4346aae0edf72473a7f5bdaaba
+EBUILD laser_cb_detector-9999.ebuild 943 BLAKE2B d58ada10a565399e33d5f800d08a597985a26197a92e6f55fe11dd1586834c920a1b4a9f01b16b0e5157af11fe5d4f06387467693688a747bd9614c3b35b0c37 SHA512 2e8b5d31591bd7a0c2ab26eda7d7a99a5d37e98ef968e46c4dba1ad947de1d49b1fcf4a305b1339fa3727bab3114af5bf80a2b4346aae0edf72473a7f5bdaaba
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/ocv4-2.patch b/dev-ros/laser_cb_detector/files/ocv4-2.patch
new file mode 100644
index 000000000000..3cc51c45d7dd
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/ocv4-2.patch
@@ -0,0 +1,34 @@
+Index: laser_cb_detector/test/laser_cb_detector_unittest.cpp
+===================================================================
+--- laser_cb_detector.orig/test/laser_cb_detector_unittest.cpp
++++ laser_cb_detector/test/laser_cb_detector_unittest.cpp
+@@ -37,7 +37,7 @@
+
+ #include <laser_cb_detector/ConfigGoal.h>
+ #include <laser_cb_detector/laser_cb_detector.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui.hpp>
+
+ using namespace laser_cb_detector;
+ using namespace std;
+@@ -55,8 +55,9 @@ static const string test_path = xstr(TES
+
+ calibration_msgs::DenseLaserSnapshot getSnapshot(const string& filename)
+ {
+- IplImage* image;
+- image = cvLoadImage(filename.c_str(), 0); // 0 -> Force image to grayscale
++ cv::Mat mat = cv::imread(filename.c_str(), 0);
++ IplImage image_v = cvIplImage(mat);
++ IplImage* image = &image_v;
+ EXPECT_TRUE(image) << "could not open image file [" << filename << "]" << endl;
+
+
+@@ -92,7 +93,7 @@ calibration_msgs::DenseLaserSnapshot get
+ }
+
+ cvReleaseImage(&float_image);
+- cvReleaseImage(&image);
++ //cvReleaseImage(&image);
+
+ return snapshot;
+ }
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 6a7531529b40..5cfe8cc43d4b 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
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -18,7 +17,7 @@ IUSE=""
RDEPEND="
dev-libs/boost:=[threads]
- dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
dev-ros/cv_bridge
media-libs/opencv:=
dev-ros/image_cb_detector
@@ -26,5 +25,12 @@ RDEPEND="
dev-ros/roscpp
dev-ros/settlerlib
"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
+DEPEND="${RDEPEND}
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? (
+ dev-cpp/gtest
+ media-libs/opencv[png]
+ )
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 605a596b776e..5cfe8cc43d4b 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
ROS_REPO_URI="https://github.com/ros-perception/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -18,7 +17,7 @@ IUSE=""
RDEPEND="
dev-libs/boost:=[threads]
- dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
dev-ros/cv_bridge
media-libs/opencv:=
dev-ros/image_cb_detector
@@ -26,5 +25,12 @@ RDEPEND="
dev-ros/roscpp
dev-ros/settlerlib
"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+DEPEND="${RDEPEND}
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ test? (
+ dev-cpp/gtest
+ media-libs/opencv[png]
+ )
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 06:48:46 +0000