diff options
Diffstat (limited to 'dev-ros/laser_cb_detector')
| -rw-r--r-- | dev-ros/laser_cb_detector/Manifest | 10 | ||||
| -rw-r--r-- | dev-ros/laser_cb_detector/files/boost170.patch | 13 | ||||
| -rw-r--r-- | dev-ros/laser_cb_detector/files/gcc6.patch | 13 | ||||
| -rw-r--r-- | dev-ros/laser_cb_detector/files/ocv4-2.patch | 34 | ||||
| -rw-r--r-- | dev-ros/laser_cb_detector/files/ocv4.patch | 13 | ||||
| -rw-r--r-- | dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild (renamed from dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-r1.ebuild) | 1 | ||||
| -rw-r--r-- | dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild | 1 |
7 files changed, 3 insertions, 82 deletions
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest index 7e4df761d3f6..89dc269eaa12 100644 --- a/dev-ros/laser_cb_detector/Manifest +++ b/dev-ros/laser_cb_detector/Manifest @@ -1,8 +1,4 @@ -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-r1.ebuild 946 BLAKE2B ad5220e1d1888fe45724619cfd72cc886c104ef84cb230ed5803eb17ee9751bac0dc0b294b067b6fac321d97df9a2a8ee274dfed51b7deb768aace6839899850 SHA512 e70d4db4218d6b28e6aa026f88a9bc078577831ce5a19fb88728b63276affae0f9158a8c288dc0bc9f25df88152a280572503d1263076bd0de47fc539ab1d20d -EBUILD laser_cb_detector-9999.ebuild 946 BLAKE2B ad5220e1d1888fe45724619cfd72cc886c104ef84cb230ed5803eb17ee9751bac0dc0b294b067b6fac321d97df9a2a8ee274dfed51b7deb768aace6839899850 SHA512 e70d4db4218d6b28e6aa026f88a9bc078577831ce5a19fb88728b63276affae0f9158a8c288dc0bc9f25df88152a280572503d1263076bd0de47fc539ab1d20d +DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894 +EBUILD laser_cb_detector-0.10.15.ebuild 828 BLAKE2B 632c1f262f1a40d3b369117e2a50a65f5d2b34d25b34dcd7ac446d43fe7fb10370eebcabd9f5098681b6fa27c8b5f185fbe814c4cdadf805590856edbb94f34e SHA512 602542e11685b5675a362ba2523f0987235d15a92f3538e7c0709ccc6d41f2534fce64ad3e96173ac3be6ca7fd0bd12401a70ebf5aafb857f5049379d33c779e +EBUILD laser_cb_detector-9999.ebuild 828 BLAKE2B 632c1f262f1a40d3b369117e2a50a65f5d2b34d25b34dcd7ac446d43fe7fb10370eebcabd9f5098681b6fa27c8b5f185fbe814c4cdadf805590856edbb94f34e SHA512 602542e11685b5675a362ba2523f0987235d15a92f3538e7c0709ccc6d41f2534fce64ad3e96173ac3be6ca7fd0bd12401a70ebf5aafb857f5049379d33c779e MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963 diff --git a/dev-ros/laser_cb_detector/files/boost170.patch b/dev-ros/laser_cb_detector/files/boost170.patch deleted file mode 100644 index 019a948be95c..000000000000 --- a/dev-ros/laser_cb_detector/files/boost170.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: laser_cb_detector/CMakeLists.txt -=================================================================== ---- laser_cb_detector.orig/CMakeLists.txt -+++ laser_cb_detector/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 2.8.3) - project(laser_cb_detector) - --find_package(Boost REQUIRED signals thread) -+find_package(Boost REQUIRED thread) - find_package(catkin REQUIRED actionlib actionlib_msgs cv_bridge image_cb_detector message_filters roscpp settlerlib std_msgs) - - add_action_files(DIRECTORY action FILES Config.action) diff --git a/dev-ros/laser_cb_detector/files/gcc6.patch b/dev-ros/laser_cb_detector/files/gcc6.patch deleted file mode 100644 index 6580ca5e8453..000000000000 --- a/dev-ros/laser_cb_detector/files/gcc6.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: laser_cb_detector/CMakeLists.txt -=================================================================== ---- laser_cb_detector.orig/CMakeLists.txt -+++ laser_cb_detector/CMakeLists.txt -@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl - ) - - find_package(OpenCV REQUIRED) --include_directories(SYSTEM ${catkin_INCLUDE_DIRS} -+include_directories(${catkin_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS} - ) - include_directories(include) diff --git a/dev-ros/laser_cb_detector/files/ocv4-2.patch b/dev-ros/laser_cb_detector/files/ocv4-2.patch deleted file mode 100644 index 3cc51c45d7dd..000000000000 --- a/dev-ros/laser_cb_detector/files/ocv4-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch deleted file mode 100644 index 4bbb0005fda0..000000000000 --- a/dev-ros/laser_cb_detector/files/ocv4.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-r1.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild index 3f7c54d7040d..993633f2ddf1 100644 --- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-r1.ebuild +++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild @@ -33,4 +33,3 @@ DEPEND="${RDEPEND} 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 3f7c54d7040d..993633f2ddf1 100644 --- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild +++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild @@ -33,4 +33,3 @@ DEPEND="${RDEPEND} media-libs/opencv[png] ) " -PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" ) |