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

[Alexis Ballier]

commit:     de690e1e197ef5807c4372f6bd421879f080e44c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 16:33:46 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=de690e1e

dev-ros/image_geometry: only link to req ocv modules

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

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

diff --git a/dev-ros/image_geometry/files/ocv_leak.patch 
b/dev-ros/image_geometry/files/ocv_leak.patch
new file mode 100644
index 00000000000..cbc0f5a5066
--- /dev/null
+++ b/dev-ros/image_geometry/files/ocv_leak.patch
@@ -0,0 +1,13 @@
+Index: image_geometry/CMakeLists.txt
+===================================================================
+--- image_geometry.orig/CMakeLists.txt
++++ image_geometry/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.2)
+ project(image_geometry)
+ 
+ find_package(catkin REQUIRED sensor_msgs)
+-find_package(OpenCV REQUIRED)
++find_package(OpenCV REQUIRED COMPONENTS opencv_core opencv_imgproc 
opencv_calib3d)
+ 
+ catkin_package(CATKIN_DEPENDS sensor_msgs
+                DEPENDS OpenCV

diff --git a/dev-ros/image_geometry/image_geometry-1.15.0.ebuild 
b/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
similarity index 93%
rename from dev-ros/image_geometry/image_geometry-1.15.0.ebuild
rename to dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
index e1195646ced..851354d4b1b 100644
--- a/dev-ros/image_geometry/image_geometry-1.15.0.ebuild
+++ b/dev-ros/image_geometry/image_geometry-1.15.0-r1.ebuild
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
                dev-cpp/gtest
                dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
        )"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )

diff --git a/dev-ros/image_geometry/image_geometry-9999.ebuild 
b/dev-ros/image_geometry/image_geometry-9999.ebuild
index e1195646ced..851354d4b1b 100644
--- a/dev-ros/image_geometry/image_geometry-9999.ebuild
+++ b/dev-ros/image_geometry/image_geometry-9999.ebuild
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
                dev-cpp/gtest
                dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
        )"
+PATCHES=( "${FILESDIR}/ocv_leak.patch" )