diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-10-19 16:09:39 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-10-20 11:51:56 +0200 |
| commit | 3efed313ea323a91df22c6a70d71b4a3d1af5579 (patch) | |
| tree | 831182dc8ec796120146d560b5ff076c4a822c45 /dev-ros | |
| parent | media-libs/fontconfig: Stabilize 2.13.1-r2 arm64, #733558 (diff) | |
| download | gentoo-3efed313ea323a91df22c6a70d71b4a3d1af5579.tar.gz gentoo-3efed313ea323a91df22c6a70d71b4a3d1af5579.tar.bz2 gentoo-3efed313ea323a91df22c6a70d71b4a3d1af5579.zip | |
dev-ros/cv_bridge: Avoid finding all of opencv
The package does not need all modules at all. If opencv useflags change,
revdeps will break.
Closes: https://bugs.gentoo.org/738570
Closes: https://bugs.gentoo.org/738570
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/cv_bridge/cv_bridge-1.15.0-r1.ebuild (renamed from dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild) | 2 | ||||
| -rw-r--r-- | dev-ros/cv_bridge/cv_bridge-9999.ebuild | 2 | ||||
| -rw-r--r-- | dev-ros/cv_bridge/files/ocv_leak.patch | 20 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.15.0-r1.ebuild index 582de3e58f72..6e6271b0b528 100644 --- a/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild +++ b/dev-ros/cv_bridge/cv_bridge-1.15.0-r1.ebuild @@ -27,4 +27,4 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] ) " -PATCHES=( "${FILESDIR}/boostpython.patch" ) +PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" ) diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild index 582de3e58f72..6e6271b0b528 100644 --- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild +++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild @@ -27,4 +27,4 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] ) " -PATCHES=( "${FILESDIR}/boostpython.patch" ) +PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv_leak.patch" ) diff --git a/dev-ros/cv_bridge/files/ocv_leak.patch b/dev-ros/cv_bridge/files/ocv_leak.patch new file mode 100644 index 000000000000..32b3fafbe074 --- /dev/null +++ b/dev-ros/cv_bridge/files/ocv_leak.patch @@ -0,0 +1,20 @@ +Index: cv_bridge/CMakeLists.txt +=================================================================== +--- cv_bridge.orig/CMakeLists.txt ++++ cv_bridge/CMakeLists.txt +@@ -17,14 +17,7 @@ else() + find_package(Boost REQUIRED) + endif() + +-set(_opencv_version 4) +-find_package(OpenCV 4 QUIET) +-if(NOT OpenCV_FOUND) +- message(STATUS "Did not find OpenCV 4, trying OpenCV 3") +- set(_opencv_version 3) +-endif() +- +-find_package(OpenCV ${_opencv_version4} REQUIRED ++find_package(OpenCV 4 REQUIRED + COMPONENTS + opencv_core + opencv_imgproc |