diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2016-12-29 14:35:08 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-01-10 13:12:55 +0100 |
commit | 75da410e4ec734930ff024041ac9f56cee9f7b8d (patch) | |
tree | c4d86a2d311e78dc08890f392799cd607897421c /meta-oe | |
parent | 354764af5d62d9dfc4ba3b8442a5bb54d206cbce (diff) | |
download | meta-openembedded-75da410e4ec734930ff024041ac9f56cee9f7b8d.tar.gz |
opencv: Update to version 3.2
-Only enable protobuf as dependency if dnn module is enabled
-Download manually xfeatures from 3rd party repo
-Remove uneeded fixgcc60patch
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/fixgcc60.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.2.bb (renamed from meta-oe/recipes-support/opencv/opencv_3.1.bb) | 27 |
5 files changed, 43 insertions, 41 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch index d568018b8..1077d05be 100644 --- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | |||
@@ -17,7 +17,7 @@ index a6016dbe10bc..af4062c8e95e 100644 | |||
17 | endif() | 17 | endif() |
18 | 18 | ||
19 | + if(NOT DEFINED OPENCV_ICV_PATH) | 19 | + if(NOT DEFINED OPENCV_ICV_PATH) |
20 | set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack") | 20 | set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv") |
21 | set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}") | 21 | set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}") |
22 | + endif() | 22 | + endif() |
23 | 23 | ||
diff --git a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch b/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch deleted file mode 100644 index 5d0bf97ca..000000000 --- a/meta-oe/recipes-support/opencv/opencv/fixgcc60.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake | ||
2 | index 28ccc1c6be4f..b0e1cbf77287 100644 | ||
3 | --- a/cmake/OpenCVPCHSupport.cmake | ||
4 | +++ b/cmake/OpenCVPCHSupport.cmake | ||
5 | @@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) | ||
6 | ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion | ||
7 | OUTPUT_VARIABLE gcc_compiler_version) | ||
8 | #MESSAGE("GCC Version: ${gcc_compiler_version}") | ||
9 | - IF(gcc_compiler_version VERSION_GREATER "4.2.-1") | ||
10 | + IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0") | ||
11 | SET(PCHSupport_FOUND TRUE) | ||
12 | ENDIF() | ||
13 | |||
14 | diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake | ||
15 | index 3a23cd73633d..1fea1578b1d9 100644 | ||
16 | --- a/cmake/OpenCVUtils.cmake | ||
17 | +++ b/cmake/OpenCVUtils.cmake | ||
18 | @@ -76,7 +76,11 @@ function(ocv_include_directories) | ||
19 | if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}") | ||
20 | list(APPEND __add_before "${dir}") | ||
21 | else() | ||
22 | - include_directories(AFTER SYSTEM "${dir}") | ||
23 | + if (gcc_compiler_version VERSION_LESS "6.0.0") | ||
24 | + include_directories(AFTER SYSTEM "${dir}") | ||
25 | + else() | ||
26 | + include_directories(AFTER "${dir}") | ||
27 | + endif() | ||
28 | endif() | ||
29 | endforeach() | ||
30 | include_directories(BEFORE ${__add_before}) | ||
diff --git a/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch new file mode 100644 index 000000000..a2db48d7c --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt | ||
2 | index f295bddaed66..6086e75ec37b 100644 | ||
3 | --- a/modules/xfeatures2d/CMakeLists.txt | ||
4 | +++ b/modules/xfeatures2d/CMakeLists.txt | ||
5 | @@ -1,5 +1,5 @@ | ||
6 | set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection") | ||
7 | ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml | ||
8 | OPTIONAL opencv_cudaarithm WRAP python java) | ||
9 | -include(cmake/download_vgg.cmake) | ||
10 | -include(cmake/download_boostdesc.cmake) | ||
11 | +#include(cmake/download_vgg.cmake) | ||
12 | +#include(cmake/download_boostdesc.cmake) | ||
diff --git a/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch new file mode 100644 index 000000000..3068bd44d --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake | ||
2 | index eb2a729cc2eb..8717736484de 100644 | ||
3 | --- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake | ||
4 | +++ b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake | ||
5 | @@ -24,7 +24,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF | ||
6 | find_package(Protobuf QUIET) | ||
7 | endif() | ||
8 | |||
9 | -if(PROTOBUF_FOUND) | ||
10 | +if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES)) | ||
11 | # nothing | ||
12 | else() | ||
13 | include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake) | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index 667623e71..8da7ec363 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb | |||
@@ -3,33 +3,40 @@ HOMEPAGE = "http://opencv.org/" | |||
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | 4 | ||
5 | LICENSE = "BSD-3-Clause" | 5 | LICENSE = "BSD-3-Clause" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ea90d28b4de883d7af5e6711f14f7bf" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" |
7 | 7 | ||
8 | ARM_INSTRUCTION_SET_armv4 = "arm" | 8 | ARM_INSTRUCTION_SET_armv4 = "arm" |
9 | ARM_INSTRUCTION_SET_armv5 = "arm" | 9 | ARM_INSTRUCTION_SET_armv5 = "arm" |
10 | 10 | ||
11 | DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" | 11 | DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp" |
12 | 12 | ||
13 | SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" | 13 | SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810" |
14 | SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" | 14 | SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7" |
15 | SRCREV_party3 = "81a676001ca8075ada498583e4166079e5744668" | 15 | SRCREV_ipp = "81a676001ca8075ada498583e4166079e5744668" |
16 | SRCREV_bootdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | ||
17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | ||
16 | IPP_MD5 = "808b791a6eac9ed78d32a7666804320e" | 18 | IPP_MD5 = "808b791a6eac9ed78d32a7666804320e" |
17 | 19 | ||
18 | SRCREV_FORMAT = "opencv" | 20 | SRCREV_FORMAT = "opencv" |
19 | SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ | 21 | SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ |
20 | git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ | 22 | git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ |
21 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=party3;name=party3 \ | 23 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20151201;destsuffix=ipp;name=ipp \ |
24 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=bootdesc;name=bootdesc \ | ||
25 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ | ||
22 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ | 26 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ |
23 | file://fixgcc60.patch \ | ||
24 | file://fixpkgconfig.patch \ | 27 | file://fixpkgconfig.patch \ |
28 | file://uselocalxfeatures.patch;patchdir=../contrib/ \ | ||
29 | file://useoeprotobuf.patch;patchdir=../contrib/ \ | ||
25 | " | 30 | " |
26 | 31 | ||
27 | PV = "3.1+git${SRCPV}" | 32 | PV = "3.2+git${SRCPV}" |
28 | 33 | ||
29 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |
30 | 35 | ||
31 | do_unpack_extra() { | 36 | do_unpack_extra() { |
32 | tar xzf ${WORKDIR}/party3/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR} | 37 | tar xzf ${WORKDIR}/ipp/ippicv/ippicv_linux_20151201.tgz -C ${WORKDIR} |
38 | cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src | ||
39 | cp ${WORKDIR}/bootdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src | ||
33 | } | 40 | } |
34 | addtask unpack_extra after do_unpack before do_patch | 41 | addtask unpack_extra after do_unpack before do_patch |
35 | 42 | ||
@@ -52,7 +59,7 @@ PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb | |||
52 | 59 | ||
53 | PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," | 60 | PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," |
54 | PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," | 61 | PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," |
55 | PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON,-DBUILD_opencv_dnn=OFF,lapack," | 62 | PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DUPDATE_PROTO_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,lapack protobuf protobuf-native," |
56 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," | 63 | PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," |
57 | PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," | 64 | PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," |
58 | PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," | 65 | PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," |