From 3b80c67d37b12a652718b88cbb45dbfc00389029 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 19 Oct 2020 17:10:59 +0200
Subject: dev-ros/image_proc: only link to required ocv components

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/image_proc/files/ocv_leak.patch        | 13 ++++++++++
 dev-ros/image_proc/image_proc-1.15.2-r1.ebuild | 36 ++++++++++++++++++++++++++
 dev-ros/image_proc/image_proc-1.15.2.ebuild    | 35 -------------------------
 dev-ros/image_proc/image_proc-9999.ebuild      |  1 +
 4 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 dev-ros/image_proc/files/ocv_leak.patch
 create mode 100644 dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
 delete mode 100644 dev-ros/image_proc/image_proc-1.15.2.ebuild

(limited to 'dev-ros')

diff --git a/dev-ros/image_proc/files/ocv_leak.patch b/dev-ros/image_proc/files/ocv_leak.patch
new file mode 100644
index 000000000000..79722625d327
--- /dev/null
+++ b/dev-ros/image_proc/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: image_proc/CMakeLists.txt
+===================================================================
+--- image_proc.orig/CMakeLists.txt
++++ image_proc/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(image_proc)
+ find_package(catkin REQUIRED)
+ 
+ find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_geometry image_transport nodelet nodelet_topic_tools roscpp sensor_msgs)
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_highgui)
+ find_package(Boost REQUIRED COMPONENTS thread)
+ 
+ if(cv_bridge_VERSION VERSION_GREATER "1.12.0")
diff --git a/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild b/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
new file mode 100644
index 000000000000..ee3903c63127
--- /dev/null
+++ b/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Single image rectification and color processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	dev-ros/roscpp
+	dev-libs/console_bridge:=
+	media-libs/opencv:=
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+		dev-ros/camera_calibration_parsers
+	)
+"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/image_proc/image_proc-1.15.2.ebuild b/dev-ros/image_proc/image_proc-1.15.2.ebuild
deleted file mode 100644
index e38214ace5bb..000000000000
--- a/dev-ros/image_proc/image_proc-1.15.2.ebuild
+++ /dev/null
@@ -1,35 +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/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Single image rectification and color processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/nodelet_topic_tools
-	dev-ros/roscpp
-	dev-libs/console_bridge:=
-	media-libs/opencv:=
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest
-		dev-cpp/gtest
-		dev-ros/camera_calibration_parsers
-	)
-"
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
index e38214ace5bb..ee3903c63127 100644
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ b/dev-ros/image_proc/image_proc-9999.ebuild
@@ -33,3 +33,4 @@ DEPEND="${RDEPEND}
 		dev-ros/camera_calibration_parsers
 	)
 "
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
-- 
cgit v1.2.3-65-gdbad