diff options
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv-2.4.2/0001-Fix-CMakeLists.txt-numpy-detection.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb (renamed from meta-oe/recipes-support/opencv/opencv-samples_2.4.bb) | 11 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_2.4.3.bb (renamed from meta-oe/recipes-support/opencv/opencv_2.4.bb) | 18 |
3 files changed, 14 insertions, 51 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv-2.4.2/0001-Fix-CMakeLists.txt-numpy-detection.patch b/meta-oe/recipes-support/opencv/opencv-2.4.2/0001-Fix-CMakeLists.txt-numpy-detection.patch deleted file mode 100644 index 43f03d31f..000000000 --- a/meta-oe/recipes-support/opencv/opencv-2.4.2/0001-Fix-CMakeLists.txt-numpy-detection.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 965616bdc73247448b8f07572a9a479235dd092d Mon Sep 17 00:00:00 2001 | ||
2 | From: Connor Abbott <cwabbott0@gmail.com> | ||
3 | Date: Wed, 11 Jul 2012 13:55:38 +0200 | ||
4 | Subject: [PATCH] Fix CMakeLists.txt numpy detection | ||
5 | |||
6 | Right now, the code opencv uses to detect where the numpy include files are doesn't work with cross-compiling because it uses the native python to determine the environment. To make this a little better, allow the user to explictly specify the path using -DPYTHON_NUMPY_INCLUDE_DIRS=path/to/numpy/include/dir . | ||
7 | |||
8 | Signed-off-by: Connor Abbott <cwabbott0@gmail.com> | ||
9 | --- | ||
10 | cmake/OpenCVDetectPython.cmake | 8 ++++++-- | ||
11 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake | ||
14 | index 8be94ca..5825a04 100644 | ||
15 | --- a/cmake/OpenCVDetectPython.cmake | ||
16 | +++ b/cmake/OpenCVDetectPython.cmake | ||
17 | @@ -74,10 +74,14 @@ if(PYTHON_EXECUTABLE) | ||
18 | |||
19 | if(NOT PYTHON_NUMPY_INCLUDE_DIR) | ||
20 | # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy | ||
21 | - 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]" | ||
22 | + if(NOT DEFINED PYTHON_NUMPY_INCLUDE_DIRS) | ||
23 | + 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]" | ||
24 | RESULT_VARIABLE PYTHON_NUMPY_PROCESS | ||
25 | - OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR | ||
26 | + OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIRS | ||
27 | OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
28 | + else() | ||
29 | + set(PYTHON_NUMPY_PROCESS 0) | ||
30 | + endif() | ||
31 | |||
32 | if(PYTHON_NUMPY_PROCESS EQUAL 0) | ||
33 | file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR) | ||
34 | -- | ||
35 | 1.7.10 | ||
36 | |||
diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb index 7ede7c777..3d76226c2 100644 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv-samples_2.4.3.bb | |||
@@ -8,14 +8,13 @@ DEPENDS = "opencv" | |||
8 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ | 8 | LIC_FILES_CHKSUM = "file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "svn://code.opencv.org/svn/opencv/branches/2.4;module=opencv;protocol=http \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "8988" | 14 | SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" |
15 | SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" | ||
15 | 16 | ||
16 | PV = "2.4.2" | 17 | S = "${WORKDIR}/OpenCV-${PV}" |
17 | |||
18 | S = "${WORKDIR}/opencv" | ||
19 | 18 | ||
20 | do_install() { | 19 | do_install() { |
21 | cd samples/c | 20 | cd samples/c |
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb index 28770932a..513e147bc 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.3.bb | |||
@@ -9,23 +9,21 @@ ARM_INSTRUCTION_SET = "arm" | |||
9 | 9 | ||
10 | DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0" | 10 | DEPENDS = "python-numpy v4l-utils libav gtk+ libtool swig swig-native python jpeg bzip2 zlib libpng tiff glib-2.0" |
11 | 11 | ||
12 | SRC_URI = "svn://code.opencv.org/svn/opencv/branches/2.4;module=opencv;protocol=http \ | 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-unix/${PV}/OpenCV-${PV}.tar.bz2 \ |
13 | file://0001-Fix-CMakeLists.txt-numpy-detection.patch \ | 13 | " |
14 | " | ||
15 | 14 | ||
16 | SRCREV = "8988" | 15 | SRC_URI[md5sum] = "c0a5af4ff9d0d540684c0bf00ef35dbe" |
16 | SRC_URI[sha256sum] = "f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b" | ||
17 | 17 | ||
18 | PV = "2.4.2" | 18 | S = "${WORKDIR}/OpenCV-${PV}" |
19 | PR = "r1" | ||
20 | 19 | ||
21 | S = "${WORKDIR}/opencv" | 20 | EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ |
22 | |||
23 | EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIRS=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include \ | ||
24 | -DBUILD_PYTHON_SUPPORT=ON \ | 21 | -DBUILD_PYTHON_SUPPORT=ON \ |
25 | -DWITH_FFMPEG=ON \ | 22 | -DWITH_FFMPEG=ON \ |
26 | -DWITH_GSTREAMER=OFF \ | 23 | -DWITH_GSTREAMER=OFF \ |
27 | -DWITH_V4L=ON \ | 24 | -DWITH_V4L=ON \ |
28 | -DWITH_GTK=ON \ | 25 | -DWITH_GTK=ON \ |
26 | -DCMAKE_SKIP_RPATH=ON \ | ||
29 | " | 27 | " |
30 | 28 | ||
31 | inherit distutils-base pkgconfig cmake | 29 | inherit distutils-base pkgconfig cmake |
@@ -59,6 +57,8 @@ python populate_packages_prepend () { | |||
59 | d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) | 57 | d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) |
60 | } | 58 | } |
61 | 59 | ||
60 | PACKAGES_DYNAMIC += "^libopencv-.*" | ||
61 | |||
62 | FILES_${PN} = "" | 62 | FILES_${PN} = "" |
63 | FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" | 63 | FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" |
64 | FILES_${PN}-dbg += "${libdir}/.debug" | 64 | FILES_${PN}-dbg += "${libdir}/.debug" |