Refreshed patch. Signed-off-by: Naveen Saini <[email protected]> --- .../open-model-zoo/0001-use-oe-gflags.patch | 16 +++++++++------- ...oo_2022.1.1.bb => open-model-zoo_2022.2.0.bb} | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{open-model-zoo_2022.1.1.bb => open-model-zoo_2022.2.0.bb} (95%)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch index 3db0a31e..2b608050 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch @@ -1,27 +1,29 @@ -From e071d6a6323f04dc7e6e40047199e509536d7f6e Mon Sep 17 00:00:00 2001 +From fe3e1d923399da1d71458f5c468563b61784380c Mon Sep 17 00:00:00 2001 From: Naveen Saini <[email protected]> -Date: Mon, 30 Aug 2021 17:54:17 +0800 +Date: Fri, 21 Oct 2022 11:38:23 +0800 Subject: [PATCH] demos: use gflags from meta-oe Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> Signed-off-by: Naveen Saini <[email protected]> - --- demos/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 98de0db6c..077d43fb4 100644 +index 1484a50d5..996934310 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -140,7 +140,7 @@ endmacro() - find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs gapi) + find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs) find_package(OpenVINO REQUIRED COMPONENTS Runtime) -add_subdirectory(thirdparty/gflags) +#add_subdirectory(thirdparty/gflags) add_subdirectory(common/cpp) - add_subdirectory(common/cpp_gapi) - add_subdirectory(multi_channel_common/cpp) + # TODO: remove wrapping if after OpenCV3 is dropped + if(OpenCV_VERSION VERSION_GREATER_EQUAL 4.5.3) +-- +2.25.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb similarity index 95% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb index 5934f99d..fc56ba69 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb @@ -4,11 +4,11 @@ DESCRIPTION = "This repository includes optimized deep learning \ models and a set of demos to expedite development of high-performance \ deep learning inference applications." -SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=releases/2022/1 \ +SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=releases/2022/2 \ file://0001-use-oe-gflags.patch \ " -SRCREV = "0c94071faef095f544a228f8455718fbd653950e" +SRCREV = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7704): https://lists.yoctoproject.org/g/meta-intel/message/7704 Mute This Topic: https://lists.yoctoproject.org/mt/94472059/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
