diff options
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.5.0.bb (renamed from meta-oe/recipes-support/opencv/opencv_4.4.0.bb) | 9 |
2 files changed, 33 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch b/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch new file mode 100644 index 0000000000..022680331a --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch @@ -0,0 +1,28 @@ +From 114af1ca23ff9bf2e521b2969e343e74cdd8eac1 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sun, 1 Nov 2020 12:29:56 +0000 +Subject: [PATCH] samples: cmake: digits needs opencv_dnn module to build + +Intrudeced in commit 397ba2d9aafb5312e777ce2f886d7b568109e931: +add OpenCV sample for digit and text recongnition, and provide multiple OCR models. +https://github.com/opencv/opencv/commit/397ba2d9aafb5312e777ce2f886d7b568109e931 + +Upstream-Status: Backport [https://github.com/opencv/opencv/commit/79a82013ad2af04269891ce15281c9fdc31d3f66] + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + samples/cpp/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 617629df2e..14ab6141df 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -14,6 +14,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS + opencv_features2d + opencv_calib3d + opencv_stitching ++ opencv_dnn + ${OPENCV_MODULES_PUBLIC} + ${OpenCV_LIB_COMPONENTS}) + ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) diff --git a/meta-oe/recipes-support/opencv/opencv_4.4.0.bb b/meta-oe/recipes-support/opencv/opencv_4.5.0.bb index c83186de07..b223334a58 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.4.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.0.bb @@ -2,16 +2,16 @@ SUMMARY = "Opencv : The Open Computer Vision Library" HOMEPAGE = "http://opencv.org/" SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" -SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_opencv = "d5fd2f0155ffad366f9ac912dfd6d189a7a6a98e" +SRCREV_contrib = "37315babf9984a5b6aa981644a20dd8df1a5ff02" SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" @@ -49,6 +49,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ + file://0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch \ " SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" |