[Buildroot] [PATCH 09/11] opencv: add python/numpy support
Samuel Martin
s.martin49 at gmail.com
Sun Feb 16 22:00:02 UTC 2014
opencv_python module needs python-numpy because it uses some numpy
headers in this wrapper.
A patch in the OpenCV's build-system is also needed to prevent it from
trying to run python for numpy detection. This patch has already been
integrated upstream.
Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
---
package/opencv/Config.in | 7 +-
...t-run-python-for-numpy-detection-when-cro.patch | 77 ++++++++++++++++++++++
package/opencv/opencv.mk | 16 ++++-
3 files changed, 97 insertions(+), 3 deletions(-)
create mode 100644 package/opencv/opencv-0001-cmake-do-not-run-python-for-numpy-detection-when-cro.patch
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index b6192dc..be0b660 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -84,7 +84,12 @@ config BR2_PACKAGE_OPENCV_LIB_PHOTO
help
Include opencv_photo module into the OpenCV build.
-comment "opencv_python module requires numpy which is not yet available."
+config BR2_PACKAGE_OPENCV_LIB_PYTHON
+ bool "python"
+ depends on BR2_PACKAGE_PYTHON
+ help
+ Include opencv_python module into the OpenCV build.
+ No python example is installed.
config BR2_PACKAGE_OPENCV_LIB_STITCHING
bool "stitching"
diff --git a/package/opencv/opencv-0001-cmake-do-not-run-python-for-numpy-detection-when-cro.patch b/package/opencv/opencv-0001-cmake-do-not-run-python-for-numpy-detection-when-cro.patch
new file mode 100644
index 0000000..bff14eb
--- /dev/null
+++ b/package/opencv/opencv-0001-cmake-do-not-run-python-for-numpy-detection-when-cro.patch
@@ -0,0 +1,77 @@
+From 2ab6c54a6c466c3cb577cacbbace659fe55c2a4f Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49 at gmail.com>
+Date: Fri, 10 Jan 2014 23:39:59 +0100
+Subject: [PATCH] cmake: do not run python for numpy detection when
+ cross-compiling
+
+Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
+---
+ cmake/OpenCVDetectPython.cmake | 45 +++++++++++++++++++++++++++++++-----------
+ 1 file changed, 33 insertions(+), 12 deletions(-)
+
+diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
+index 3326bcd..78052ed 100644
+--- a/cmake/OpenCVDetectPython.cmake
++++ b/cmake/OpenCVDetectPython.cmake
+@@ -80,25 +80,46 @@ if(PYTHON_EXECUTABLE)
+ endif()
+ SET(PYTHON_PACKAGES_PATH "${_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")
+
+- if(NOT PYTHON_NUMPY_INCLUDE_DIR)
+- # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
+- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
+- RESULT_VARIABLE PYTHON_NUMPY_PROCESS
+- OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+- if(PYTHON_NUMPY_PROCESS EQUAL 0)
++ if(NOT CMAKE_CROSSCOMPILING)
++ if(NOT PYTHON_NUMPY_INCLUDE_DIR)
++ # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
++ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
++ RESULT_VARIABLE PYTHON_NUMPY_PROCESS
++ OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
++ OUTPUT_STRIP_TRAILING_WHITESPACE)
++ if(PYTHON_NUMPY_PROCESS EQUAL 0)
++ file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
++ set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
++ endif()
++ endif()
++ else()
++ if(NOT PYTHON_NUMPY_INCLUDE_DIR)
++ message(STATUS "Cannot probe for Python/Numpy support (because we are cross-compiling OpenCV)")
++ message(STATUS "If you want to enable Python/Numpy support, set the following variables:")
++ message(STATUS " PYTHON_EXECUTABLE")
++ message(STATUS " PYTHON_INCLUDE_DIR")
++ message(STATUS " PYTHON_LIBRARY")
++ message(STATUS " PYTHON_NUMPY_INCLUDE_DIR")
++ message(STATUS " PYTHON_NUMPY_VERSION")
++ else()
+ file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
+ set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
+ endif()
+ endif()
+
++
+ if(PYTHON_NUMPY_INCLUDE_DIR)
+ set(PYTHON_USE_NUMPY TRUE)
+- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
+- RESULT_VARIABLE PYTHON_NUMPY_PROCESS
+- OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
++ if(NOT CMAKE_CROSSCOMPILING)
++ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
++ RESULT_VARIABLE PYTHON_NUMPY_PROCESS
++ OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
++ OUTPUT_STRIP_TRAILING_WHITESPACE)
++ else()
++ if(NOT PYTHON_NUMPY_VERSION)
++ set(PYTHON_NUMPY_VERSION "undefined - cannot be probed because of the cross-compilation")
++ endif()
++ endif()
+ endif()
+ endif(NOT ANDROID AND NOT IOS)
+
+--
+1.8.5.2
+
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 51255aa..52a2b42 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -60,7 +60,7 @@ OPENCV_CONF_OPT += \
-DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \
-DBUILD_opencv_ocl=OFF \
-DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
- -DBUILD_opencv_python=OFF \
+ -DBUILD_opencv_python=$(if $(BR2_PACKAGE_OPENCV_LIB_PYTHON),ON,OFF) \
-DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \
-DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \
-DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
@@ -138,7 +138,6 @@ OPENCV_CONF_OPT += \
-DBUILD_TIFF=OFF \
-DBUILD_ZLIB=OFF \
\
- -DBUILD_NEW_PYTHON_SUPPORT=OFF \
-DINSTALL_C_EXAMPLES=OFF \
-DINSTALL_PYTHON_EXAMPLES=OFF \
-DINSTALL_TO_MANGLED_PATHS=OFF
@@ -226,6 +225,19 @@ OPENCV_CONF_OPT += \
-DWITH_LIBV4L=OFF
endif
+ifeq ($(BR2_PACKAGE_OPENCV_LIB_PYTHON),y)
+OPENCV_CONF_OPT += \
+ -DBUILD_NEW_PYTHON_SUPPORT=ON \
+ -DPYTHON_EXECUTABLE=$(HOST_DIR)/usr/bin/python2 \
+ -DPYTHON_INCLUDE_DIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \
+ -DPYTHON_LIBRARY=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \
+ -DPYTHON_NUMPY_INCLUDE_DIR=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \
+ -DPYTHON_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION)
+OPENCV_DEPENDENCIES += python python-numpy
+else
+OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=OFF
+endif
+
# Installation hooks:
define OPENCV_CLEAN_INSTALL_DOC
$(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc
--
1.8.5.4
More information about the buildroot
mailing list