openvino-inference-engine: upgrade 2022.3.0 -> 2023.0.0

* OpenVINO no longer supports vpu so remove the vpu PACKAGECONFIG and
  references.
* Now allows snappy compression to be used for TF frontend so allow
  system installed snappy.
* Flatbuffers is now needed for TF Lite frontend.
* Refresh patches.

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

3 files changed, 44 insertions, 96 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch
index 7089bc9c..4157c846 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build-with-gcc13.patch
@@ -1,4 +1,4 @@
-From aac55921864fa91fe8e394a25fc565f28ae5fc64 Mon Sep 17 00:00:00 2001
+From f8ad3f859aadc6c81ccc667eee1439cc2e6113cf Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Tue, 30 May 2023 09:31:09 +0800
 Subject: [PATCH] fix build with gcc13
@@ -29,50 +29,12 @@ https://gcc.gnu.org/gcc-13/porting_to.html
 Upstream-Status: Pending
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- src/common/itt/include/openvino/itt.hpp                     | 1 +
- src/common/preprocessing/ie_preprocess_gapi_kernels.hpp     | 1 +
- src/common/util/include/openvino/util/file_util.hpp         | 1 +
  src/inference/include/ie/ie_precision.hpp                   | 2 +-
  src/plugins/intel_gpu/CMakeLists.txt                        | 6 +++---
+ .../include/intel_gpu/graph/serialization/helpers.hpp       | 1 +
  .../intel_gpu/include/intel_gpu/runtime/device_info.hpp     | 1 +
- 6 files changed, 8 insertions(+), 4 deletions(-)
+ 4 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/src/common/itt/include/openvino/itt.hpp b/src/common/itt/include/openvino/itt.hpp
-index c978ca1b138..f01d59a652a 100644
---- a/src/common/itt/include/openvino/itt.hpp
-+++ b/src/common/itt/include/openvino/itt.hpp
-@@ -8,6 +8,7 @@
-  */
- 
- #pragma once
-+#include <cstdint>
- #include <openvino/function_name.hpp>
- #include <openvino/util/pp.hpp>
- #include <string>
-diff --git a/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp b/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp
-index dfbb182b7a0..0887cc60e34 100644
---- a/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp
-+++ b/src/common/preprocessing/ie_preprocess_gapi_kernels.hpp
-@@ -8,6 +8,7 @@
- # error non standalone GAPI
- # endif
- 
-+#include <cstdint>
- #include <tuple>
- 
- #include <opencv2/gapi/opencv_includes.hpp>
-diff --git a/src/common/util/include/openvino/util/file_util.hpp b/src/common/util/include/openvino/util/file_util.hpp
-index d2f2e00ff60..88e641526ab 100644
---- a/src/common/util/include/openvino/util/file_util.hpp
-+++ b/src/common/util/include/openvino/util/file_util.hpp
-@@ -4,6 +4,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <fstream>
- #include <functional>
- #include <string>
 diff --git a/src/inference/include/ie/ie_precision.hpp b/src/inference/include/ie/ie_precision.hpp
 index 48bdd945b13..96c29b73159 100644
 --- a/src/inference/include/ie/ie_precision.hpp
@@ -87,10 +49,10 @@ index 48bdd945b13..96c29b73159 100644
      }
  
 diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
-index ab4d7618c30..4c93024eb3c 100644
+index 948aecfcfec..a1b9783068b 100644
 --- a/src/plugins/intel_gpu/CMakeLists.txt
 +++ b/src/plugins/intel_gpu/CMakeLists.txt
-@@ -34,9 +34,9 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
+@@ -36,9 +36,9 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
  
  add_subdirectory(thirdparty)
  
@@ -103,8 +65,20 @@ index ab4d7618c30..4c93024eb3c 100644
  
  add_subdirectory(src/runtime)
  add_subdirectory(src/kernel_selector)
+diff --git a/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp b/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp
+index 391629baba2..40efe7011c6 100644
+--- a/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp
++++ b/src/plugins/intel_gpu/include/intel_gpu/graph/serialization/helpers.hpp
+@@ -5,6 +5,7 @@
+ #pragma once
+ #include <utility>
+ #include <type_traits>
++#include <cstdint>
+ 
+ namespace cldnn {
+ template <typename T>
 diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp
-index 0c5a7177d30..7119417185c 100644
+index 387a319cbe1..e2a7b1fc0fa 100644
 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp
 +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/device_info.hpp
 @@ -4,6 +4,7 @@
@@ -116,5 +90,5 @@ index 0c5a7177d30..7119417185c 100644
  #include <vector>
  #include <tuple>
 -- 
-2.37.3
+2.34.1
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
index 86ed2a96..4e3a4b02 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
@@ -8,31 +8,20 @@ Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 
 diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
-index e6c72540288..fec9996db14 100644
+index 0a37c910ae8..44444970ce1 100644
 --- a/cmake/developer_package/target_flags.cmake
 +++ b/cmake/developer_package/target_flags.cmake
-@@ -123,4 +123,4 @@ function(ov_glibc_version)
+@@ -136,4 +136,4 @@ function(ov_glibc_version)
      endif()
  endfunction()
  
 -ov_glibc_version()
 +#ov_glibc_version()
-diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-index 40c29d3c297..f6800592de9 100644
---- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-@@ -32,5 +32,4 @@ endif()
- install(
-     TARGETS ${TARGET_NAME}
-     RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
--    LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
--)
-+    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin)
 diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index 1fe54c602e8..01c86d418d9 100644
+index d2a65618071..80133c4aeb6 100644
 --- a/samples/cpp/CMakeLists.txt
 +++ b/samples/cpp/CMakeLists.txt
