| 1 |
commit: d574fac9e5441907ef43d34d395bb86794bae1bb |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 14:19:12 2019 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 17:01:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d574fac9 |
| 7 |
|
| 8 |
dev-ros/cv_bridge: fix boost python detection |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild | 3 ++- |
| 14 |
dev-ros/cv_bridge/cv_bridge-9999.ebuild | 3 ++- |
| 15 |
dev-ros/cv_bridge/files/boostpython.patch | 17 +++++++++++++++++ |
| 16 |
3 files changed, 21 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild |
| 19 |
index 781df6ff021..422225d82b4 100644 |
| 20 |
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild |
| 21 |
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
@@ -21,3 +21,4 @@ RDEPEND=" |
| 29 |
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
| 30 |
" |
| 31 |
DEPEND="${RDEPEND}" |
| 32 |
+PATCHES=( "${FILESDIR}/boostpython.patch" ) |
| 33 |
|
| 34 |
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild |
| 35 |
index 091646aa633..422225d82b4 100644 |
| 36 |
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild |
| 37 |
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
-# Copyright 1999-2017 Gentoo Foundation |
| 40 |
+# Copyright 1999-2019 Gentoo Authors |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
EAPI=5 |
| 44 |
@@ -21,3 +21,4 @@ RDEPEND=" |
| 45 |
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
| 46 |
" |
| 47 |
DEPEND="${RDEPEND}" |
| 48 |
+PATCHES=( "${FILESDIR}/boostpython.patch" ) |
| 49 |
|
| 50 |
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..72fac808736 |
| 53 |
--- /dev/null |
| 54 |
+++ b/dev-ros/cv_bridge/files/boostpython.patch |
| 55 |
@@ -0,0 +1,17 @@ |
| 56 |
+Index: cv_bridge/CMakeLists.txt |
| 57 |
+=================================================================== |
| 58 |
+--- cv_bridge.orig/CMakeLists.txt |
| 59 |
++++ cv_bridge/CMakeLists.txt |
| 60 |
+@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS |
| 61 |
+ |
| 62 |
+ if(NOT ANDROID) |
| 63 |
+ find_package(PythonLibs) |
| 64 |
+- if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3) |
| 65 |
+- find_package(Boost REQUIRED python) |
| 66 |
+- else() |
| 67 |
+- find_package(Boost REQUIRED python3) |
| 68 |
+- endif() |
| 69 |
++ find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) |
| 70 |
+ else() |
| 71 |
+ find_package(Boost REQUIRED) |
| 72 |
+ endif() |
Archives