open-model-zoo: upgrade 2021.4.2 -> 2022.1

The project now is able to locate the required package and libraries
correctly so no need to pass flags to cmake.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

3 files changed, 61 insertions, 75 deletions

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 6d0c6cbc..3db0a31e 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 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001
+From e071d6a6323f04dc7e6e40047199e509536d7f6e Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Mon, 30 Aug 2021 17:54:17 +0800
 Subject: [PATCH] demos: use gflags from meta-oe
@@ -7,23 +7,21 @@ Upstream-Status: Inappropriate
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
 ---
  demos/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
-index 1df8f248d..d368d608c 100644
+index 98de0db6c..077d43fb4 100644
 --- a/demos/CMakeLists.txt
 +++ b/demos/CMakeLists.txt
-@@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g
- find_package(InferenceEngine REQUIRED)
- find_package(ngraph REQUIRED)
+@@ -140,7 +140,7 @@ endmacro()
+ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs gapi)
+ 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)
- 
--- 
-2.17.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb
deleted file mode 100644
index 5c410db4..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository"
-HOMEPAGE = "https://github.com/opencv/open_model_zoo"
-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=master \
-           file://0001-use-oe-gflags.patch \
-           "
-
-SRCREV = "0d7aeac5eacdd343fdf9b375a23b7ec9a3846002"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-"
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-OECMAKE_SOURCEPATH = "${S}/demos"
-
-DEPENDS += "openvino-inference-engine opencv gflags"
-
-RDEPENDS:${PN} += " \
-                   python3-decorator \
-                   python3-defusedxml \
-                   python3-networkx \
-                   python3-protobuf \
-                   python3-requests \
-                   python3-pyyaml \
-                   python3-numpy \
-                   bash \
-"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-EXTRA_OECMAKE += " \
-                 -DIE_MAIN_SOURCE_DIR=${B} \
-                 -DENABLE_SAMPLES=ON \
-                 -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \
-                 -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \
-                 -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \
-                 -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \
-                 -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \
-                 -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \
-"
-
-do_configure:prepend(){
-        mkdir -p ${WORKDIR}/InferenceEngine/share
-        cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/
-}
-
-do_install(){
-        install -d ${D}${libdir}
-        install -d ${D}${bindir}
-        install -d ${D}${datadir}/openvino/open-model-zoo/tools
-        install -d ${D}${datadir}/openvino/open-model-zoo/demos
-        cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir}
-        cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
-        cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools
-}
-
-FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb
new file mode 100644
index 00000000..d21b2968
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb
@@ -0,0 +1,54 @@
+SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository"
+HOMEPAGE = "https://github.com/opencv/open_model_zoo"
+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 \
+           file://0001-use-oe-gflags.patch \
+           "
+
+SRCREV = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+"
+
+inherit cmake
+
+S = "${WORKDIR}/git"
+OECMAKE_SOURCEPATH = "${S}/demos"
+
+DEPENDS += "openvino-inference-engine opencv gflags"
+
+RDEPENDS:${PN} += " \
+                   python3-decorator \
+                   python3-defusedxml \
+                   python3-networkx \
+                   python3-protobuf \
+                   python3-requests \
+                   python3-pyyaml \
+                   python3-numpy \
+                   bash \
+"
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+
+EXTRA_OECMAKE += " \
+                 -DENABLE_SAMPLES=ON \
+                 "
+
+do_install(){
+        install -d ${D}${libdir}
+        install -d ${D}${bindir}
+        install -d ${D}${datadir}/openvino/open-model-zoo/tools
+        install -d ${D}${datadir}/openvino/open-model-zoo/demos
+        cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir}
+        cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
+        cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
+}
+
+FILES:${PN} += "${datadir}/openvino"