-@@ -230,9 +230,8 @@ macro(ie_add_sample)
+@@ -221,9 +221,9 @@ macro(ie_add_sample)
      target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES})
  
      install(TARGETS ${IE_SAMPLE_NAME}
@@ -41,42 +30,31 @@ index 1fe54c602e8..01c86d418d9 100644
 -            EXCLUDE_FROM_ALL)
 +            DESTINATION ${CMAKE_INSTALL_BINDIR}
 +            COMPONENT samples_bin)
++
  
      # create global target with all samples / demo apps
      if(NOT TARGET ie_samples)
-diff --git a/samples/cpp/common/format_reader/CMakeLists.txt b/samples/cpp/common/format_reader/CMakeLists.txt
-index 7c07bf07dbb..4cd566749e5 100644
---- a/samples/cpp/common/format_reader/CMakeLists.txt
-+++ b/samples/cpp/common/format_reader/CMakeLists.txt
-@@ -44,5 +44,5 @@ endif()
- install(
-     TARGETS ${TARGET_NAME}
-     RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
--    LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
-+    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin
- )
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index cf2863438c7..3ec5c5ed86b 100644
+index edbcb824f4b..9d24dcec560 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
-@@ -268,11 +268,11 @@ endif()
- 
+@@ -291,11 +291,11 @@ endif()
  if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS)
-     if(LINUX)
+     # on Windows and macOS we don't use gflags, because will be dynamically linked
+     if(CMAKE_HOST_LINUX AND LINUX)
 -        if(OV_OS_RHEL)
--            set(gflag_component nothreads_shared)
++           #if(OV_OS_RHEL)
+             set(gflag_component nothreads_shared)
 -        elseif(OV_OS_DEBIAN)
 -            set(gflag_component nothreads_static)
 -        endif()
-+           #if(OV_OS_RHEL)
-+        set(gflag_component nothreads_shared)
 +           #elseif(OV_OS_DEBIAN)
 +           #set(gflag_component nothreads_static)
 +           #endif()
          find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component})
      endif()
  
-@@ -329,7 +329,7 @@ endif()
+@@ -352,7 +352,7 @@ endif()
  
  if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND)
      if(ENABLE_SYSTEM_PROTOBUF)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.0.bb
index 87af47ee..193e33a1 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.0.bb
@@ -4,9 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
 deep learning models through a high-level C++ Inference Engine API \
 integrated with application logic."
 
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/3;lfs=0 \
-           https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_20230121_38.zip;name=usb_ma2x8x \
-           https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_20230121_38.zip;name=pcie_ma2x8x \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2023/0;lfs=0 \
            git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
            git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
            git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
@@ -19,16 +17,13 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=r
            file://onednn-fix-build-with-gcc13.patch;patchdir=src/plugins/intel_gpu/thirdparty/onednn_gpu \
            "
 
-SRCREV = "0a5ca5375265f0f12cdaee68574030408dd1c352"
-SRCREV_mkl = "44de3c3698b687c26e487fc8f0213fa487e8fe2c"
-SRCREV_onednn = "fbec3e25a559ee252022ae066817b204e106a6ba"
-SRCREV_xbyak = "f8ea5c28dfcdc98585881d0ca9e499580ca077ae"
+SRCREV = "b4452d5630442e91cf84db5acd3d991f3d1f34c2"
+SRCREV_mkl = "1c7bfabf1b26e6fb95fea1613e1d3d2bef1f6b54"
+SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15"
+SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
 SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
 SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
 
-SRC_URI[usb_ma2x8x.sha256sum] = "f7351b2e26f25d652a0539f6ace5797d7700735d52479c3e6ef354c236abbd3a"
-SRC_URI[pcie_ma2x8x.sha256sum] = "439219aeac010f8b85f19838420e9a247f2cdf23a6d00e7727cf92d96dbdaeeb"
-
 LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
                     file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \
@@ -58,17 +53,20 @@ EXTRA_OECMAKE += " \
                   -DENABLE_FUZZING=OFF \
                   -DENABLE_TBBBIND_2_5=OFF \
                   -DCPACK_GENERATOR=RPM \
+                  -DENABLE_SYSTEM_FLATBUFFERS=ON \
+                  -DENABLE_SYSTEM_SNAPPY=ON \
                   "
 
 
 DEPENDS += "\
+            flatbuffers-native \
             gflags \
-            libusb1 \
             protobuf \
             protobuf-native \
             protobuf-c \
             pugixml \
             python3-pybind11 \
+            snappy \
             tbb \
             zlib \
             "
@@ -76,11 +74,10 @@ DEPENDS += "\
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-PACKAGECONFIG ?= "vpu opencl samples"
+PACKAGECONFIG ?= "opencl samples"
 PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp,"
 PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-progress python3-cython"
 PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv"
-PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware"
 PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
 
 do_configure:prepend() {
@@ -106,14 +103,13 @@ FILES:${PN} += "\
                 "
 
 # Move inference engine samples into a separate package
-PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
+PACKAGES =+ "${PN}-samples"
 
 FILES:${PN}-samples = "${datadir}/openvino \
                        ${bindir} \
-                       ${libdir}/libformat_reader.so \
-                       ${libdir}/libopencv_c_wrapper.so \
+                       ${libdir}/libformat_reader.a \
+                       ${libdir}/libopencv_c_wrapper.a \
                        "
-FILES:${PN}-vpu-firmware += "${libdir}/openvino-${PV}/*.mvcmd"
 
 # Package for inference engine python API
 PACKAGES =+ "${PN}-${PYTHON_PN}"