gentoo resync : 02.09.2020

4 files changed, 49 insertions, 123 deletions

diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index 6f0ed28d6198..5a939056f9a3 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,5 +1,8 @@
-AUX ocv4.patch 5101 BLAKE2B 1f298695f9c0dd46dad07c6495975043e9031ee5e19fdb886a512861a04bfa3029427213db00af9f6e68ef678c1a172e6ffdaf671bfa9a108f17d58204dd5bf9 SHA512 a24a4a510a501caafaa78a9a856724e3bdf8b9ea70cbf41da7b6b96e18a013b08f01660289e4cb0e77567c9ae6fbabf751cbbefef6ba391a37ecb6b09cb1c373
-DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da
-EBUILD opencv_apps-2.0.1.ebuild 885 BLAKE2B a407bfde56c9c1f14df21623f73e75a3225bdd9e44afbcb5dbcc461645932fcaaff9e24922f3a15ab4e85f11a0998458fc37d89321d3f6c4df2f8bc550a759ce SHA512 6f9a098724e48f781856621cc83fc656ad61c05176699fbd4c85fbd9a32c2930368bb955761a5147c35f4972bda574d1118137426661f221c206bd6be87c0165
-EBUILD opencv_apps-9999.ebuild 848 BLAKE2B a1a94c4a4af7f7a8ce07913ecc7bf98fb75d1e5fc7ad68159050d318e4f2edcd61f3764dc02210c1cdb8858bbe34b25e6c155ea44feb8acc8a6d4a83c5d4ba57 SHA512 c973ba5d50e0f7c175b96e1fdd959960add08504eaecf6e3b84087e09ec195ba09b4a01344844c86cf675cfad7c1073ca2be9784f58d38225bd5aaf37dc36ec0
+DIST opencv_apps-2.0.2-face_detector_withface_test_diamondback.bag 124489590 BLAKE2B a115cc48739ce6b422ea83bb763e3371b40b67febbfb650ffd114caf0cbc5d91d9e83cbdcc7330e9eed2735224ca5ee081cba4480607bdb0c5036e6704641c84 SHA512 944ba8649612283444c1bc191c0f2d502c52aa12d6edaf4615360e17c4c1cdc014e92dd0fe997718c6bd3a7b64e668fa117b0680449c169c99c5e516383d8597
+DIST opencv_apps-2.0.2-vslam_tutorial.bag 467607323 BLAKE2B 11d386de93fea9703f4ab5a807f47082da2f139102aa44ec6cb00f0785b2f129e98eb682ebd8e5c3a51b6919f17fe43d5e9c7ad7ef2d1d8dd328193849d4379b SHA512 82db8d7073d47e870604d21035fd5061a484ecf69c3d0f1d747938f435788b51fc8370e54ad5a0efa14ec28b529b52393514e3a753463fbc4824b0b51c285f25
+DIST opencv_apps-2.0.2.tar.gz 84924 BLAKE2B 1c305bf4f6f64f1f92675264b80c167f4ca0a751ef1901c7112171a82b139a836c7be6afa3f0f493d60d295261c3877c129bb00d69b9542d28e16cd91b6772c3 SHA512 86b5ca3be54b839fc4aa0c786d5a181b85c2c2585c1bed2c2acc273ad66464c1d58fda96f63d4cb474d21d7b203f9c725110d2702c218a28361fdfc6c857fd88
+DIST opencv_apps-9999-face_detector_withface_test_diamondback.bag 124489590 BLAKE2B a115cc48739ce6b422ea83bb763e3371b40b67febbfb650ffd114caf0cbc5d91d9e83cbdcc7330e9eed2735224ca5ee081cba4480607bdb0c5036e6704641c84 SHA512 944ba8649612283444c1bc191c0f2d502c52aa12d6edaf4615360e17c4c1cdc014e92dd0fe997718c6bd3a7b64e668fa117b0680449c169c99c5e516383d8597
+DIST opencv_apps-9999-vslam_tutorial.bag 467607323 BLAKE2B 11d386de93fea9703f4ab5a807f47082da2f139102aa44ec6cb00f0785b2f129e98eb682ebd8e5c3a51b6919f17fe43d5e9c7ad7ef2d1d8dd328193849d4379b SHA512 82db8d7073d47e870604d21035fd5061a484ecf69c3d0f1d747938f435788b51fc8370e54ad5a0efa14ec28b529b52393514e3a753463fbc4824b0b51c285f25
+EBUILD opencv_apps-2.0.2.ebuild 1555 BLAKE2B 279f7278c6cf143d57f822f811f2ef34ceda9038dcc3dd6c268a88d2fc24cbe5866965fbb01b3c857ac1cf80d56d32210b709f9d93979acb10b4f79da1153490 SHA512 4970cde869e036d7a74cd5f045b4132f402901a72d7da5c91f7c030f70970491743cea3be1d6e382ac8d3f7ba63dc9a2ff9db33f647f23c1094d2a928c8ec4ec
+EBUILD opencv_apps-9999.ebuild 1555 BLAKE2B 279f7278c6cf143d57f822f811f2ef34ceda9038dcc3dd6c268a88d2fc24cbe5866965fbb01b3c857ac1cf80d56d32210b709f9d93979acb10b4f79da1153490 SHA512 4970cde869e036d7a74cd5f045b4132f402901a72d7da5c91f7c030f70970491743cea3be1d6e382ac8d3f7ba63dc9a2ff9db33f647f23c1094d2a928c8ec4ec
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_apps/files/ocv4.patch b/dev-ros/opencv_apps/files/ocv4.patch
deleted file mode 100644
index 48954535e0a0..000000000000
--- a/dev-ros/opencv_apps/files/ocv4.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 357fc3f20d0a2252b6a0a6cab8a6ae6cf79b8565 Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Wed, 23 Oct 2019 22:15:57 +0200
-Subject: [PATCH] Support OpenCV 4
-
----
- src/nodelet/face_recognition_nodelet.cpp | 18 +++++++++++++++---
- src/nodelet/segment_objects_nodelet.cpp  |  4 ++++
- src/nodelet/simple_flow_nodelet.cpp      |  4 ++--
- 3 files changed, 21 insertions(+), 5 deletions(-)
-
-Index: opencv_apps-2.0.1/src/nodelet/face_recognition_nodelet.cpp
-===================================================================
---- opencv_apps-2.0.1.orig/src/nodelet/face_recognition_nodelet.cpp
-+++ opencv_apps-2.0.1/src/nodelet/face_recognition_nodelet.cpp
-@@ -229,7 +229,11 @@ public:
-           fs::path file_path = cit->path();
-           try
-           {
-+#if CV_MAJOR_VERSION > 3
-+            cv::Mat img = cv::imread(file_path.string(), cv::IMREAD_COLOR);
-+#else
-             cv::Mat img = cv::imread(file_path.string(), CV_LOAD_IMAGE_COLOR);
-+#endif
-             labels.push_back(label);
-             images.push_back(img);
-           }
-@@ -327,7 +331,11 @@ class FaceRecognitionNodelet : public op
-                int(face.face.height + face.face.height * face_padding_));
-     cv::Scalar color(0.0, 0.0, 255.0);
-     int boldness = 2;
-+#if CV_MAJOR_VERSION > 3
-+    cv::rectangle(img, r.tl(), r.br(), color, boldness, cv::LINE_AA);
-+#else
-     cv::rectangle(img, r.tl(), r.br(), color, boldness, CV_AA);
-+#endif
- 
-     double font_scale = 1.5;
-     int text_height = 20;
-@@ -338,7 +346,11 @@ class FaceRecognitionNodelet : public op
-       text_bl = r.br() + cv::Point(-r.width, text_height);
-     std::stringstream ss;
-     ss << face.label << " (" << std::fixed << std::setprecision(2) << face.confidence << ")";
-+#if CV_MAJOR_VERSION > 3
-+    cv::putText(img, ss.str(), text_bl, cv::FONT_HERSHEY_PLAIN, font_scale, color, boldness, cv::LINE_AA);
-+#else
-     cv::putText(img, ss.str(), text_bl, cv::FONT_HERSHEY_PLAIN, font_scale, color, boldness, CV_AA);
-+#endif
-   }
- 
-   void extractImage(const cv::Mat& img, const opencv_apps::Rect& rect, cv::Mat& ret, double padding = 0.0)
-@@ -548,7 +560,7 @@ class FaceRecognitionNodelet : public op
-         if (config.model_method == "eigen")
-         {
- // https://docs.opencv.org/3.3.1/da/d60/tutorial_face_main.html
--#if CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3
-+#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3)
-           model_ = face::EigenFaceRecognizer::create(config.model_num_components, config.model_threshold);
- #else
-           model_ = face::createEigenFaceRecognizer(config.model_num_components, config.model_threshold);
-@@ -556,7 +568,7 @@ class FaceRecognitionNodelet : public op
-         }
-         else if (config.model_method == "fisher")
-         {
--#if CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3
-+#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3)
-           model_ = face::FisherFaceRecognizer::create(config.model_num_components, config.model_threshold);
- #else
-           model_ = face::createFisherFaceRecognizer(config.model_num_components, config.model_threshold);
-@@ -564,7 +576,7 @@ class FaceRecognitionNodelet : public op
-         }
-         else if (config.model_method == "LBPH")
-         {
--#if CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3
-+#if CV_MAJOR_VERSION > 3 || (CV_MAJOR_VERSION >= 3 && CV_MINOR_VERSION >= 3)
-           model_ = face::LBPHFaceRecognizer::create(config.lbph_radius, config.lbph_neighbors, config.lbph_grid_x,
-                                                     config.lbph_grid_y);
- #else
-Index: opencv_apps-2.0.1/src/nodelet/segment_objects_nodelet.cpp
-===================================================================
---- opencv_apps-2.0.1.orig/src/nodelet/segment_objects_nodelet.cpp
-+++ opencv_apps-2.0.1/src/nodelet/segment_objects_nodelet.cpp
-@@ -179,7 +179,11 @@ class SegmentObjectsNodelet : public ope
-         }
-       }
-       cv::Scalar color(0, 0, 255);
-+#if CV_MAJOR_VERSION > 3
-+      cv::drawContours(out_frame, contours, largest_comp, color, cv::FILLED, 8, hierarchy);
-+#else
-       cv::drawContours(out_frame, contours, largest_comp, color, CV_FILLED, 8, hierarchy);
-+#endif
- 
-       std_msgs::Float64 area_msg;
-       area_msg.data = max_area;
-Index: opencv_apps-2.0.1/src/nodelet/simple_flow_nodelet.cpp
-===================================================================
---- opencv_apps-2.0.1.orig/src/nodelet/simple_flow_nodelet.cpp
-+++ opencv_apps-2.0.1/src/nodelet/simple_flow_nodelet.cpp
-@@ -46,7 +46,7 @@
- #include <opencv2/highgui/highgui.hpp>
- #include <opencv2/imgproc/imgproc.hpp>
- #include <opencv2/video/tracking.hpp>
--#if CV_MAJOR_VERSION == 3
-+#if CV_MAJOR_VERSION >= 3
- #include <opencv2/optflow.hpp>
- #endif
- 
-@@ -163,8 +163,8 @@ class SimpleFlowNodelet : public opencv_
-       }
- 
-       float start = (float)cv::getTickCount();
--#if CV_MAJOR_VERSION == 3
--      cv::optflow::calcOpticalFlowSF(gray, prevGray,
-+#if CV_MAJOR_VERSION >= 3
-+      cv::optflow::calcOpticalFlowSF(gray, prevGray,
- #else
-       cv::calcOpticalFlowSF(gray, prevGray,
- #endif
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.2.ebuild
index e6864994ac92..d53270120b50 100644
--- a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-2.0.2.ebuild
@@ -13,6 +13,10 @@ DESCRIPTION="OpenCV applications for ROS"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
+SRC_URI="${SRC_URI}
+	http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> ${P}-face_detector_withface_test_diamondback.bag
+	http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> ${P}-vslam_tutorial.bag
+"
 
 RDEPEND="
 	dev-ros/cv_bridge
@@ -35,6 +39,22 @@ DEPEND="${RDEPEND}
 		dev-ros/image_proc
 		dev-ros/topic_tools
 		dev-ros/compressed_image_transport
+		dev-ros/image_view
 	)
 "
-PATCHES=( "${FILESDIR}/ocv4.patch" )
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in face_detector_withface_test_diamondback.bag vslam_tutorial.bag ; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed \
+		-e "s#http://download.ros.org/data/face_detector#file://${S}#" \
+		-e "s#http://download.ros.org/data/vslam_system#file://${S}#" \
+		-i test/CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
index bb49ddbddb1e..d53270120b50 100644
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
@@ -13,6 +13,10 @@ DESCRIPTION="OpenCV applications for ROS"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
+SRC_URI="${SRC_URI}
+	http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> ${P}-face_detector_withface_test_diamondback.bag
+	http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> ${P}-vslam_tutorial.bag
+"
 
 RDEPEND="
 	dev-ros/cv_bridge
@@ -35,5 +39,22 @@ DEPEND="${RDEPEND}
 		dev-ros/image_proc
 		dev-ros/topic_tools
 		dev-ros/compressed_image_transport
+		dev-ros/image_view
 	)
 "
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in face_detector_withface_test_diamondback.bag vslam_tutorial.bag ; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed \
+		-e "s#http://download.ros.org/data/face_detector#file://${S}#" \
+		-e "s#http://download.ros.org/data/vslam_system#file://${S}#" \
+		-i test/CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}