diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /dev-ros/cv_bridge | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-ros/cv_bridge')
| -rw-r--r-- | dev-ros/cv_bridge/Manifest | 5 | ||||
| -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 |
4 files changed, 25 insertions, 4 deletions
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest index 0dc4f121dfa8..6f8a744224c8 100644 --- a/dev-ros/cv_bridge/Manifest +++ b/dev-ros/cv_bridge/Manifest @@ -1,5 +1,6 @@ AUX boostpython.patch 599 BLAKE2B 5076c2efdfd06afa9dbc9e3ad344774c1fca54ef172a4808e4ba7b40f4770250d49b1e478abcee1ac973c3a1012579694499a1dd48fd84c19f996441920c329c SHA512 21c5a6589a1ee19d5f586b535807c35f5eef77da6dae614deb7542d8cb1cf850902b5d7de197d6060016f43dcbef8d6d69d104abc5f5fa0af6131a415a43ba64 +AUX ocv_leak.patch 536 BLAKE2B 4b1def824e397178ae6769ce1efce40f48c2f43b0cc759f5a001d007854684b823284828b1df483219acd587654c2e5919fdaa6ef15a92d33c0379a159f10462 SHA512 a84aa1acecd55b45760ecb8a93a88721a79ec0b882a62ae32fdeb839c2a406de0b870765a562a12cf9fd9c608bc900722fbcb5eb0f6a9653809167b2f2631967 DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba -EBUILD cv_bridge-1.15.0.ebuild 801 BLAKE2B 92b9e314c3c22a21a6496ecb8c1e8c047dbf14993c30a453cd6f934a99602ea6c9bb8c5c1d9c1b86c28f51bfd6d8a137a24349343ec8ace88debadd6364bfbf8 SHA512 0871710d79cbd4fcce528d783fb6c52c2cf4d9a678ac69fa05ff1790788140c007355b5b38341c806999b6c3656f56e81d74822c4a4183bc36692dcdf00b6993 -EBUILD cv_bridge-9999.ebuild 801 BLAKE2B 92b9e314c3c22a21a6496ecb8c1e8c047dbf14993c30a453cd6f934a99602ea6c9bb8c5c1d9c1b86c28f51bfd6d8a137a24349343ec8ace88debadd6364bfbf8 SHA512 0871710d79cbd4fcce528d783fb6c52c2cf4d9a678ac69fa05ff1790788140c007355b5b38341c806999b6c3656f56e81d74822c4a4183bc36692dcdf00b6993 +EBUILD cv_bridge-1.15.0-r1.ebuild 830 BLAKE2B 37b1fd1b333425d291cca60707ea75d0ddd0033ca114b7a145d1a99ff827d537830a322fd925d4b756f70cf3ff81edabe4a9c1297c8da87671d9b54dfc5333eb SHA512 9a391aaa204f4753fc645a62da1dfc3463feacdd7eaf9c45ce5bf43b4382b4a1acf6597a6ff277b36167272784df28af404d99d3a1f6cd1803ea3582c40ff8cb +EBUILD cv_bridge-9999.ebuild 830 BLAKE2B 37b1fd1b333425d291cca60707ea75d0ddd0033ca114b7a145d1a99ff827d537830a322fd925d4b756f70cf3ff81edabe4a9c1297c8da87671d9b54dfc5333eb SHA512 9a391aaa204f4753fc645a62da1dfc3463feacdd7eaf9c45ce5bf43b4382b4a1acf6597a6ff277b36167272784df28af404d99d3a1f6cd1803ea3582c40ff8cb MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693 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 |