From ce738fe0e08dec841e50300a67636ab14ba3198d Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 19 Oct 2020 17:06:36 +0200
Subject: dev-ros/compressed_image_transport: only use required ocv components

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

(limited to 'dev-ros')

diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..310a1c7220be
--- /dev/null
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0-r1.ebuild
@@ -0,0 +1,25 @@
+# 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_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/image_transport
+	media-libs/opencv:=
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
deleted file mode 100644
index f2997bda2e2c..000000000000
--- a/dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
+++ /dev/null
@@ -1,24 +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_transport_plugins"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugin for transparently sending images encoded as JPEG or PNG"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/image_transport
-	media-libs/opencv:=
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
index f2997bda2e2c..310a1c7220be 100644
--- a/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
+++ b/dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )
diff --git a/dev-ros/compressed_image_transport/files/ocv_leak.patch b/dev-ros/compressed_image_transport/files/ocv_leak.patch
new file mode 100644
index 000000000000..cdc103bb0a2d
--- /dev/null
+++ b/dev-ros/compressed_image_transport/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: compressed_image_transport/CMakeLists.txt
+===================================================================
+--- compressed_image_transport.orig/CMakeLists.txt
++++ compressed_image_transport/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.0.2)
+ project(compressed_image_transport)
+ 
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc opencv_imgcodecs opencv_highgui)
+ find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure image_transport)
+ 
+ # generate the dynamic_reconfigure config file
-- 
cgit v1.2.3-65-gdbad