commit:     5ca1e6bc982dac87094284f17752981da28f31cb
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 12:53:17 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 13:02:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca1e6bc

dev-ros/cv_bridge: update patch

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/cv_bridge/files/boostpython.patch | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-ros/cv_bridge/files/boostpython.patch 
b/dev-ros/cv_bridge/files/boostpython.patch
index 72fac808736..a6192f98be2 100644
--- a/dev-ros/cv_bridge/files/boostpython.patch
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -2,14 +2,17 @@ Index: cv_bridge/CMakeLists.txt
 ===================================================================
 --- cv_bridge.orig/CMakeLists.txt
 +++ cv_bridge/CMakeLists.txt
-@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+@@ -5,14 +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)
+-
+-  if(PYTHONLIBS_VERSION_STRING VERSION_LESS "3.8")
+-    # Debian Buster
+-    find_package(Boost REQUIRED python37)
 -  else()
--    find_package(Boost REQUIRED python3)
+-    # Ubuntu Focal
+-    find_package(Boost REQUIRED python)
 -  endif()
 +  find_package(Boost REQUIRED 
python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
  else()

Reply via email to