opencv: update to version 3.3.
PATCH v2 1/1 opencv: update to version 3.3.
Update OpenCV recipe from version 3.2 to 3.3. Rebase patches and drop those which are no longer relevant or already contained in upstream OpenCV. Fix changed build options, such as UPDATE_PROTO_FILES to PROTOBUF_UPDATE_FILES. Update also subcomponents (opencv-contrib and opencv-3rdparty) to match with 3.3.
Signed-off-by Ismo Puustinen <[email protected]>
---
...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 44 ++--
.../0001-Revert-cuda-fix-fp16-compilation.patch | 27 ---
...cking-make-opencv_dnn-dependancy-optional.patch | 243 --------------------
...ts-create-share-library-intead-of-static.patch} | 12 +-
...vert-check-FP16-build-condition-correctly.patch | 245 ---------------------
...patch => 0003-To-fix-errors-as-following.patch} | 22 +-
.../opencv/opencv/uselocalxfeatures.patch | 26 ++-
.../opencv/opencv/useoeprotobuf.patch | 13 --
.../opencv/{opencv_3.2.bb => opencv_3.3.bb} | 51 +++--
9 files changed, 93 insertions(+), 590 deletions(-)
delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch
delete mode 100644 meta-oe/recipes-support/opencv/opencv/0001-tracking-make-opencv_dnn-dependancy-optional.patch
rename meta-oe/recipes-support/opencv/opencv/{0001-Make-opencv-ts-create-share-library-intead-of-static.patch => 0002-Make-opencv-ts-create-share-library-intead-of-static.patch} (64%)
delete mode 100644 meta-oe/recipes-support/opencv/opencv/0002-Revert-check-FP16-build-condition-correctly.patch
rename meta-oe/recipes-support/opencv/opencv/{0001-To-fix-errors-as-following.patch => 0003-To-fix-errors-as-following.patch} (82%)
delete mode 100644 meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch
rename meta-oe/recipes-support/opencv/{opencv_3.2.bb => opencv_3.3.bb} (86%)meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +27 -17
@@ -1,28 +1,38 @@ -From 049f931207631aa54af55a2917318d032b2ef3fa Mon Sep 17 00:00:00 2001 +From 4801a057730632225337d7f6d26b9335e6b9b078 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <[email protected]> Date: Thu, 31 Mar 2016 00:20:15 +0200 Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp Signed-off-by: Ricardo Ribalda Delgado <[email protected]> +Signed-off-by: Ismo Puustinen <[email protected]> --- - 3rdparty/ippicv/downloader.cmake | 2 ++ - 1 file changed, 2 insertions(+) + 3rdparty/ippicv/ippicv.cmake | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) -diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake -index a6016dbe10bc..af4062c8e95e 100644 ---- a/3rdparty/ippicv/downloader.cmake -+++ b/3rdparty/ippicv/downloader.cmake -@@ -31,8 +31,10 @@ function(_icv_downloader) - return() # Not supported +diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake +index d601da4bb..f6fc1098c 100644 +--- a/3rdparty/ippicv/ippicv.cmake ++++ b/3rdparty/ippicv/ippicv.cmake +@@ -39,18 +39,5 @@ function(download_ippicv root_var) endif() -+ if(NOT DEFINED OPENCV_ICV_PATH) - set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv") - set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}") -+ endif() - - if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED - AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH + set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") +- ocv_download(FILENAME ${OPENCV_ICV_NAME} +- HASH ${OPENCV_ICV_HASH} +- URL +- "${OPENCV_IPPICV_URL}" +- "$ENV{OPENCV_IPPICV_URL}" +- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" +- DESTINATION_DIR "${THE_ROOT}" +- ID IPPICV +- STATUS res +- UNPACK RELATIVE_URL) +- +- if(res) +- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) +- endif() ++ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) + endfunction() -- -2.8.0.rc3 +2.13.4
meta-oe/recipes-support/opencv/opencv/0001-Revert-cuda-fix-fp16-compilation.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 69f9707678190f6a0948a547dce948251f972676 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <[email protected]> -Date: Wed, 26 Apr 2017 14:57:30 -0400 -Subject: [PATCH 1/2] Revert "cuda: fix fp16 compilation" - -This reverts commit 12e00827be40576b686ea4438a6e6ef85208743d. ---- - modules/core/include/opencv2/core/cvdef.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h -index 699b166..efc24ca 100644 ---- a/modules/core/include/opencv2/core/cvdef.h -+++ b/modules/core/include/opencv2/core/cvdef.h -@@ -303,8 +303,7 @@ enum CpuFeatures { - #define CV_2PI 6.283185307179586476925286766559 - #define CV_LOG2 0.69314718055994530941723212145818 - --#if defined __ARM_FP16_FORMAT_IEEE \ -- && !defined __CUDACC__ -+#if defined (__ARM_FP16_FORMAT_IEEE) - # define CV_FP16_TYPE 1 - #else - # define CV_FP16_TYPE 0 --- -2.9.3 -
meta-oe/recipes-support/opencv/opencv/0001-tracking-make-opencv_dnn-dependancy-optional.patch deleted +0 -243
243 lines not on this page · raw message
meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch renamed from meta-oe/recipes-support/opencv/opencv/0001-Make-opencv-ts-create-share-library-intead-of-static.patch +6 -6
@@ -1,7 +1,7 @@ -From 49d1f7c40a5d097f23671318045ac54bc07846cf Mon Sep 17 00:00:00 2001 +From 350525293aef65490e80104ddd99e1b21c5d54b0 Mon Sep 17 00:00:00 2001 From: Bian Naimeng <[email protected]> Date: Wed, 19 Apr 2017 03:11:37 +0900 -Subject: [PATCH] Make opencv-ts create share library intead of static. +Subject: [PATCH 2/3] Make opencv-ts create share library intead of static. Signed-off-by: Lei Maohui <[email protected]> ---
@@ -9,10 +9,10 @@ Signed-off-by: Lei Maohui <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index bb56da2..7bb4ce9 100644 +index f95bed079..ee67858df 100644 --- a/modules/ts/CMakeLists.txt +++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(IOS) +@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) ocv_module_disable(ts) endif()
@@ -20,7 +20,7 @@ index bb56da2..7bb4ce9 100644 +#set(OPENCV_MODULE_TYPE STATIC) set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + if(WINRT) -- -1.8.4.2 +2.13.4
meta-oe/recipes-support/opencv/opencv/0002-Revert-check-FP16-build-condition-correctly.patch deleted +0 -245
245 lines not on this page · raw message
meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch renamed from meta-oe/recipes-support/opencv/opencv/0001-To-fix-errors-as-following.patch +11 -11
@@ -1,7 +1,7 @@ -From a4abe478bf4514ec95aa10b2d6f258647ce325f5 Mon Sep 17 00:00:00 2001 +From ace48a628dca34d742615598afeef42ed323a029 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <[email protected]> Date: Fri, 19 May 2017 04:27:50 +0900 -Subject: [PATCH] To fix errors as following: +Subject: [PATCH 3/3] To fix errors as following: "test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'" "perf_abs.cpp:13: undefined reference to `cvtest::param_seed'"
@@ -20,10 +20,10 @@ Signed-off-by: Ismo Puustinen <[email protected]> 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp -index c573905..230f598 100644 +index 41a76b13e..205646140 100644 --- a/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp -@@ -539,7 +539,7 @@ protected: +@@ -555,7 +555,7 @@ protected: } };
@@ -32,7 +32,7 @@ index c573905..230f598 100644 struct CV_EXPORTS DefaultRngAuto { -@@ -595,14 +595,14 @@ CV_EXPORTS std::string findDataFile(const std::string& relative_path, bool requi +@@ -611,14 +611,14 @@ CV_EXPORTS std::string findDataFile(const std::string& relative_path, bool requi #ifdef HAVE_OPENCL namespace ocl {
@@ -47,13 +47,13 @@ index c573905..230f598 100644 -void parseCustomOptions(int argc, char **argv); +CV_EXPORTS void parseCustomOptions(int argc, char **argv); - #define CV_TEST_MAIN(resourcesubdir, ...) \ - int main(int argc, char **argv) \ + #define CV_TEST_INIT0_NOOP (void)0 + diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp -index c967cd7..ff35b40 100644 +index 54b33ece8..ef56bf9ef 100644 --- a/modules/ts/include/opencv2/ts/ocl_test.hpp +++ b/modules/ts/include/opencv2/ts/ocl_test.hpp -@@ -84,7 +84,7 @@ inline UMat ToUMat(InputArray src) +@@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) return dst; }
@@ -63,7 +63,7 @@ index c967cd7..ff35b40 100644 #define MAX_VALUE 357 diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp -index 05ccc63..8075065 100644 +index 0bdd346dd..2cd34dfce 100644 --- a/modules/ts/include/opencv2/ts/ts_ext.hpp +++ b/modules/ts/include/opencv2/ts/ts_ext.hpp @@ -9,7 +9,7 @@
@@ -76,5 +76,5 @@ index 05ccc63..8075065 100644 #define CV_TEST_INIT \ -- -2.9.4 +2.13.4
meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch +17 -9
@@ -1,12 +1,20 @@ diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt -index f295bddaed66..6086e75ec37b 100644 +index e1755595..c7009c47 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt -@@ -1,5 +1,5 @@ - set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection") - ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml - OPTIONAL opencv_cudaarithm WRAP python java) --include(cmake/download_vgg.cmake) --include(cmake/download_boostdesc.cmake) -+#include(cmake/download_vgg.cmake) -+#include(cmake/download_boostdesc.cmake) +@@ -5,10 +5,10 @@ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d openc + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake) + set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d") +-download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) +-download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) +-if(NOT boost_status OR NOT vgg_status) +- ocv_module_disable(xfeatures2d) +-endif() ++#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) ++#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) ++#if(NOT boost_status OR NOT vgg_status) ++# ocv_module_disable(xfeatures2d) ++#endif() + + ocv_module_include_directories("${DOWNLOAD_DIR}")
meta-oe/recipes-support/opencv/opencv/useoeprotobuf.patch deleted +0 -13
@@ -1,13 +0,0 @@ -diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake -index eb2a729cc2eb..8717736484de 100644 ---- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake -+++ b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake -@@ -24,7 +24,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF - find_package(Protobuf QUIET) - endif() - --if(PROTOBUF_FOUND) -+if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES)) - # nothing - else() - include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake)
meta-oe/recipes-support/opencv/opencv_3.3.bb renamed from meta-oe/recipes-support/opencv/opencv_3.2.bb +32 -19
84 lines not on this page · raw message
Signature · 1 line
2.13.4