Drop upstreamed patch
Signed-off-by: Khem Raj <raj.k...@gmail.com>
Cc: Jose Quaresma <quaresma.j...@gmail.com>
---
...gits-needs-opencv_dnn-module-to-buil.patch | 28 -------------------
.../{opencv_4.5.0.bb => opencv_4.5.1.bb} | 3 +-
2 files changed, 1 insertion(+), 30 deletions(-)
delete mode 100644
meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch
rename meta-oe/recipes-support/opencv/{opencv_4.5.0.bb => opencv_4.5.1.bb}
(98%)
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
deleted file mode 100644
index 022680331a..0000000000
---
a/meta-oe/recipes-support/opencv/opencv/0001-samples-cmake-digits-needs-opencv_dnn-module-to-buil.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 114af1ca23ff9bf2e521b2969e343e74cdd8eac1 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <quaresma.j...@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.j...@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.5.0.bb
b/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
similarity index 98%
rename from meta-oe/recipes-support/opencv/opencv_4.5.0.bb
rename to meta-oe/recipes-support/opencv/opencv_4.5.1.bb
index 5263ffc03b..116cc27f5d 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.5.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.5.1.bb
@@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
-SRCREV_opencv = "d5fd2f0155ffad366f9ac912dfd6d189a7a6a98e"
+SRCREV_opencv = "1363496c1106606684d40447f5d1149b2c66a9f8"
SRCREV_contrib = "37315babf9984a5b6aa981644a20dd8df1a5ff02"
SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
@@ -49,7 +49,6 @@ 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"
--
2.30.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#89824):
https://lists.openembedded.org/g/openembedded-devel/message/89824
Mute This Topic: https://lists.openembedded.org/mt/81045368/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
