| 1 |
commit: 5ca1e6bc982dac87094284f17752981da28f31cb |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 16 12:53:17 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 16 13:02:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca1e6bc |
| 7 |
|
| 8 |
dev-ros/cv_bridge: update patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ros/cv_bridge/files/boostpython.patch | 11 +++++++---- |
| 14 |
1 file changed, 7 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch |
| 17 |
index 72fac808736..a6192f98be2 100644 |
| 18 |
--- a/dev-ros/cv_bridge/files/boostpython.patch |
| 19 |
+++ b/dev-ros/cv_bridge/files/boostpython.patch |
| 20 |
@@ -2,14 +2,17 @@ Index: cv_bridge/CMakeLists.txt |
| 21 |
=================================================================== |
| 22 |
--- cv_bridge.orig/CMakeLists.txt |
| 23 |
+++ cv_bridge/CMakeLists.txt |
| 24 |
-@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS |
| 25 |
+@@ -5,14 +5,7 @@ find_package(catkin REQUIRED COMPONENTS |
| 26 |
|
| 27 |
if(NOT ANDROID) |
| 28 |
find_package(PythonLibs) |
| 29 |
-- if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3) |
| 30 |
-- find_package(Boost REQUIRED python) |
| 31 |
+- |
| 32 |
+- if(PYTHONLIBS_VERSION_STRING VERSION_LESS "3.8") |
| 33 |
+- # Debian Buster |
| 34 |
+- find_package(Boost REQUIRED python37) |
| 35 |
- else() |
| 36 |
-- find_package(Boost REQUIRED python3) |
| 37 |
+- # Ubuntu Focal |
| 38 |
+- find_package(Boost REQUIRED python) |
| 39 |
- endif() |
| 40 |
+ find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) |
| 41 |
else() |
Archives