From 38f6df757fb70fca4504bd4b34f6feb51b369a89 Mon Sep 17 00:00:00 2001 From: JeongBong Seo Date: Wed, 3 Apr 2019 22:36:37 +0900 Subject: [PATCH] DRAFT cv-bridge-2.1.0.inc: fix configure error --- .../vision-opencv/cv-bridge-2.1.0.inc | 5 +++- .../0001-Fix-configure-error-for-python.patch | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 includes-ros1/vision-opencv/cv-bridge/0001-Fix-configure-error-for-python.patch diff --git a/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc b/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc index a4b4074..17daf07 100644 --- a/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc +++ b/includes-ros1/vision-opencv/cv-bridge-2.1.0.inc @@ -9,4 +9,7 @@ ROS_BUILDTOOL_DEPENDS += " \ # This option disables python2 support because we can't support both python2 # and python3 since OE upstream has disabled python2 bindings in Boost. -EXTRA_OECMAKE =+ "${@'-DANDROID=ON' if d.getVar('PYTHON_PN') != 'python3' else ''}" +EXTRA_OECMAKE =+ "${@'-DANDROID=ON' if d.getVar('PYTHON_PN', True) != 'python3' else ''}" + +FILESEXTRAPATHS_prepend := "${THISDIR}/cv-bridge:" +SRC_URI_append = " file://0001-Fix-configure-error-for-python.patch" diff --git a/includes-ros1/vision-opencv/cv-bridge/0001-Fix-configure-error-for-python.patch b/includes-ros1/vision-opencv/cv-bridge/0001-Fix-configure-error-for-python.patch new file mode 100644 index 0000000..b476d75 --- /dev/null +++ b/includes-ros1/vision-opencv/cv-bridge/0001-Fix-configure-error-for-python.patch @@ -0,0 +1,25 @@ +From 755d544da685e97fcaa60f536838eeff194d6432 Mon Sep 17 00:00:00 2001 +From: JeongBong Seo +Date: Wed, 3 Apr 2019 22:28:40 +0900 +Subject: Fix configure error for python + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d93e3d2..0d162a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ if(NOT ANDROID) + if(Boost_VERSION LESS 106500) + find_package(Boost REQUIRED python) + else() +- find_package(Boost REQUIRED python3) ++ find_package(Boost REQUIRED python35) + endif() + endif() + else() +-- +2.17.1 +