commit: d574fac9e5441907ef43d34d395bb86794bae1bb
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 14:19:12 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 17:01:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d574fac9
dev-ros/cv_bridge: fix boost python detection
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild | 3 ++-
dev-ros/cv_bridge/cv_bridge-9999.ebuild | 3 ++-
dev-ros/cv_bridge/files/boostpython.patch | 17 +++++++++++++++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
index 781df6ff021..422225d82b4 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,3 +21,4 @@ RDEPEND="
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 091646aa633..422225d82b4 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,3 +21,4 @@ RDEPEND="
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch
b/dev-ros/cv_bridge/files/boostpython.patch
new file mode 100644
index 00000000000..72fac808736
--- /dev/null
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -0,0 +1,17 @@
+Index: cv_bridge/CMakeLists.txt
+===================================================================
+--- cv_bridge.orig/CMakeLists.txt
++++ cv_bridge/CMakeLists.txt
+@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+
+ if(NOT ANDROID)
+ find_package(PythonLibs)
+- if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
+- find_package(Boost REQUIRED python)
+- else()
+- find_package(Boost REQUIRED python3)
+- endif()
++ find_package(Boost REQUIRED
python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ else()
+ find_package(Boost REQUIRED)
+ endif()
