[gentoo-commits] repo/gentoo:master commit in: dev-ros/image_proc/, dev-ros/image_proc/files/

[Alexis Ballier]

commit:     3b80c67d37b12a652718b88cbb45dbfc00389029
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 15:10:59 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 09:51:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b80c67d

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 <AT> gentoo.org>

 dev-ros/image_proc/files/ocv_leak.patch                     | 13 +++++++++++++
 ...image_proc-1.15.2.ebuild => image_proc-1.15.2-r1.ebuild} |  1 +
 dev-ros/image_proc/image_proc-9999.ebuild                   |  1 +
 3 files changed, 15 insertions(+)

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 00000000000..79722625d32
--- /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.ebuild 
b/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
similarity index 94%
rename from dev-ros/image_proc/image_proc-1.15.2.ebuild
rename to dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
index e38214ace5b..ee3903c6312 100644
--- a/dev-ros/image_proc/image_proc-1.15.2.ebuild
+++ b/dev-ros/image_proc/image_proc-1.15.2-r1.ebuild
@@ -33,3 +33,4 @@ DEPEND="${RDEPEND}
                dev-ros/camera_calibration_parsers
        )
 "
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )

diff --git a/dev-ros/image_proc/image_proc-9999.ebuild 
b/dev-ros/image_proc/image_proc-9999.ebuild
index e38214ace5b..ee3903c6312 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" )