From d04382d3f3033eefe0ac37e5c7b2bb46d9946b2f Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 22 Sep 2023 15:07:04 +0800 Subject: [PATCH] open-model-zoo: upgrade 2023.0.1 -> 2023.1.0 Signed-off-by: Anuj Mittal --- .../opencv/open-model-zoo/0001-use-oe-gflags.patch | 14 ++++++-------- ...-zoo_2023.0.1.bb => open-model-zoo_2023.1.0.bb} | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/opencv/{open-model-zoo_2023.0.1.bb => open-model-zoo_2023.1.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 2b608050..816a98a3 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,4 +1,4 @@ -From fe3e1d923399da1d71458f5c468563b61784380c Mon Sep 17 00:00:00 2001 +From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 21 Oct 2022 11:38:23 +0800 Subject: [PATCH] demos: use gflags from meta-oe @@ -7,23 +7,21 @@ Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal Signed-off-by: Naveen Saini + --- demos/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 1484a50d5..996934310 100644 +index 51767051c..fb7e3d22f 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -140,7 +140,7 @@ endmacro() +@@ -141,7 +141,7 @@ endmacro() 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) - # TODO: remove wrapping if after OpenCV3 is dropped - if(OpenCV_VERSION VERSION_GREATER_EQUAL 4.5.3) --- -2.25.1 - + + find_package(OpenCV QUIET COMPONENTS gapi) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.0.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.1.0.bb similarity index 95% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.0.1.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.1.0.bb index 7ab6fe1d..ae17f221 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.0.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.1.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/2023/0 \ +SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \ file://0001-use-oe-gflags.patch \ " -SRCREV = "6becb6013d9ed110020b3cd5babbad8e697054c9" +SRCREV = "9719c4289b7e0be6beab15102557fe50232eec61" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \