openvino-inference-engine: upgrade 2023.0.2 -> 2023.1.0

* Release notes:
  https://github.com/openvinotoolkit/openvino/releases/tag/2023.1.0

* samples package includes scripts that need Python to be present.
  Specify that dependency explicitly.

License-Update: Updated copyright information.

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

2 files changed, 69 insertions, 32 deletions

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 8481dadc..9e71e689 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
@@ -1,19 +1,40 @@
-Yocto specific tweaks to the build process:
+From 7deabff3d51df783c3e24bcc190c3ddebca7d9a8 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Thu, 21 Sep 2023 14:07:28 +0800
+Subject: [PATCH] cmake: yocto specific tweaks to the build process
 
 * Dont try to detect glibc version as that doesn't work when cross compiling.
-* Use shared protobuf and gflags libs.
+* Use shared gflags libs.
 * Install sample binaries as well.
+* Dont strip binaries.
+* Dont try to write triggers for CPack. We package ourselves.
 
 Upstream-Status: Inappropriate
+
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- cmake/developer_package/target_flags.cmake | 2 +-
- samples/cpp/CMakeLists.txt                 | 6 +++---
- thirdparty/CMakeLists.txt                  | 8 ++++----
- 3 files changed, 8 insertions(+), 8 deletions(-)
+ cmake/developer_package/packaging/rpm/rpm.cmake |  2 +-
+ cmake/developer_package/target_flags.cmake      |  2 +-
+ samples/cpp/CMakeLists.txt                      |  6 +++---
+ src/bindings/python/wheel/setup.py              |  1 -
+ thirdparty/dependencies.cmake                   | 10 +++++-----
+ 5 files changed, 10 insertions(+), 11 deletions(-)
 
+diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
+index 0609750054f..0f5c7765197 100644
+--- a/cmake/developer_package/packaging/rpm/rpm.cmake
++++ b/cmake/developer_package/packaging/rpm/rpm.cmake
+@@ -161,7 +161,7 @@ ov_rpm_specific_settings()
+ # needed to add triggers for packages with libraries
+ set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
+ set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
+-file(WRITE "${def_triggers}" "${triggers_content}")
++#file(WRITE "${def_triggers}" "${triggers_content}")
+ 
+ #
+ # Functions helpful for packaging your modules with RPM cpack
 diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
-index ced8d519da3..505c1fa5b14 100644
+index 29f23e713e1..942dd445b19 100644
 --- a/cmake/developer_package/target_flags.cmake
 +++ b/cmake/developer_package/target_flags.cmake
 @@ -145,4 +145,4 @@ function(ov_glibc_version)
@@ -23,10 +44,10 @@ index ced8d519da3..505c1fa5b14 100644
 -ov_glibc_version()
 +#ov_glibc_version()
 diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index 37eb0250112..35ec6a3368a 100644
+index 8849aaf47d1..450b57c18d6 100644
 --- a/samples/cpp/CMakeLists.txt
 +++ b/samples/cpp/CMakeLists.txt
-@@ -219,9 +219,9 @@ macro(ie_add_sample)
+@@ -223,9 +223,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}
@@ -39,26 +60,39 @@ index 37eb0250112..35ec6a3368a 100644
  
      # create global target with all samples / demo apps
      if(NOT TARGET ie_samples)
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 95d80a6fbd4..963c9a5d60a 100644
---- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -353,11 +353,11 @@ endif()
- if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS)
-     # on Windows and macOS we don't use gflags, because will be dynamically linked
-     if(CMAKE_HOST_LINUX AND LINUX)
+diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
+index 04323a8ba49..0498dcdc126 100644
+--- a/src/bindings/python/wheel/setup.py
++++ b/src/bindings/python/wheel/setup.py
+@@ -270,7 +270,6 @@ class CustomBuild(build):
+                 self.spawn(["cmake", "--install", binary_dir,
+                                      "--prefix", prefix,
+                                      "--config", "Release",
+-                                     "--strip",
+                                      "--component", cpack_comp_name])
+ 
+     def run(self):
+diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
+index 43e0ed671a9..b39479fdd6b 100644
+--- a/thirdparty/dependencies.cmake
++++ b/thirdparty/dependencies.cmake
+@@ -338,11 +338,11 @@ if(ENABLE_SAMPLES OR ENABLE_TESTS)
+     elseif(APPLE OR WIN32)
+         # on Windows and macOS we don't use gflags, because will be dynamically linked
+     elseif(CMAKE_HOST_LINUX AND LINUX)
 -        if(OV_OS_RHEL)
-+           #if(OV_OS_RHEL)
-             set(gflag_component nothreads_shared)
+-            set(gflag_component nothreads_shared)
 -        elseif(OV_OS_DEBIAN)
 -            set(gflag_component nothreads_static)
 -        endif()
-+           #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})
-     else()
-         # conan case
+     endif()
+ 
 -- 
-2.34.1
+2.37.3
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.1.0.bb
index e2119131..1b93b0ce 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.2.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.1.0.bb
@@ -4,7 +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;name=openvino;branch=releases/2023/0;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2023/1;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,9 +19,9 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=ope
            file://0001-protobuf-allow-target-protoc-to-be-built.patch \
            "
 
-SRCREV_openvino = "e662b1a330126daed2d8de724b9e14690bec8bfd"
-SRCREV_mkl = "1c7bfabf1b26e6fb95fea1613e1d3d2bef1f6b54"
-SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15"
+SRCREV_openvino = "47b736f63edda256d66e2bbb572f42a9d6549f6e"
+SRCREV_mkl = "ae825539bd850d1ad5c83d4bb0d56c65d46d5842"
+SRCREV_onednn = "4b82a66ed38ecaa993352e5cc6ed7753656b8a26"
 SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
 SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
 SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
@@ -34,8 +34,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
                     file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
                     file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \
                     file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+                    file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
 "
 
 inherit cmake python3native pkgconfig qemu
@@ -59,6 +59,7 @@ EXTRA_OECMAKE += " \
                   -DCPACK_GENERATOR=RPM \
                   -DENABLE_SYSTEM_FLATBUFFERS=ON \
                   -DENABLE_SYSTEM_SNAPPY=ON \
+                  -DENABLE_MLAS_FOR_CPU=OFF \
                   "
 
 DEPENDS += "\
@@ -66,6 +67,7 @@ DEPENDS += "\
             gflags \
             pugixml \
             python3-pybind11 \
+            python3-pybind11-native \
             qemu-native \
             snappy \
             tbb \
@@ -77,7 +79,7 @@ COMPATIBLE_HOST:libc-musl = "null"
 
 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[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -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[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
 
@@ -119,6 +121,7 @@ FILES:${PN}-samples = "${datadir}/openvino \
                        ${libdir}/libformat_reader.a \
                        ${libdir}/libopencv_c_wrapper.a \
                        "
+RDEPENDS:${PN}-samples += "python3-core"
 
 # Package for inference engine python API
 PACKAGES =+ "${PN}-${PYTHON_PN}"