dev-ros/opencv_apps: Remove old

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

3 files changed, 0 insertions, 159 deletions

diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index ef2db6665f5d..bf5a37ab155d 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,2 +1 @@
-DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da
 DIST opencv_apps-2.0.2.tar.gz 84924 BLAKE2B 1c305bf4f6f64f1f92675264b80c167f4ca0a751ef1901c7112171a82b139a836c7be6afa3f0f493d60d295261c3877c129bb00d69b9542d28e16cd91b6772c3 SHA512 86b5ca3be54b839fc4aa0c786d5a181b85c2c2585c1bed2c2acc273ad66464c1d58fda96f63d4cb474d21d7b203f9c725110d2702c218a28361fdfc6c857fd88
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.1.ebuild
deleted file mode 100644
index e6864994ac92..000000000000
--- a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="OpenCV applications for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	>=media-libs/opencv-3.3:0=[contrib]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/roslaunch
-		dev-ros/rostest
-		dev-ros/rosbag
-		dev-ros/rosservice
-		dev-ros/rostopic
-		dev-ros/image_proc
-		dev-ros/topic_tools
-		dev-ros/compressed_image_transport
-	)
-"
-PATCHES=( "${FILESDIR}/ocv4.patch" )