linux-intel-rt/5.15: update to tag lts-v5.15.113-rt64-preempt-rt-230530T192215Z

* Update kernel cache.

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

conf/include/maintainers.inc

@@ -27,8 +27,6 @@ RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-libva-intel = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-libva-intel-utils = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>"
@@ -53,4 +51,5 @@ RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-vc-intrinsics = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"

dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb

@@ -13,8 +13,8 @@ SECTION = "lib"
 inherit pkgconfig cmake ptest
 
 S = "${WORKDIR}/git"
-SRCREV = "a402b6905b82477999982470308ccaaa39966adb"
-SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.5;protocol=https \
+SRCREV = "58be3660fb57c4c4a3d306730e849237d1271572"
+SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.6;protocol=https \
            file://run-ptest \
            "
 
@@ -34,7 +34,7 @@ EXTRA_OECMAKE += " \
                    -DCMAKE_SKIP_RPATH=ON \
                    "
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "gpu"
 PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime"
 
 do_install:append () {

dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-allow-to-pick-llvm-config-from-usr-bi.patch

@@ -0,0 +1,37 @@
+From 51d248d3b470f3fa1cf2ed3f5742851091acb65f Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Fri, 12 May 2023 09:10:11 +0800
+Subject: [PATCH] CMakeLists.txt: allow to pick llvm-config from
+ usr/bin/crossscripts/
+
+ispc needs to invoke native llvm-config from target sysroot to list LLVM
+lib libraries. clang already provides crossscripts/llvm-config, which does
+the job.
+
+However, using LLVM_TOOLS_BINARY_DIR leads to wrong llvm-config being
+used. So remove it from search path for llvm-config.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ cmake/FindLLVM.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+index d0297d5d..90d9fed2 100644
+--- a/cmake/FindLLVM.cmake
++++ b/cmake/FindLLVM.cmake
+@@ -41,8 +41,7 @@ find_package(LLVM REQUIRED CONFIG)
+     set(LLVM_VERSION "LLVM_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}")
+     message(STATUS "Found LLVM ${LLVM_VERSION}")
+ 
+-find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config
+-    PATHS ${LLVM_TOOLS_BINARY_DIR} PATH_SUFFIXES bin NO_DEFAULT_PATH)
++find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config)
+     if (NOT LLVM_CONFIG_EXECUTABLE)
+         message(FATAL_ERROR "Failed to find llvm-config")
+     endif()
+-- 
+2.37.3
+

dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Produce-position-independent-code-for-testing.patch

@@ -0,0 +1,42 @@
+From 14cfd056fe69dc652f824f31462033e82cd54513 Mon Sep 17 00:00:00 2001
+From: Arina Neshlyaeva <arina.neshlyaeva@intel.com>
+Date: Tue, 23 Aug 2022 15:26:21 -0700
+Subject: [PATCH] Produce position independent code for testing
+
+Upstream-Status: Backport [https://github.com/ispc/ispc/commit/522a7395d762c7f2a3b1f76c6f352b5e5977f08a]
+
+Signed-off-by: Arina Neshlyaeva <arina.neshlyaeva@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ run_tests.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/run_tests.py b/run_tests.py
+index d4a40978..3520d376 100755
+--- a/run_tests.py
++++ b/run_tests.py
+@@ -515,6 +515,11 @@ def run_test(testname, host, target):
+                 cc_cmd = "%s -O2 -I. %s test_static.cpp -DTEST_SIG=%d -DTEST_WIDTH=%d %s -o %s" % \
+                     (options.compiler_exe, gcc_arch, match, width, obj_name, exe_name)
+ 
++                # Produce position independent code for both c++ and ispc compilations.
++                # The motivation for this is that Clang 15 changed default
++                # from "-mrelocation-model static" to "-mrelocation-model pic", so
++                # we enable PIC compilation to have it consistently regardless compiler version.
++                cc_cmd += ' -fPIE'
+                 if should_fail:
+                     cc_cmd += " -DEXPECT_FAILURE"
+ 
+@@ -526,8 +531,7 @@ def run_test(testname, host, target):
+                              match, width, exe_name)
+                     exe_name = "./" + exe_name
+                     cc_cmd += " -DTEST_ZEBIN" if options.ispc_output == "ze" else " -DTEST_SPV"
+-
+-            ispc_cmd = ispc_exe_rel + " --woff %s -o %s --arch=%s --target=%s -DTEST_SIG=%d" % \
++            ispc_cmd = ispc_exe_rel + " --pic --woff %s -o %s --arch=%s --target=%s -DTEST_SIG=%d" % \
+                         (filename, obj_name, options.arch, xe_target if target.is_xe() else options.target, match)
+ 
+             if target.is_xe():
+-- 
+2.37.3
+

dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.17.0.bb

@@ -15,13 +15,15 @@ SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
            file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
            file://0002-cmake-don-t-build-for-32-bit-targets.patch \
            file://0001-Enable-LLVM-15.0-support.patch \
+           file://0001-CMakeLists.txt-allow-to-pick-llvm-config-from-usr-bi.patch \
+           file://0001-Produce-position-independent-code-for-testing.patch \
            "
 SRCREV = "7ad8429369a4d5ced6b524fdfffe623939d8fe9a"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 
 DEPENDS += " clang-native bison-native "
-RDEPENDS:${PN} += " clang-libllvm clang"
+DEPENDS:append:class-target = " clang"
 
 EXTRA_OECMAKE += " \
                   -DISPC_INCLUDE_TESTS=OFF  \
@@ -29,7 +31,16 @@ EXTRA_OECMAKE += " \
                   -DISPC_NO_DUMPS=ON  \
                   -DARM_ENABLED=OFF  \
                   -DISPC_CROSS=ON  \
-                  -DSYSROOT_DIR=${STAGING_DIR_NATIVE}  \
+                  -DISPC_ANDROID_TARGET=OFF  \
+                  -DISPC_FREEBSD_TARGET=OFF  \
+                  -DISPC_WINDOWS_TARGET=OFF  \
+                  -DISPC_IOS_TARGET=OFF  \
+                  -DISPC_PS4_TARGET=OFF  \
+                  -DSYSROOT_DIR=${STAGING_DIR} \
+                  -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
+                  -DLLVM_DIS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-dis \
+                  -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
                   "
 
 TOOLCHAIN = "clang"

dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR-since-SPIR-d.patch

@@ -4,7 +4,7 @@ Date: Tue, 11 May 2021 11:13:02 +0800
 Subject: [PATCH 1/3] Remove __IMAGE_SUPPORT__ macro for SPIR since SPIR
  doesn't require image support
 
-Upstream-Status: Backport [Taken from opencl-clang patches, https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch]
+Upstream-Status: Inappropriate
 
 Signed-off-by: haonanya <haonan.yang@intel.com>
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>

dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch

@@ -1,7 +1,7 @@
-From 06cf750d2ef892eaa4f0ff5d0a9e9e5c49697264 Mon Sep 17 00:00:00 2001
+From 60854c328d8729b2ef10b9bb4dcbcc282f43c5e7 Mon Sep 17 00:00:00 2001
 From: Raphael Isemann <teemperor@gmail.com>
 Date: Thu, 1 Apr 2021 18:41:44 +0200
-Subject: [PATCH 2/3] Avoid calling ParseCommandLineOptions in BackendUtil if
+Subject: [PATCH] Avoid calling ParseCommandLineOptions in BackendUtil if
  possible
 
 Calling `ParseCommandLineOptions` should only be called from `main` as the
@@ -20,18 +20,18 @@ Reviewed By: JDevlieghere
 
 Differential Revision: https://reviews.llvm.org/D99740
 
-Upstream-Status: Backport [Taken from opencl-clang patches; https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0002-Avoid-calling-ParseCommandLineOptions-in-BackendUtil.patch]
-
+Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/60854c328d8729b2ef10b9bb4dcbcc282f43c5e7]
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
 ---
  clang/lib/CodeGen/BackendUtil.cpp | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
-index 52bcd971dc8c..f9f891247530 100644
+index 41eafd13d97c..00d92e7beadd 100644
 --- a/clang/lib/CodeGen/BackendUtil.cpp
 +++ b/clang/lib/CodeGen/BackendUtil.cpp
-@@ -850,7 +850,15 @@ static void setCommandLineOpts(const CodeGenOptions &CodeGenOpts) {
+@@ -871,7 +871,15 @@ static void setCommandLineOpts(const CodeGenOptions &CodeGenOpts) {
      BackendArgs.push_back("-limit-float-precision");
      BackendArgs.push_back(CodeGenOpts.LimitFloatPrecision.c_str());
    }
@@ -48,5 +48,5 @@ index 52bcd971dc8c..f9f891247530 100644
                                      BackendArgs.data());
  }
 -- 
-2.17.1
+2.29.2
 

dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0003-Support-cl_ext_float_atomics.patch

@@ -1,20 +1,28 @@
-From f1a24eeb89342186c6c718e02dd394775620799f Mon Sep 17 00:00:00 2001
+From 85505bdb386a426310c1fb0a845780beeeec4353 Mon Sep 17 00:00:00 2001
 From: haonanya <haonan.yang@intel.com>
-Date: Wed, 28 Jul 2021 14:20:08 +0800
-Subject: [PATCH 3/3] Support cl_ext_float_atomics
+Date: Wed, 9 Feb 2022 09:16:35 +0800
+Subject: [PATCH] Support cl_ext_float_atomics
 
-Upstream-Status: Backport [Taken from opencl-clang patches; https://github.com/intel/opencl-clang/blob/ocl-open-120/patches/clang/0003-OpenCL-Support-cl_ext_float_atomics.patch]
+This backports https://reviews.llvm.org/D106343 and https://reviews.llvm.org/D109740
 
 Signed-off-by: haonanya <haonan.yang@intel.com>
+
+Upstream-Status: Backport
+
+https://github.com/llvm/llvm-project/commit/d353d1c50112a1cb315eccdab18ce7bd1563cd06
+https://github.com/llvm/llvm-project/commit/544d89e847d42ce8856296752b0fb279aa89aace
+
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
 ---
- clang/lib/Headers/opencl-c-base.h     |  19 +++
- clang/lib/Headers/opencl-c.h          | 195 ++++++++++++++++++++++++++
- clang/test/Headers/opencl-c-header.cl |  72 ++++++++++
- 3 files changed, 286 insertions(+)
+ clang/lib/Headers/opencl-c-base.h     |  19 ++
+ clang/lib/Headers/opencl-c.h          | 378 ++++++++++++++++++++++++++
+ clang/lib/Sema/Sema.cpp               |   3 +
+ clang/test/Headers/opencl-c-header.cl |  84 ++++++
+ 4 files changed, 484 insertions(+)
 
 diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
-index e8dcd70377e5..c8b6d36029ec 100644
+index e8dcd70377e5..d94d64372dbb 100644
 --- a/clang/lib/Headers/opencl-c-base.h
 +++ b/clang/lib/Headers/opencl-c-base.h
 @@ -21,6 +21,25 @@
@@ -30,7 +38,7 @@ index e8dcd70377e5..c8b6d36029ec 100644
 +#define __opencl_c_ext_fp16_global_atomic_min_max 1
 +#define __opencl_c_ext_fp16_local_atomic_min_max 1
 +#endif
-+#ifdef __opencl_c_fp64
++#ifdef cl_khr_fp64
 +#define __opencl_c_ext_fp64_global_atomic_add 1
 +#define __opencl_c_ext_fp64_local_atomic_add 1
 +#define __opencl_c_ext_fp64_global_atomic_min_max 1
@@ -44,15 +52,128 @@ index e8dcd70377e5..c8b6d36029ec 100644
  #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
  
 diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
-index ab665628c8e1..6676da858d2a 100644
+index ab665628c8e1..584db7e81e04 100644
 --- a/clang/lib/Headers/opencl-c.h
 +++ b/clang/lib/Headers/opencl-c.h
-@@ -13531,6 +13531,201 @@ intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uint
+@@ -13531,6 +13531,384 @@ intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uint
  intptr_t __ovld atomic_fetch_max_explicit(volatile atomic_intptr_t *object, uintptr_t opermax, memory_order minder, memory_scope scope);
  #endif
  
++// The functionality added by cl_ext_float_atomics extension
 +#if defined(cl_ext_float_atomics)
 +
++#if defined(__opencl_c_ext_fp16_global_atomic_load_store)
++void __ovld atomic_store(volatile __global atomic_half *object, half operand);
++void __ovld atomic_store_explicit(volatile __global atomic_half *object,
++                                  half operand, memory_order order);
++void __ovld atomic_store_explicit(volatile __global atomic_half *object,
++                                  half operand, memory_order order,
++                                  memory_scope scope);
++half __ovld atomic_load(volatile __global atomic_half *object);
++half __ovld atomic_load_explicit(volatile __global atomic_half *object,
++                                 memory_order order);
++half __ovld atomic_load_explicit(volatile __global atomic_half *object,
++                                 memory_order order, memory_scope scope);
++half __ovld atomic_exchange(volatile __global atomic_half *object,
++                            half operand);
++half __ovld atomic_exchange_explicit(volatile __global atomic_half *object,
++                                     half operand, memory_order order);
++half __ovld atomic_exchange_explicit(volatile __global atomic_half *object,
++                                     half operand, memory_order order,
++                                     memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_global_atomic_load_store)
++
++#if defined(__opencl_c_ext_fp16_local_atomic_load_store)
++void __ovld atomic_store(volatile __local atomic_half *object, half operand);
++void __ovld atomic_store_explicit(volatile __local atomic_half *object,
++                                  half operand, memory_order order);
++void __ovld atomic_store_explicit(volatile __local atomic_half *object,
++                                  half operand, memory_order order,
++                                  memory_scope scope);
++half __ovld atomic_load(volatile __local atomic_half *object);
++half __ovld atomic_load_explicit(volatile __local atomic_half *object,
++                                 memory_order order);
++half __ovld atomic_load_explicit(volatile __local atomic_half *object,
++                                 memory_order order, memory_scope scope);
++half __ovld atomic_exchange(volatile __local atomic_half *object, half operand);
++half __ovld atomic_exchange_explicit(volatile __local atomic_half *object,
++                                     half operand, memory_order order);
++half __ovld atomic_exchange_explicit(volatile __local atomic_half *object,
++                                     half operand, memory_order order,
++                                     memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_local_atomic_load_store)
++
++#if defined(__opencl_c_ext_fp16_global_atomic_load_store) &&                   \
++    defined(__opencl_c_ext_fp16_local_atomic_load_store)
++void __ovld atomic_store(volatile atomic_half *object, half operand);
++void __ovld atomic_store_explicit(volatile atomic_half *object, half operand,
++                                  memory_order order);
++void __ovld atomic_store_explicit(volatile atomic_half *object, half operand,
++                                  memory_order order, memory_scope scope);
++half __ovld atomic_load(volatile atomic_half *object);
++half __ovld atomic_load_explicit(volatile atomic_half *object,
++                                 memory_order order);
++half __ovld atomic_load_explicit(volatile atomic_half *object,
++                                 memory_order order, memory_scope scope);
++half __ovld atomic_exchange(volatile atomic_half *object, half operand);
++half __ovld atomic_exchange_explicit(volatile atomic_half *object, half operand,
++                                     memory_order order);
++half __ovld atomic_exchange_explicit(volatile atomic_half *object, half operand,
++                                     memory_order order, memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_global_atomic_load_store) &&
++       // defined(__opencl_c_ext_fp16_local_atomic_load_store)
++
++#if defined(__opencl_c_ext_fp16_global_atomic_min_max)
++half __ovld atomic_fetch_min(volatile __global atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_max(volatile __global atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_min_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_max_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_min_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++half __ovld atomic_fetch_max_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_global_atomic_min_max)
++
++#if defined(__opencl_c_ext_fp16_local_atomic_min_max)
++half __ovld atomic_fetch_min(volatile __local atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_max(volatile __local atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_min_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_max_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_min_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++half __ovld atomic_fetch_max_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_local_atomic_min_max)
++
++#if defined(__opencl_c_ext_fp16_global_atomic_min_max) &&                      \
++    defined(__opencl_c_ext_fp16_local_atomic_min_max)
++half __ovld atomic_fetch_min(volatile atomic_half *object, half operand);
++half __ovld atomic_fetch_max(volatile atomic_half *object, half operand);
++half __ovld atomic_fetch_min_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_max_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_min_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++half __ovld atomic_fetch_max_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_global_atomic_min_max) &&                \
++    defined(__opencl_c_ext_fp16_local_atomic_min_max)
++
 +#if defined(__opencl_c_ext_fp32_global_atomic_min_max)
 +float __ovld atomic_fetch_min(volatile __global atomic_float *object,
 +                              float operand);
@@ -68,7 +189,8 @@ index ab665628c8e1..6676da858d2a 100644
 +float __ovld atomic_fetch_max_explicit(volatile __global atomic_float *object,
 +                                       float operand, memory_order order,
 +                                       memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp32_global_atomic_min_max)
++
 +#if defined(__opencl_c_ext_fp32_local_atomic_min_max)
 +float __ovld atomic_fetch_min(volatile __local atomic_float *object,
 +                              float operand);
@@ -84,8 +206,9 @@ index ab665628c8e1..6676da858d2a 100644
 +float __ovld atomic_fetch_max_explicit(volatile __local atomic_float *object,
 +                                       float operand, memory_order order,
 +                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp32_global_atomic_min_max) ||                      \
++#endif // defined(__opencl_c_ext_fp32_local_atomic_min_max)
++
++#if defined(__opencl_c_ext_fp32_global_atomic_min_max) &&                      \
 +    defined(__opencl_c_ext_fp32_local_atomic_min_max)
 +float __ovld atomic_fetch_min(volatile atomic_float *object, float operand);
 +float __ovld atomic_fetch_max(volatile atomic_float *object, float operand);
@@ -99,7 +222,10 @@ index ab665628c8e1..6676da858d2a 100644
 +float __ovld atomic_fetch_max_explicit(volatile atomic_float *object,
 +                                       float operand, memory_order order,
 +                                       memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp32_global_atomic_min_max) &&                \
++    defined(__opencl_c_ext_fp32_local_atomic_min_max)
++
++#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
 +#if defined(__opencl_c_ext_fp64_global_atomic_min_max)
 +double __ovld atomic_fetch_min(volatile __global atomic_double *object,
 +                               double operand);
@@ -115,7 +241,8 @@ index ab665628c8e1..6676da858d2a 100644
 +double __ovld atomic_fetch_max_explicit(volatile __global atomic_double *object,
 +                                        double operand, memory_order order,
 +                                        memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp64_global_atomic_min_max)
++
 +#if defined(__opencl_c_ext_fp64_local_atomic_min_max)
 +double __ovld atomic_fetch_min(volatile __local atomic_double *object,
 +                               double operand);
@@ -131,8 +258,9 @@ index ab665628c8e1..6676da858d2a 100644
 +double __ovld atomic_fetch_max_explicit(volatile __local atomic_double *object,
 +                                        double operand, memory_order order,
 +                                        memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_global_atomic_min_max) ||                      \
++#endif // defined(__opencl_c_ext_fp64_local_atomic_min_max)
++
++#if defined(__opencl_c_ext_fp64_global_atomic_min_max) &&                      \
 +    defined(__opencl_c_ext_fp64_local_atomic_min_max)
 +double __ovld atomic_fetch_min(volatile atomic_double *object, double operand);
 +double __ovld atomic_fetch_max(volatile atomic_double *object, double operand);
@@ -146,7 +274,61 @@ index ab665628c8e1..6676da858d2a 100644
 +double __ovld atomic_fetch_max_explicit(volatile atomic_double *object,
 +                                        double operand, memory_order order,
 +                                        memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp64_global_atomic_min_max) &&                \
++    defined(__opencl_c_ext_fp64_local_atomic_min_max)
++#endif // defined(cl_khr_int64_base_atomics) &&
++       // defined(cl_khr_int64_extended_atomics)
++
++#if defined(__opencl_c_ext_fp16_global_atomic_add)
++half __ovld atomic_fetch_add(volatile __global atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_sub(volatile __global atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_add_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_sub_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_add_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++half __ovld atomic_fetch_sub_explicit(volatile __global atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_global_atomic_add)
++
++#if defined(__opencl_c_ext_fp16_local_atomic_add)
++half __ovld atomic_fetch_add(volatile __local atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_sub(volatile __local atomic_half *object,
++                             half operand);
++half __ovld atomic_fetch_add_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_sub_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_add_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++half __ovld atomic_fetch_sub_explicit(volatile __local atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_local_atomic_add)
++
++#if defined(__opencl_c_ext_fp16_global_atomic_add) &&                          \
++    defined(__opencl_c_ext_fp16_local_atomic_add)
++half __ovld atomic_fetch_add(volatile atomic_half *object, half operand);
++half __ovld atomic_fetch_sub(volatile atomic_half *object, half operand);
++half __ovld atomic_fetch_add_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_sub_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order);
++half __ovld atomic_fetch_add_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++half __ovld atomic_fetch_sub_explicit(volatile atomic_half *object,
++                                      half operand, memory_order order,
++                                      memory_scope scope);
++#endif // defined(__opencl_c_ext_fp16_global_atomic_add) &&                    \
++    defined(__opencl_c_ext_fp16_local_atomic_add)
 +
 +#if defined(__opencl_c_ext_fp32_global_atomic_add)
 +float __ovld atomic_fetch_add(volatile __global atomic_float *object,
@@ -163,7 +345,8 @@ index ab665628c8e1..6676da858d2a 100644
 +float __ovld atomic_fetch_sub_explicit(volatile __global atomic_float *object,
 +                                       float operand, memory_order order,
 +                                       memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp32_global_atomic_add)
++
 +#if defined(__opencl_c_ext_fp32_local_atomic_add)
 +float __ovld atomic_fetch_add(volatile __local atomic_float *object,
 +                              float operand);
@@ -179,8 +362,9 @@ index ab665628c8e1..6676da858d2a 100644
 +float __ovld atomic_fetch_sub_explicit(volatile __local atomic_float *object,
 +                                       float operand, memory_order order,
 +                                       memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp32_global_atomic_add) ||                          \
++#endif // defined(__opencl_c_ext_fp32_local_atomic_add)
++
++#if defined(__opencl_c_ext_fp32_global_atomic_add) &&                          \
 +    defined(__opencl_c_ext_fp32_local_atomic_add)
 +float __ovld atomic_fetch_add(volatile atomic_float *object, float operand);
 +float __ovld atomic_fetch_sub(volatile atomic_float *object, float operand);
@@ -194,8 +378,10 @@ index ab665628c8e1..6676da858d2a 100644
 +float __ovld atomic_fetch_sub_explicit(volatile atomic_float *object,
 +                                       float operand, memory_order order,
 +                                       memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp32_global_atomic_add) &&                    \
++    defined(__opencl_c_ext_fp32_local_atomic_add)
 +
++#if defined(cl_khr_int64_base_atomics) && defined(cl_khr_int64_extended_atomics)
 +#if defined(__opencl_c_ext_fp64_global_atomic_add)
 +double __ovld atomic_fetch_add(volatile __global atomic_double *object,
 +                               double operand);
@@ -211,7 +397,8 @@ index ab665628c8e1..6676da858d2a 100644
 +double __ovld atomic_fetch_sub_explicit(volatile __global atomic_double *object,
 +                                        double operand, memory_order order,
 +                                        memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp64_global_atomic_add)
++
 +#if defined(__opencl_c_ext_fp64_local_atomic_add)
 +double __ovld atomic_fetch_add(volatile __local atomic_double *object,
 +                               double operand);
@@ -227,8 +414,9 @@ index ab665628c8e1..6676da858d2a 100644
 +double __ovld atomic_fetch_sub_explicit(volatile __local atomic_double *object,
 +                                        double operand, memory_order order,
 +                                        memory_scope scope);
-+#endif
-+#if defined(__opencl_c_ext_fp64_global_atomic_add) ||                          \
++#endif // defined(__opencl_c_ext_fp64_local_atomic_add)
++
++#if defined(__opencl_c_ext_fp64_global_atomic_add) &&                          \
 +    defined(__opencl_c_ext_fp64_local_atomic_add)
 +double __ovld atomic_fetch_add(volatile atomic_double *object, double operand);
 +double __ovld atomic_fetch_sub(volatile atomic_double *object, double operand);
@@ -242,18 +430,35 @@ index ab665628c8e1..6676da858d2a 100644
 +double __ovld atomic_fetch_sub_explicit(volatile atomic_double *object,
 +                                        double operand, memory_order order,
 +                                        memory_scope scope);
-+#endif
++#endif // defined(__opencl_c_ext_fp64_global_atomic_add) &&                    \
++    defined(__opencl_c_ext_fp64_local_atomic_add)
++#endif // defined(cl_khr_int64_base_atomics) &&
++       // defined(cl_khr_int64_extended_atomics)
 +
 +#endif // cl_ext_float_atomics
 +
  // atomic_store()
  
  void __ovld atomic_store(volatile atomic_int *object, int desired);
+diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
+index 450f9c020f7f..a91291c7af38 100644
+--- a/clang/lib/Sema/Sema.cpp
++++ b/clang/lib/Sema/Sema.cpp
+@@ -313,6 +313,9 @@ void Sema::Initialize() {
+       addImplicitTypedef("atomic_long", AtomicLongT);
+       auto AtomicULongT = Context.getAtomicType(Context.UnsignedLongTy);
+       addImplicitTypedef("atomic_ulong", AtomicULongT);
++      auto AtomicHalfT = Context.getAtomicType(Context.HalfTy);
++      addImplicitTypedef("atomic_half", AtomicHalfT);
++      setOpenCLExtensionForType(AtomicHalfT, "cl_khr_fp16");
+       addImplicitTypedef("atomic_float",
+                          Context.getAtomicType(Context.FloatTy));
+       auto AtomicDoubleT = Context.getAtomicType(Context.DoubleTy);
 diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl
-index 13a3b62481ec..2c02d14f25c3 100644
+index 13a3b62481ec..443f682c711a 100644
 --- a/clang/test/Headers/opencl-c-header.cl
 +++ b/clang/test/Headers/opencl-c-header.cl
-@@ -124,6 +124,36 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
+@@ -124,6 +124,48 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
  #if cl_khr_subgroup_clustered_reduce != 1
  #error "Incorrectly defined cl_khr_subgroup_clustered_reduce"
  #endif
@@ -269,28 +474,40 @@ index 13a3b62481ec..2c02d14f25c3 100644
 +#if __opencl_c_ext_fp32_global_atomic_add != 1
 +#error "Incorrectly defined __opencl_c_ext_fp32_global_atomic_add"
 +#endif
++#if __opencl_c_ext_fp64_global_atomic_add != 1
++#error "Incorrectly defined __opencl_c_ext_fp64_global_atomic_add"
++#endif
 +#if __opencl_c_ext_fp16_local_atomic_add != 1
 +#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_add"
 +#endif
 +#if __opencl_c_ext_fp32_local_atomic_add != 1
 +#error "Incorrectly defined __opencl_c_ext_fp32_local_atomic_add"
 +#endif
++#if __opencl_c_ext_fp64_local_atomic_add != 1
++#error "Incorrectly defined __opencl_c_ext_fp64_local_atomic_add"
++#endif
 +#if __opencl_c_ext_fp16_global_atomic_min_max != 1
 +#error "Incorrectly defined __opencl_c_ext_fp16_global_atomic_min_max"
 +#endif
 +#if __opencl_c_ext_fp32_global_atomic_min_max != 1
 +#error "Incorrectly defined __opencl_c_ext_fp32_global_atomic_min_max"
 +#endif
++#if __opencl_c_ext_fp64_global_atomic_min_max != 1
++#error "Incorrectly defined __opencl_c_ext_fp64_global_atomic_min_max"
++#endif
 +#if __opencl_c_ext_fp16_local_atomic_min_max != 1
 +#error "Incorrectly defined __opencl_c_ext_fp16_local_atomic_min_max"
 +#endif
 +#if __opencl_c_ext_fp32_local_atomic_min_max != 1
 +#error "Incorrectly defined __opencl_c_ext_fp32_local_atomic_min_max"
++#endif
++#if __opencl_c_ext_fp64_local_atomic_min_max != 1
++#error "Incorrectly defined __opencl_c_ext_fp64_local_atomic_min_max"
 +#endif
  
  #else
  
-@@ -148,6 +178,48 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
+@@ -148,6 +190,48 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
  #ifdef cl_khr_subgroup_clustered_reduce
  #error "Incorrect cl_khr_subgroup_clustered_reduce define"
  #endif
@@ -340,5 +557,5 @@ index 13a3b62481ec..2c02d14f25c3 100644
  #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
  
 -- 
-2.17.1
+2.29.2
 

dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm12-0006-OpenCL-Add-cl_khr_integer_dot_product.patch

@@ -0,0 +1,146 @@
+From 54802abece1e4742050795162e3a773f0e143aa3 Mon Sep 17 00:00:00 2001
+From: haonanya <haonan.yang@intel.com>
+Date: Fri, 24 Dec 2021 15:27:46 +0800
+Subject: [PATCH] [OpenCL] Add cl_khr_integer_dot_product
+
+This is backporting of https://reviews.llvm.org/D106434
+Add the builtins defined by Section 42 "Integer dot product" in the OpenCL
+Extension Specification.
+
+See https://www.khronos.org/registry/OpenCL/specs/3.0-unified/html/OpenCL_Ext.html#cl_khr_integer_dot_product
+
+Signed-off-by: haonanya <haonan.yang@intel.com>
+
+Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/989bedec7a6ae95a0db865f23677047f78dc9257]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ clang/lib/Headers/opencl-c-base.h     |  3 +++
+ clang/lib/Headers/opencl-c.h          | 24 ++++++++++++++++++++++++
+ clang/lib/Sema/OpenCLBuiltins.td      | 25 +++++++++++++++++++++++++
+ clang/test/Headers/opencl-c-header.cl | 18 ++++++++++++++++++
+ 4 files changed, 70 insertions(+)
+
+diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h
+index d94d64372dbb..b55d9601a452 100644
+--- a/clang/lib/Headers/opencl-c-base.h
++++ b/clang/lib/Headers/opencl-c-base.h
+@@ -40,6 +40,9 @@
+ #define __opencl_c_ext_fp32_local_atomic_add 1
+ #define __opencl_c_ext_fp32_global_atomic_min_max 1
+ #define __opencl_c_ext_fp32_local_atomic_min_max 1
++#define cl_khr_integer_dot_product 1
++#define __opencl_c_integer_dot_product_input_4x8bit 1
++#define __opencl_c_integer_dot_product_input_4x8bit_packed 1
+ #endif // defined(__SPIR__)
+ #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
+ 
+diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
+index 501a04f6e82b..50dcc03955cb 100644
+--- a/clang/lib/Headers/opencl-c.h
++++ b/clang/lib/Headers/opencl-c.h
+@@ -16362,6 +16362,30 @@ double  __ovld sub_group_clustered_reduce_max( double value, uint clustersize );
+ 
+ #endif // cl_khr_subgroup_clustered_reduce
+ 
++#if defined(__opencl_c_integer_dot_product_input_4x8bit)
++uint __ovld __cnfn dot(uchar4, uchar4);
++int __ovld __cnfn dot(char4, char4);
++int __ovld __cnfn dot(uchar4, char4);
++int __ovld __cnfn dot(char4, uchar4);
++
++uint __ovld __cnfn dot_acc_sat(uchar4, uchar4, uint);
++int __ovld __cnfn dot_acc_sat(char4, char4, int);
++int __ovld __cnfn dot_acc_sat(uchar4, char4, int);
++int __ovld __cnfn dot_acc_sat(char4, uchar4, int);
++#endif // __opencl_c_integer_dot_product_input_4x8bit
++
++#if defined(__opencl_c_integer_dot_product_input_4x8bit_packed)
++uint __ovld __cnfn dot_4x8packed_uu_uint(uint, uint);
++int __ovld __cnfn dot_4x8packed_ss_int(uint, uint);
++int __ovld __cnfn dot_4x8packed_us_int(uint, uint);
++int __ovld __cnfn dot_4x8packed_su_int(uint, uint);
++
++uint __ovld __cnfn dot_acc_sat_4x8packed_uu_uint(uint, uint, uint);
++int __ovld __cnfn dot_acc_sat_4x8packed_ss_int(uint, uint, int);
++int __ovld __cnfn dot_acc_sat_4x8packed_us_int(uint, uint, int);
++int __ovld __cnfn dot_acc_sat_4x8packed_su_int(uint, uint, int);
++#endif // __opencl_c_integer_dot_product_input_4x8bit_packed
++
+ #if defined(cl_intel_subgroups)
+ // Intel-Specific Sub Group Functions
+ float   __ovld __conv intel_sub_group_shuffle( float  x, uint c );
+diff --git a/clang/lib/Sema/OpenCLBuiltins.td b/clang/lib/Sema/OpenCLBuiltins.td
+index 745363a6b43f..3c5f8821063d 100644
+--- a/clang/lib/Sema/OpenCLBuiltins.td
++++ b/clang/lib/Sema/OpenCLBuiltins.td
+@@ -1482,6 +1482,31 @@ let Extension = FuncExtKhrSubgroups in {
+   }
+ }
+ 
++// Section 42.3 - cl_khr_integer_dot_product
++let Extension = FunctionExtension<"__opencl_c_integer_dot_product_input_4x8bit"> in {
++  def : Builtin<"dot", [UInt, VectorType<UChar, 4>, VectorType<UChar, 4>], Attr.Const>;
++  def : Builtin<"dot", [Int, VectorType<Char, 4>, VectorType<Char, 4>], Attr.Const>;
++  def : Builtin<"dot", [Int, VectorType<UChar, 4>, VectorType<Char, 4>], Attr.Const>;
++  def : Builtin<"dot", [Int, VectorType<Char, 4>, VectorType<UChar, 4>], Attr.Const>;
++
++  def : Builtin<"dot_acc_sat", [UInt, VectorType<UChar, 4>, VectorType<UChar, 4>, UInt], Attr.Const>;
++  def : Builtin<"dot_acc_sat", [Int, VectorType<Char, 4>, VectorType<Char, 4>, Int], Attr.Const>;
++  def : Builtin<"dot_acc_sat", [Int, VectorType<UChar, 4>, VectorType<Char, 4>, Int], Attr.Const>;
++  def : Builtin<"dot_acc_sat", [Int, VectorType<Char, 4>, VectorType<UChar, 4>, Int], Attr.Const>;
++}
++
++let Extension = FunctionExtension<"__opencl_c_integer_dot_product_input_4x8bit_packed"> in {
++  def : Builtin<"dot_4x8packed_uu_uint", [UInt, UInt, UInt], Attr.Const>;
++  def : Builtin<"dot_4x8packed_ss_int", [Int, UInt, UInt], Attr.Const>;
++  def : Builtin<"dot_4x8packed_us_int", [Int, UInt, UInt], Attr.Const>;
++  def : Builtin<"dot_4x8packed_su_int", [Int, UInt, UInt], Attr.Const>;
++
++  def : Builtin<"dot_acc_sat_4x8packed_uu_uint", [UInt, UInt, UInt, UInt], Attr.Const>;
++  def : Builtin<"dot_acc_sat_4x8packed_ss_int", [Int, UInt, UInt, Int], Attr.Const>;
++  def : Builtin<"dot_acc_sat_4x8packed_us_int", [Int, UInt, UInt, Int], Attr.Const>;
++  def : Builtin<"dot_acc_sat_4x8packed_su_int", [Int, UInt, UInt, Int], Attr.Const>;
++}
++
+ //--------------------------------------------------------------------
+ // Arm extensions.
+ let Extension = ArmIntegerDotProductInt8 in {
+diff --git a/clang/test/Headers/opencl-c-header.cl b/clang/test/Headers/opencl-c-header.cl
+index 443f682c711a..184eefd9f9c3 100644
+--- a/clang/test/Headers/opencl-c-header.cl
++++ b/clang/test/Headers/opencl-c-header.cl
+@@ -166,6 +166,15 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
+ #if __opencl_c_ext_fp64_local_atomic_min_max != 1
+ #error "Incorrectly defined __opencl_c_ext_fp64_local_atomic_min_max"
+ #endif
++#if cl_khr_integer_dot_product != 1
++#error "Incorrectly defined cl_khr_integer_dot_product"
++#endif
++#if __opencl_c_integer_dot_product_input_4x8bit != 1
++#error "Incorrectly defined __opencl_c_integer_dot_product_input_4x8bit"
++#endif
++#if __opencl_c_integer_dot_product_input_4x8bit_packed != 1
++#error "Incorrectly defined __opencl_c_integer_dot_product_input_4x8bit_packed"
++#endif
+ 
+ #else
+ 
+@@ -232,6 +241,15 @@ global atomic_int z = ATOMIC_VAR_INIT(99);
+ #ifdef __opencl_c_ext_fp64_local_atomic_min_max
+ #error "Incorrectly __opencl_c_ext_fp64_local_atomic_min_max defined"
+ #endif
++#ifdef cl_khr_integer_dot_product
++#error "Incorrect cl_khr_integer_dot_product define"
++#endif
++#ifdef __opencl_c_integer_dot_product_input_4x8bit
++#error "Incorrect __opencl_c_integer_dot_product_input_4x8bit define"
++#endif
++#ifdef __opencl_c_integer_dot_product_input_4x8bit_packed
++#error "Incorrect __opencl_c_integer_dot_product_input_4x8bit_packed define"
++#endif
+ 
+ #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
+ 
+-- 
+2.17.1
+

dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend

@@ -6,6 +6,8 @@ SRC_URI_LLVM12_PATCHES = " \
                    file://llvm12-0003-Support-cl_ext_float_atomics.patch \
                    file://llvm12-0004-ispc-12_0_disable-A-B-A-B-and-BSWAP-in-InstCombine.patch \
                    file://llvm12-0005-ispc-12_0_fix_for_2111.patch \
+                   file://llvm12-0006-OpenCL-Add-cl_khr_integer_dot_product.patch \
+                   file://llvm12-0007-OpenCL-3.0-support.patch \
                    "
 
 SRC_URI:append:intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '12.0.0', ' ${SRC_URI_LLVM12_PATCHES} ', '', d)}"

dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb

@@ -15,7 +15,7 @@ SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
                                file://external-ocloc.patch \
                               "
 
-SRCREV = "c0b7f05897bd5d1185f816c32f98fa2afcf36611"
+SRCREV = "c046824c183da8f365f8f742537b21eb70b5628d"
 
 S = "${WORKDIR}/git"
 
@@ -37,7 +37,6 @@ EXTRA_OECMAKE = " \
                  -DNEO_DISABLE_LD_LLD=ON \
                  -DNEO_DISABLE_LD_GOLD=ON \
                  "
-EXTRA_OECMAKE:append:class-native = " -DNEO_DISABLE_BUILTINS_COMPILATION=ON"
 
 EXTRA_OECMAKE:append:class-target = " \
                                      -Docloc_cmd_prefix=ocloc \

dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch

@@ -1,4 +1,4 @@
-From 6f6997066040c5f33bf05ffde36a9800dcde1fcf Mon Sep 17 00:00:00 2001
+From 16fb6c022380bbb3c48f21372fcb1da7f30d3903 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Tue, 12 Oct 2021 23:46:42 +0800
 Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@@ -18,18 +18,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-index 5d9a901d7..66e59e399 100644
+index be8e5557e..07ab40382 100644
 --- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
 +++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-@@ -88,7 +88,7 @@ function(vc_embed_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
+@@ -112,7 +112,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
    add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
      COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
-     COMMENT "vc_embed_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
+     COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
 -    DEPENDS opt ${BIF_CMCL_BC_PATH})
 +    DEPENDS ${BIF_CMCL_BC_PATH})
-   add_custom_command(
-     OUTPUT ${BIF_CPP_PATH}
-     COMMAND ${PYTHON_EXECUTABLE} ${RESOURCE_EMBEDDER_SCRIPT} ${BIF_OPT_BC_NAME} ${BIF_CPP_NAME}
+   set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
+ endfunction()
+ 
 -- 
-2.32.0
+2.35.3
 

dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch

@@ -0,0 +1,25 @@
+From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Thu, 19 May 2022 22:50:09 +0800
+Subject: [PATCH] fix tblgen
+
+---
+ IGC/cmake/igc_llvm.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
+index 89c03fc49..85be9ae08 100644
+--- a/IGC/cmake/igc_llvm.cmake
++++ b/IGC/cmake/igc_llvm.cmake
+@@ -48,7 +48,7 @@ else()
+   set(LLVM_OPT_EXE "opt" CACHE STRING "")
+ 
+   set(LLVM_TABLEGEN_EXE "llvm-tblgen")
+-  if(CMAKE_CROSSCOMPILING)
++  if(TRUE)
+     if(DEFINED LLVM_TABLEGEN)
+       set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
+     else()
+-- 
+2.35.3
+

dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch

@@ -1,29 +0,0 @@
-From 0088e843be66ed5f11388a9ef57f364a2a236584 Mon Sep 17 00:00:00 2001
-From: Dongwon Kim <dongwon.kim@intel.com>
-Date: Tue, 1 Mar 2022 17:05:01 -0800
-Subject: [PATCH] llvm-link external
-
-Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
----
- IGC/cmake/igc_llvm.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 80c83d4e0..85f7dda3d 100644
---- a/IGC/cmake/igc_llvm.cmake
-+++ b/IGC/cmake/igc_llvm.cmake
-@@ -29,7 +29,10 @@ if(LLVM_TABLEGEN_EXE-NOTFOUND)
-   message(FATAL_ERROR "[VC] llvm-tblgen is not found")
- endif()
- 
--set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
-+find_program(LLVM_LINK_EXE "llvm-link")
-+if(LLVM_LINK_EXE-NOTFOUND)
-+  message(FATAL_ERROR "[VC] llvm-link is not found")
-+endif()
- 
- include(AddLLVM)
- include(TableGen)
--- 
-2.20.1
-

dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch

@@ -1,35 +0,0 @@
-From 3d99559779d628704568879a2ee51e968e66d005 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Tue, 5 Oct 2021 00:11:26 +0800
-Subject: [PATCH] llvm_deps.cmake: don't copy header file when building
-
-We build in pre-built mode and this header shouldn't be copied in
-that case.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- external/llvm/llvm_deps.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/external/llvm/llvm_deps.cmake b/external/llvm/llvm_deps.cmake
-index 425d3766f..e43804f77 100644
---- a/external/llvm/llvm_deps.cmake
-+++ b/external/llvm/llvm_deps.cmake
-@@ -46,9 +46,9 @@ if(IGC_OPTION__LLVM_LLD)
-   include(llvm_lld_source_hook)
-   if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
-     # Need to copy one header from unwind package for LLD (only for building from sources)
--    file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
--    file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
--         DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
-+    #file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
-+    #file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
-+    #     DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
-   endif()
- endif()
- 
--- 
-2.32.0
-

dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch

@@ -1,29 +0,0 @@
-From ac19bd37abccb697cc5fc9647be48de14185e9a2 Mon Sep 17 00:00:00 2001
-From: Dongwon Kim <dongwon.kim@intel.com>
-Date: Tue, 1 Mar 2022 15:23:36 -0800
-Subject: [PATCH] find external llvm-tblgen new
-
-Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
----
- IGC/cmake/igc_llvm.cmake | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 038a9ce3e..80c83d4e0 100644
---- a/IGC/cmake/igc_llvm.cmake
-+++ b/IGC/cmake/igc_llvm.cmake
-@@ -24,7 +24,10 @@ set(CMAKE_MODULE_PATH
-   ${CMAKE_MODULE_PATH}
-   )
- 
--set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+if(LLVM_TABLEGEN_EXE-NOTFOUND)
-+  message(FATAL_ERROR "[VC] llvm-tblgen is not found")
-+endif()
- 
- set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
- 
--- 
-2.20.1
-

dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch

@@ -1,23 +0,0 @@
-From 4369c970d4e02258b3c53e854faaa34197124a33 Mon Sep 17 00:00:00 2001
-From: Marcin Naczk <marcin.naczk@intel.com>
-Date: Tue, 22 Feb 2022 13:09:54 +0000
-Subject: [PATCH]  Upgrade github Action build IGC
-
-- Fix build IGC on Ubuntu 22.04 by adding missing include
-
-Upstream-Status: Backport
-Part of: https://github.com/intel/intel-graphics-compiler/commit/4369c970d4e02258b3c53e854faaa34197124a33
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
-diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
-index 6a2de51ee02..4a6fd8735ce 100644
---- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp
-+++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
-@@ -15,6 +15,7 @@ SPDX-License-Identifier: MIT
- #include "Operand.hpp"
- #include "../ErrorHandler.hpp"
- #include "RegDeps.hpp"
-+#include <limits>
- 
- namespace iga
- {

dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch

@@ -1,25 +0,0 @@
-From 4f510460beb630bac74fad399370b76354fdbd65 Mon Sep 17 00:00:00 2001
-From: Bruno Pagani <bruno.n.pagani@gmail.com>
-Date: Mon, 21 Feb 2022 12:32:25 +0000
-Subject: [PATCH]  Fix missing include
-
-Same as 6c805b2
-
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- visa/LocalScheduler/SWSB_G4IR.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/visa/LocalScheduler/SWSB_G4IR.cpp b/visa/LocalScheduler/SWSB_G4IR.cpp
-index 153d8a7dc58..cea75c7faa7 100644
---- a/visa/LocalScheduler/SWSB_G4IR.cpp
-+++ b/visa/LocalScheduler/SWSB_G4IR.cpp
-@@ -16,6 +16,7 @@ SPDX-License-Identifier: MIT
- #include <algorithm>
- #include <fstream>
- #include <functional>
-+#include <limits>
- #include <sstream>
- #include <queue>
- 

dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb

@@ -3,28 +3,27 @@ DESCRIPTION = "The Intel(R) Graphics Compiler for OpenCL(TM) is an \
 llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \
 hardware architecture."
 
-LICENSE = "MIT & BSD-3-Clause"
+LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
-                    file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=23;md5=4a985f2545dd5a846e205b1e60a51cd9 \
+                    file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
                     file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
 
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=master \
-           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \
-           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=master \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \
+           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
+           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
            git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
-           file://0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch \
            file://0003-Improve-Reproducibility-for-src-package.patch \
-           file://0004-find-external-llvm-tblgen.patch \
            file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
-           file://0001-llvm-link-external.patch \
-           file://fix-header.patch \
-           file://4369c970d4e02258b3c53e854faaa34197124a33.patch \
            "
 
-SRCREV_igc = "775a850f9b0c2d7249503b47ad6bd39a4eb9b3d7"
-SRCREV_vc = "5066d947985dd0c5107765daec5f24f735f3259a"
-SRCREV_spirv-tools = "eeb973f5020a5f0e92ad6da879bc4df9f5985a1c"
-SRCREV_spirv-headers = "ae217c17809fadb232ec94b29304b4afcd417bb4"
+SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
+
+SRCREV_igc = "bf3552db35cabf0ca416f7d216d4697b9bfb03cb"
+SRCREV_vc = "984bb27baacce6ee5c716c2e64845f2a1928025b"
+SRCREV_spirv-tools = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
+SRCREV_spirv-headers = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
+
+SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
 
 # Used to replace with relative path in reproducibility patch
 export B
@@ -51,6 +50,8 @@ EXTRA_OECMAKE = " \
                   -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
                   -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \
                   -DIGC_OPTION__LLVM_MODE=Prebuilds \
+                  -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \
                   "
 
 do_install:append:class-native () {
@@ -58,6 +59,7 @@ do_install:append:class-native () {
     install ${B}/IGC/Release/elf_packager ${D}${bindir}/
     if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then
         install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/
+        install ${B}/IGC/Release/vcb ${D}${bindir}/
     fi
 }
 

dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb

@@ -6,12 +6,15 @@ targeting GPU"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc"
 
-SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;;branch=master \
+SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;nobranch=1 \
           "
-SRCREV = "a2f2f10dc61c8161c57cf33ed606c8e3ccf3a921"
+SRCREV = "99ac111c2604a47d865bd4d7996be8cfaf2af146"
 
 S = "${WORKDIR}/git"
 
+PE = "1"
+PV .= "+git${SRCPV}"
+
 inherit cmake
 
 COMPATIBLE_HOST = '(x86_64).*-linux'

dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.1.bb

@@ -5,21 +5,19 @@ environment, performs static model analysis, and adjusts deep \
 learning models for optimal execution on end-point target devices."
 HOMEPAGE = "https://01.org/openvinotoolkit"
 
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2021/4;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \
            "
-SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8"
+SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 CVE_PRODUCT = "intel:openvino"
-
 S = "${WORKDIR}/git"
 
-do_install() {
-        mkdir -p ${D}${datadir}/openvino/model-optimizer
-        cp -r model-optimizer ${D}${datadir}/openvino/
-}
+inherit setuptools3
+
+SETUPTOOLS_SETUP_PATH = "${WORKDIR}/git/tools/mo"
 
 RDEPENDS:${PN} += " \
                     python3-numpy \
@@ -31,6 +29,4 @@ RDEPENDS:${PN} += " \
                     bash \
                     "
 
-FILES:${PN} += "${datadir}/openvino"
-
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"

dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.9.bb

@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
 SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
            "
 
-SRCREV = "f04746138602c623558be0561e4d1a37579710c7"
+SRCREV = "2c862048edd473182e66cd3aed98f78b746d64aa"
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools systemd gtk-doc

dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb

@@ -1,31 +1,10 @@
-# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
-# The following is the difference between the old and the new license text.
-# Please update the LICENSE value if needed, and summarize the changes in
-# the commit message via 'License-Update:' tag.
-# (example: 'License-Update: copyright years updated.')
-#
-# The changes:
-#
-# --- LICENSE
-# +++ LICENSE
-# @@ -1,6 +1,6 @@
-#  MIT License
-#  
-# -Copyright (c) 2019 Intel Corporation
-# +Copyright (C) 2019-2021 Intel Corporation
-#  
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-# 
-#
-
 SUMMARY = "oneAPI Level Zero Specification Headers and Loader"
 HOMEPAGE = "https://github.com/oneapi-src/level-zero"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc"
 
 SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master"
-SRCREV = "78f08cc338d70ac60a8f61084ad194fa0dbc90b0"
+SRCREV = "bb7fff05b801e26c3d7858e03e509d1089914d59"
 S = "${WORKDIR}/git"
 
 inherit cmake

dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb

@@ -49,7 +49,7 @@ ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
 
-RDEPENDS:${PN} += "perl elfutils opencl-icd-loader level-zero-loader zlib tbb libelf setup-intel-oneapi-env"
+RDEPENDS:${PN} += "perl elfutils ocl-icd level-zero-loader zlib tbb libelf setup-intel-oneapi-env"
 INSANE_SKIP:${PN} += "textrel dev-so"
 
 # The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6

dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.5.bb

@@ -13,9 +13,8 @@ inherit pkgconfig cmake
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master \
-            "
-SRCREV = "0835461a5dd1659696524303dc9cb2f2300ae156"
+SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=devel3"
+SRCREV = "698442324ccddd11725fb8875275dc1384f7fb40"
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"

dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.2.0.bb

@@ -30,6 +30,12 @@ DEPENDS = "ispc-native rkcommon embree"
 EXTRA_OECMAKE += " \
                   -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc  \
                   "
+EXTRA_OECMAKE:intel-corei7-64 += " \
+                  -DOPENVKL_ISA_AVX=OFF  \
+                  -DOPENVKL_ISA_AVX2=OFF  \
+                  -DOPENVKL_ISA_AVX512SKX=OFF  \
+                  "
+
 PACKAGES =+ "${PN}-examples"
 FILES:${PN}-examples = "\
                      ${bindir} \

dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0438.bb

@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;n
         file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
 "
 
-SRCREV_ipmctl = "4502cf18beac3acfaee1f774b69bb681daf5c9f7"
+SRCREV_ipmctl = "99188a69a82409f6759e8bfdff8fd71840e851fc"
 #tag: edk2-stable202111
 SRCREV_edk2 = "bb1bba3d776733c41dbfa2d1dc0fe234819a79f2"
 

dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch

@@ -1,56 +0,0 @@
-From 419070322898381885b0ffa286905a3b08a23aa6 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Tue, 9 Jun 2020 11:35:59 +0800
-Subject: [PATCH] don't install licenses and version
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- ngraph/CMakeLists.txt              | 8 ++------
- ngraph/test/runtime/CMakeLists.txt | 2 ++
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index a05ca3b15c..9bc507b4c7 100644
---- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -272,7 +272,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
-         install(EXPORT ngraphTargets
-             FILE ngraphTargets.cmake
-             NAMESPACE ngraph::
--            DESTINATION "deployment_tools/ngraph/cmake"
-+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-             COMPONENT ngraph_dev)
-     endif()
- 
-@@ -286,7 +286,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
- 
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
--        DESTINATION "deployment_tools/ngraph/cmake"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-         COMPONENT ngraph_dev)
- endif()
- 
-@@ -337,7 +337,3 @@ add_subdirectory(test)
- if (NGRAPH_PYTHON_BUILD_ENABLE)
-     add_subdirectory(python)
- endif()
--
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
--    DESTINATION "deployment_tools/ngraph"
--    COMPONENT ngraph)
-diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
-index be84499ee0..f65357b751 100644
---- a/ngraph/test/runtime/CMakeLists.txt
-+++ b/ngraph/test/runtime/CMakeLists.txt
-@@ -66,3 +66,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
- add_subdirectory(interpreter)
- add_subdirectory(ie)
-+
-+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB})
--- 
-2.32.0
-

dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch

@@ -1,51 +1,41 @@
-From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001
+From d997ee70a49cee8a577a81968c1d603a97bc614f Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 8 Apr 2021 14:19:51 +0800
-Subject: [PATCH] inference-engine: use system installed packages
+Date: Thu, 7 Apr 2022 21:39:26 +0800
+Subject: [PATCH] Use system installed dependencies
 
-Use installed versions of ade, protobuf, zlib and tbb.
-
-Don't fetch pybind11 at runtime and use the one that we have fetched while
-running do_fetch.
+Use the system versions of libva, ade and zlib.
 
 Upstream-Status: Inappropriate
-
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- cmake/dependencies.cmake                      | 19 --------
- inference-engine/CMakeLists.txt               |  6 +--
- inference-engine/cmake/dependencies.cmake     | 45 -------------------
- inference-engine/cmake/ie_parallel.cmake      |  2 +-
- .../templates/InferenceEngineConfig.cmake.in  | 10 -----
- inference-engine/samples/CMakeLists.txt       |  3 +-
- .../src/inference_engine/CMakeLists.txt       |  4 +-
- .../common_test_utils/CMakeLists.txt          |  4 +-
- .../unit_test_utils/CMakeLists.txt            |  3 +-
- inference-engine/thirdparty/CMakeLists.txt    |  5 +--
- ngraph/python/CMakeLists.txt                  | 12 +----
- tests/fuzz/src/CMakeLists.txt                 |  1 -
- thirdparty/CMakeLists.txt                     |  1 -
- thirdparty/cnpy/CMakeLists.txt                |  4 +-
- 14 files changed, 14 insertions(+), 105 deletions(-)
+ cmake/dependencies.cmake              | 20 --------------------
+ cmake/extra_modules.cmake             |  4 ++--
+ src/plugins/intel_gpu/include/va/va.h |  6 ------
+ tests/fuzz/src/CMakeLists.txt         |  3 +--
+ thirdparty/CMakeLists.txt             | 26 ++++++++++----------------
+ thirdparty/cnpy/CMakeLists.txt        |  2 +-
+ 6 files changed, 14 insertions(+), 47 deletions(-)
+ delete mode 100644 src/plugins/intel_gpu/include/va/va.h
 
 diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index 6cb15a077e..74d4ac4124 100644
+index 106af36c7d..45a3214100 100644
 --- a/cmake/dependencies.cmake
 +++ b/cmake/dependencies.cmake
-@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
- if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-     set(protoc_version "3.7.1")
+@@ -27,26 +27,6 @@ get_linux_name(LINUX_OS_NAME)
  
+ if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+     set(protoc_version "3.18.2")
+-
 -    RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
 -        ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
 -        TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
--        SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
+-        SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
 -    )
 -    debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
 -
 -    reset_deps_cache(SYSTEM_PROTOC)
 -
--    find_program(
+-    find_host_program(
 -        SYSTEM_PROTOC
 -        NAMES protoc
 -        PATHS "${SYSTEM_PROTOC_ROOT}/bin"
@@ -56,244 +46,47 @@ index 6cb15a077e..74d4ac4124 100644
 -
 -    update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
  endif()
-diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
-index 1ac7fd8bf6..0615873110 100644
---- a/inference-engine/CMakeLists.txt
-+++ b/inference-engine/CMakeLists.txt
-@@ -18,7 +18,7 @@ function(ie_developer_export_targets)
- endfunction()
  
- function(ie_developer_export)
--    set(all_dev_targets gflags ie_libraries)
-+    set(all_dev_targets ie_libraries)
-     foreach(component IN LISTS openvino_export_components)
-         export(TARGETS ${${component}} NAMESPACE IE::
-                APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
-@@ -142,7 +142,7 @@ endif()
- # Developer package
- #
+ if(ENABLE_INTEL_MYRIAD)
+diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
+index e33e4378f1..f0cacdf6ff 100644
+--- a/cmake/extra_modules.cmake
++++ b/cmake/extra_modules.cmake
+@@ -18,7 +18,7 @@ function(ie_generate_dev_package_config)
+     configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
+                                   "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
+                                   INSTALL_DESTINATION share # not used
+-                                  PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
++                                  PATH_VARS "OpenVINO_SOURCE_DIR"
+                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
  
--openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils)
-+openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
+     configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
+@@ -45,7 +45,7 @@ function(ov_generate_dev_package_config)
+     configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in"
+                                   "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake"
+                                   INSTALL_DESTINATION share # not used
+-                                  PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
++                                  PATH_VARS "OpenVINO_SOURCE_DIR"
+                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
  
- # for Template plugin
- if(NGRAPH_INTERPRETER_ENABLE)
-@@ -158,7 +158,7 @@ function(ie_generate_dev_package_config)
-     configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
-                                 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
-                                 INSTALL_DESTINATION share # not used
--                                PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
-+                                PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR"
-                                 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
-     configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
-diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
-index b270c46f2d..5f85197a85 100644
---- a/inference-engine/cmake/dependencies.cmake
-+++ b/inference-engine/cmake/dependencies.cmake
-@@ -81,51 +81,6 @@ endif ()
- if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-     reset_deps_cache(TBBROOT TBB_DIR)
- 
--    if (WIN32 AND X86_64)
--        #TODO: add target_path to be platform specific as well, to avoid following if
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_WIN "tbb2020_20200415_win.zip"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
--        RESOLVE_DEPENDENCY(TBBBIND_2_4
--                ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip"
--                TARGET_PATH "${TEMP}/tbbbind_2_4"
--                ENVIRONMENT "TBBBIND_2_4_ROOT"
--                SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a")
--    elseif(ANDROID)  # Should be before LINUX due LINUX is detected as well
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
--    elseif(LINUX AND X86_64)
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
--        RESOLVE_DEPENDENCY(TBBBIND_2_4
--                ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz"
--                TARGET_PATH "${TEMP}/tbbbind_2_4"
--                ENVIRONMENT "TBBBIND_2_4_ROOT"
--                SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6")
--    elseif(LINUX AND AARCH64)
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
--                TARGET_PATH "${TEMP}/tbb_yocto"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
--    elseif(APPLE AND X86_64)
--        RESOLVE_DEPENDENCY(TBB
--                ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
--                TARGET_PATH "${TEMP}/tbb"
--                ENVIRONMENT "TBBROOT"
--                SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
--    else()
--        message(FATAL_ERROR "TBB is not available on current platform")
--    endif()
+     configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
+diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
+deleted file mode 100644
+index 5c8a5c6f6e..0000000000
+--- a/src/plugins/intel_gpu/include/va/va.h
++++ /dev/null
+@@ -1,6 +0,0 @@
+-// Copyright (C) 2018-2022 Intel Corporation
+-// SPDX-License-Identifier: Apache-2.0
+-//
 -
-     update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
-     update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
- 
-diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index edf3d2f2b2..6579d0f7ea 100644
---- a/inference-engine/cmake/ie_parallel.cmake
-+++ b/inference-engine/cmake/ie_parallel.cmake
-@@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
-             find_dependency(TBB COMPONENTS tbb tbbmalloc)
-         endif()
-         set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE)
--        set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
-+        set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE)
-         set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE)
-         if (NOT TBB_FOUND)
-             ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\
-diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
-index 261edbf3d7..bf217a789a 100644
---- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
-+++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
-@@ -86,16 +86,6 @@ endfunction()
- set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")
- 
- set(THREADING "@THREADING@")
--if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
--    set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
--    _ie_find_dependency(TBB
--                        COMPONENTS tbb tbbmalloc
--                        CONFIG
--                        PATHS ${TBBROOT}/cmake
--                              ${_tbb_dir}
--                        NO_CMAKE_FIND_ROOT_PATH
--                        NO_DEFAULT_PATH)
--endif()
- 
- set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@")
- _ie_find_dependency(ngraph
-diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index 7924c56779..ae93857944 100644
---- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
-         add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
-         set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
-     endfunction()
--    add_gflags()
-+    #add_gflags()
- endif()
- 
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib")
--    add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL)
- endif()
- 
- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy")
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index e8ed1a5c4c..2fcb0bed4a 100644
---- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf
-                                INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}"
-                                PATH_VARS ${PATH_VARS})
- 
--set(IE_INCLUDE_DIR "include")
--set(IE_NGRAPH_DIR "../ngraph/cmake")
-+set(IE_INCLUDE_DIR "../../include")
-+set(IE_NGRAPH_DIR "ngraph")
- set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}")
- set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake")
- 
-diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-index 5e8643dc5d..031557efc3 100644
---- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-@@ -43,7 +43,7 @@ function(add_gtest_libraries)
-                           PROPERTIES FOLDER thirdparty)
- endfunction()
- 
--add_gtest_libraries()
-+#add_gtest_libraries()
- 
- if (MSVC)
-     set(PUGI pugixml_mt)
-@@ -52,8 +52,6 @@ else ()
- endif ()
- 
- list(APPEND EXPORT_DEPENDENCIES
--        gtest
--        gtest_main
-         )
- 
- set(TARGET_NAME commonTestUtils)
-diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-index 7c1d89eabf..2fbd8fc324 100644
---- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
- 
- list(APPEND EXPORT_DEPENDENCIES
-         commonTestUtils_s
--        inference_engine_s
--        gmock)
-+        inference_engine_s)
- 
- addIeTarget(
-         NAME ${TARGET_NAME}
-diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
-index f028ebdd8a..9c5bd53466 100644
---- a/inference-engine/thirdparty/CMakeLists.txt
-+++ b/inference-engine/thirdparty/CMakeLists.txt
-@@ -62,14 +62,13 @@ else()
-     target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
- endif()
- 
--add_subdirectory(ade EXCLUDE_FROM_ALL)
- add_subdirectory(fluid/modules/gapi)
- 
--set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
-+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
- 
- # developer package
- 
--openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
-+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
- 
- if (NOT USE_SYSTEM_PUGIXML)
-     set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
-diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt
-index 501bfffb4b..b45612c19c 100644
---- a/ngraph/python/CMakeLists.txt
-+++ b/ngraph/python/CMakeLists.txt
-@@ -17,17 +17,7 @@ endif()
- 
- include(FetchContent)
- 
--FetchContent_Declare(
--    pybind11
--    GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
--    GIT_TAG        "v2.5.0"
--)
--
--FetchContent_GetProperties(pybind11)
--if(NOT pybind11_POPULATED)
--    FetchContent_Populate(pybind11)
--    add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
--endif()
-+add_subdirectory(pybind11)
- 
- # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11
- set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+-typedef cl_uint VASurfaceID;
+-typedef void* VADisplay;
 diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
-index b9400d9e7e..669938526c 100644
+index 5e6b7b168e..a81c51bb77 100644
 --- a/tests/fuzz/src/CMakeLists.txt
 +++ b/tests/fuzz/src/CMakeLists.txt
-@@ -10,7 +10,6 @@ add_custom_target(fuzz)
+@@ -10,14 +10,13 @@ add_custom_target(fuzz)
  FILE(GLOB tests "*-fuzzer.cc")
  
  add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy)
@@ -301,33 +94,105 @@ index b9400d9e7e..669938526c 100644
  
  foreach(test_source ${tests})
      get_filename_component(test_name ${test_source} NAME_WE)
+     add_fuzzer(${test_name} ${test_source})
+ 
+     target_link_libraries(${test_name} PRIVATE
+-        openvino::runtime cnpy zlib)
++        openvino::runtime cnpy z)
+ 
+     add_dependencies(fuzz ${test_name})
+ 
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 2c6b656408..4e86bd21ef 100644
+index 2d61c5fd7a..97b372998a 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
-@@ -5,6 +5,5 @@
+@@ -12,10 +12,9 @@ endif()
+ 
  add_subdirectory(ittapi)
- add_subdirectory(itt_collector)
- add_subdirectory(xbyak EXCLUDE_FROM_ALL)
+ add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
 -add_subdirectory(zlib EXCLUDE_FROM_ALL)
  add_subdirectory(cnpy EXCLUDE_FROM_ALL)
- openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
+ if(ENABLE_INTEL_GPU)
+-    add_subdirectory(ocl)
++	#add_subdirectory(ocl)
+ endif()
+ 
+ add_subdirectory(xbyak EXCLUDE_FROM_ALL)
+@@ -52,21 +51,16 @@ endif()
+ add_library(ocv_hal INTERFACE)
+ target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
+ 
+-add_subdirectory(ade EXCLUDE_FROM_ALL)
+ add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL)
+-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
+-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
++set_target_properties(fluid PROPERTIES FOLDER thirdparty)
++openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
+ 
+-ov_install_static_lib(ade openvino_common)
+ ov_install_static_lib(fluid openvino_common)
+ 
+ #
+ # Gflags
+ #
+ 
+-add_subdirectory(gflags EXCLUDE_FROM_ALL)
+-openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
+-
+ #
+ # Google Tests framework
+ #
+@@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
+             set(Protobuf_DEBUG ON)
+         endif()
+         find_package(Protobuf 3.18.2 REQUIRED)
+-        set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
+-        set(Protobuf_LIBRARIES protobuf::libprotobuf)
+-        set(SYSTEM_PROTOC protobuf::protoc)
++	set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
++	set(Protobuf_LIBRARIES protobuf::libprotobuf)
++	#set(SYSTEM_PROTOC protobuf::protoc)
+         set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC})
+ 
+         foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES})
+-            set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
++		#set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
+         endforeach()
+     else()
+         add_subdirectory(protobuf EXCLUDE_FROM_ALL)
+@@ -104,8 +98,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
+     # forward variables used in the other places
+     set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE)
+     set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE)
+-    set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE)
+-    set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE)
++    set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE)
++    set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE)
+     set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE)
+     set(Protobuf_IN_FRONTEND ON PARENT_SCOPE)
+ 
+@@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
+             set(link_type INTERFACE)
+         endif()
+         if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
+-            target_compile_options(${target} ${link_type} -Wno-undef)
++		#target_compile_options(${target} ${link_type} -Wno-undef)
+         endif()
+     endforeach()
+ endif()
 diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
-index 5571cd5f78..e30604927a 100644
+index 041031e923..793de9845c 100644
 --- a/thirdparty/cnpy/CMakeLists.txt
 +++ b/thirdparty/cnpy/CMakeLists.txt
-@@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-     target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable)
+@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
+                                           PRIVATE -Wno-all)
  endif()
  
 -target_link_libraries(${TARGET_NAME} PUBLIC zlib)
 +target_link_libraries(${TARGET_NAME} PUBLIC z)
- target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
-                                                  "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
  
--set_target_properties(cnpy PROPERTIES FOLDER thirdparty)
-\ No newline at end of file
-+set_target_properties(cnpy PROPERTIES FOLDER thirdparty)
+ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
 -- 
-2.32.0
+2.36.1
 

dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Disable-Werror.patch

@@ -1,43 +0,0 @@
-From 1a3f315323a0b1d1affed01e85cbbf0a677718e8 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:45:48 +0800
-Subject: [PATCH] Disable Werror
-
-Don't treat warnings as errors. This just leads to failures every time
-we upgrade the compiler.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
- ngraph/CMakeLists.txt                            | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-index d14da47860..08ed695c0d 100644
---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
-+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -518,7 +518,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
-         MultiProcessorCompilation
-         DeadCodeEliminate
-         ExtensionsEnabled
--        TreatWarnAsErrorEnabled
-         WarnLevel4
-         NoFastMath
-         StackProtector
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index a05ca3b15c..ae888c4cb2 100644
---- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -197,7 +197,6 @@ if (WIN32)
- endif()
- 
- if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
- endif()
- 
- if(WIN32)
--- 
-2.32.0
-

dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch

@@ -0,0 +1,348 @@
+From 5b6c285b5398fd29cc541ccf92e13440537bb5e8 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Mon, 11 Apr 2022 11:11:23 +0800
+Subject: [PATCH] Fix installation of binaries and libraries
+
+Make sure binaries are installed correctly.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt                                       |  2 +-
+ cmake/developer_package/frontends/frontends.cmake    |  2 +-
+ cmake/developer_package/packaging.cmake              |  4 ++--
+ cmake/developer_package/plugins/plugins.cmake        |  2 +-
+ docs/CMakeLists.txt                                  |  3 ++-
+ samples/CMakeLists.txt                               |  2 +-
+ samples/c/common/opencv_c_wrapper/CMakeLists.txt     |  2 ++
+ samples/cpp/CMakeLists.txt                           |  2 ++
+ scripts/CMakeLists.txt                               | 10 +++++-----
+ src/bindings/c/src/CMakeLists.txt                    |  4 ++--
+ src/cmake/openvino.cmake                             | 12 ++++++------
+ src/common/preprocessing/CMakeLists.txt              |  2 +-
+ src/core/CMakeLists.txt                              |  4 ++--
+ src/inference/CMakeLists.txt                         |  2 +-
+ .../intel_gpu/src/kernel_selector/CMakeLists.txt     |  2 +-
+ src/plugins/intel_myriad/myriad_dependencies.cmake   |  2 +-
+ .../intel_myriad/myriad_plugin/CMakeLists.txt        |  2 +-
+ tools/CMakeLists.txt                                 |  2 +-
+ tools/compile_tool/CMakeLists.txt                    |  8 ++++----
+ 19 files changed, 37 insertions(+), 32 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index beb0214284..c9ffa7fcae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,7 +106,7 @@ include(cmake/extra_modules.cmake)
+ add_subdirectory(docs)
+ add_subdirectory(tools)
+ add_subdirectory(scripts)
+-add_subdirectory(licensing)
++#add_subdirectory(licensing)
+ 
+ #
+ # CPack
+diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
+index 39b23fe655..aa638c0778 100644
+--- a/cmake/developer_package/frontends/frontends.cmake
++++ b/cmake/developer_package/frontends/frontends.cmake
+@@ -2,7 +2,7 @@
+ # SPDX-License-Identifier: Apache-2.0
+ #
+ 
+-set(FRONTEND_INSTALL_INCLUDE "runtime/include/")
++set(FRONTEND_INSTALL_INCLUDE "include/")
+ set(FRONTEND_NAME_PREFIX "openvino_")
+ set(FRONTEND_NAME_SUFFIX "_frontend")
+ 
+diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
+index cc287ff1f3..2daee6611e 100644
+--- a/cmake/developer_package/packaging.cmake
++++ b/cmake/developer_package/packaging.cmake
+@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir)
+         set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
+         set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
+     else()
+-        set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
+-        set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
++        set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
++        set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
+         set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
+     endif()
+ endfunction()
+diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
+index a630d6c354..779c43631a 100644
+--- a/cmake/developer_package/plugins/plugins.cmake
++++ b/cmake/developer_package/plugins/plugins.cmake
+@@ -138,7 +138,7 @@ function(ie_add_plugin)
+ 
+             if(BUILD_SHARED_LIBS)
+                 install(TARGETS ${IE_PLUGIN_NAME}
+-                        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
++                        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
+                         COMPONENT ${install_component})
+             else()
+                 ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 86b0e8652b..4f31d3cc4b 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER)
+     foreach(target openvino_template_plugin template_extension openvino_template_extension)
+         if(TARGET ${target})
+             install(TARGETS ${target}
+-                    LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
++		    LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
+                     COMPONENT tests
+                     EXCLUDE_FROM_ALL)
++            install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+         endif()
+     endforeach()
+ endif()
+diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
+index 8101b5e328..6abe8c20ce 100644
+--- a/samples/CMakeLists.txt
++++ b/samples/CMakeLists.txt
+@@ -9,7 +9,7 @@ add_subdirectory(c)
+ if(TARGET format_reader)
+     install(TARGETS format_reader
+             RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
+-            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
++            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests)
+ endif()
+ 
+ openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
+diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
+index 2755579a0f..4a5f5b424f 100644
+--- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
++++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
+@@ -34,3 +34,5 @@ install(
+     RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
+     LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
+ )
++
++install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index 9a73582a73..70c4147f3f 100644
+--- a/samples/cpp/CMakeLists.txt
++++ b/samples/cpp/CMakeLists.txt
+@@ -222,6 +222,8 @@ macro(ie_add_sample)
+         EXCLUDE_FROM_ALL
+     )
+ 
++    install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
++
+     # create global target with all samples / demo apps
+     if(NOT TARGET ie_samples)
+         add_custom_target(ie_samples ALL)
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 9ad26ba952..0853e23706 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
+ 
+ # install setupvars
+ 
+-ie_cpack_add_component(setupvars REQUIRED)
++#ie_cpack_add_component(setupvars REQUIRED)
+ 
+ if(UNIX)
+     set(_setupvars_file setupvars/setupvars.sh)
+@@ -43,13 +43,13 @@ elseif(WIN32)
+         file(WRITE "${_setupvars_file}" "${_setupvars_content}")
+     endif()
+ endif()
+-install(PROGRAMS "${_setupvars_file}"
+-        DESTINATION .
+-        COMPONENT setupvars)
++#install(PROGRAMS "${_setupvars_file}"
++#        DESTINATION .
++#        COMPONENT setupvars)
+ 
+ # install install_dependencies
+ 
+-if(LINUX)
++if (FALSE)
+     ie_cpack_add_component(install_dependencies REQUIRED)
+     install(DIRECTORY install_dependencies/
+             DESTINATION install_dependencies
+diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt
+index 9200d0bda1..b3636e0716 100644
+--- a/src/bindings/c/src/CMakeLists.txt
++++ b/src/bindings/c/src/CMakeLists.txt
+@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
+         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c
+         ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c
+         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c
+-        INCLUDES DESTINATION runtime/include/ie)
++        INCLUDES DESTINATION include/ie)
+ 
+ install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/
+-        DESTINATION runtime/include/ie
++        DESTINATION include/ie
+         COMPONENT core_c_dev)
+diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
+index ddd016d14e..76db0f9927 100644
+--- a/src/cmake/openvino.cmake
++++ b/src/cmake/openvino.cmake
+@@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
+         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
+         ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
+         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
+-        INCLUDES DESTINATION runtime/include
+-                             runtime/include/ie)
++        INCLUDES DESTINATION include
++                             include/ie)
+ 
+ # --------------- OpenVINO runtime library dev ------------------------------
+ add_library(${TARGET_NAME}_dev INTERFACE)
+@@ -95,7 +95,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
+ 
+ if(BUILD_SHARED_LIBS)
+     install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
+-            DESTINATION ${IE_CPACK_RUNTIME_PATH}
++            DESTINATION ${IE_CPACK_LIBRARY_PATH}
+             COMPONENT core)
+ 
+     # for InferenceEngineUnitTest
+@@ -114,7 +114,7 @@ endif()
+ install(EXPORT OpenVINOTargets
+         FILE OpenVINOTargets.cmake
+         NAMESPACE openvino::
+-        DESTINATION runtime/cmake
++	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
+         COMPONENT core_dev)
+ 
+ # Build tree
+@@ -160,10 +160,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
+ install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
+               "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
+               "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake"
+-        DESTINATION runtime/cmake
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
+         COMPONENT core_dev)
+ 
+ install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
+               "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
+-        DESTINATION runtime/cmake
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
+         COMPONENT core_dev)
+diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
+index e41e286c95..11aaffca6a 100644
+--- a/src/common/preprocessing/CMakeLists.txt
++++ b/src/common/preprocessing/CMakeLists.txt
+@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
+ 
+ if(BUILD_SHARED_LIBS)
+     install(TARGETS ${TARGET_NAME}
+-            LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
++            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
+ else()
+     ov_install_static_lib(${TARGET_NAME} core)
+ endif()
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index cc64b94ca3..5f0dcf20cf 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -114,7 +114,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_
+ #-----------------------------------------------------------------------------------------------
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+-        DESTINATION "runtime/include"
++        DESTINATION "include"
+         COMPONENT core_dev
+         FILES_MATCHING
+             PATTERN "*.hpp"
+@@ -130,5 +130,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
+ 
+ install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
+               ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
+-        DESTINATION "runtime/cmake"
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
+         COMPONENT core_dev)
+diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt
+index 767fbc1b81..f279a2ef7d 100644
+--- a/src/inference/CMakeLists.txt
++++ b/src/inference/CMakeLists.txt
+@@ -209,7 +209,7 @@ set_target_properties(${TARGET_NAME}_obj
+ 
+ openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api)
+ 
+-install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include
++install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include
+         COMPONENT core_dev)
+ 
+ # Install static libraries for case BUILD_SHARED_LIBS=OFF
+diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
+index 3993bd9731..99287bad51 100644
+--- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
++++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
+@@ -94,7 +94,7 @@ add_custom_command(
+     COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json)
+ 
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json
+-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
++        DESTINATION ${IE_CPACK_LIBRARY_PATH}
+         COMPONENT gpu)
+ 
+ ov_install_static_lib(${TARGET_NAME} gpu)
+diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake
+index 5bba4235ff..69c1470a71 100644
+--- a/src/plugins/intel_myriad/myriad_dependencies.cmake
++++ b/src/plugins/intel_myriad/myriad_dependencies.cmake
+@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
+         VERBATIM)
+ 
+     install(FILES ${${var_name}}
+-            DESTINATION ${IE_CPACK_RUNTIME_PATH}
++            DESTINATION ${IE_CPACK_LIBRARY_PATH}
+             COMPONENT myriad)
+ 
+     if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS)
+diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
+index 12a2f15e4a..893146294c 100644
+--- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
++++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
+@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
+ # install
+ if (LINUX)
+     install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules
+-        DESTINATION runtime/3rdparty
++        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
+         COMPONENT myriad)
+ endif()
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index c8638f7fd3..ba30641c5a 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -20,7 +20,7 @@ endif()
+ ie_cpack_add_component(deployment_manager REQUIRED)
+ 
+ install(DIRECTORY deployment_manager
+-        DESTINATION tools
++        DESTINATION share/openvino/tools
+         COMPONENT deployment_manager
+         USE_SOURCE_PERMISSIONS)
+ 
+diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt
+index d19eb5cc14..9fc929cbb0 100644
+--- a/tools/compile_tool/CMakeLists.txt
++++ b/tools/compile_tool/CMakeLists.txt
+@@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
+ ie_cpack_add_component(core_tools DEPENDS core)
+ 
+ install(TARGETS compile_tool
+-        RUNTIME DESTINATION tools/compile_tool
++        RUNTIME DESTINATION bin
+         COMPONENT core_tools)
+ 
+-install(FILES README.md
+-        DESTINATION tools/compile_tool
+-        COMPONENT core_tools)
++#install(FILES README.md
++#        DESTINATION tools/compile_tool
++#        COMPONENT core_tools)
+-- 
+2.36.1
+

dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch

@@ -1,326 +0,0 @@
-From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 11 Jun 2020 14:24:04 +0800
-Subject: [PATCH] cmake installation fixes
-
-Make sure that libraries/samples/binaries are installed correctly.
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- CMakeLists.txt                                | 15 --------
- .../IEDevScriptsConfig.cmake                  |  2 +-
- cmake/developer_package/packaging.cmake       |  8 +++--
- cmake/developer_package/plugins/plugins.cmake |  2 +-
- .../common/opencv_c_wrapper/CMakeLists.txt    |  2 ++
- inference-engine/samples/CMakeLists.txt       |  4 ++-
- .../common/format_reader/CMakeLists.txt       |  4 ++-
- .../src/inference_engine/CMakeLists.txt       | 35 ++-----------------
- .../src/preprocessing/CMakeLists.txt          |  2 +-
- .../src/readers/ir_reader/CMakeLists.txt      |  2 +-
- .../src/vpu/myriad_plugin/CMakeLists.txt      |  2 +-
- .../tests/unit/cpu/CMakeLists.txt             |  2 ++
- .../unit/inference_engine/CMakeLists.txt      |  2 ++
- .../tests/unit/vpu/CMakeLists.txt             |  2 ++
- .../tools/compile_tool/CMakeLists.txt         |  2 +-
- ngraph/CMakeLists.txt                         |  8 ++---
- 16 files changed, 32 insertions(+), 62 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0706a72e8..7920de9a42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
- 
- # install setupvars
- 
--ie_cpack_add_component(setupvars REQUIRED)
--
- if(UNIX)
--    install(PROGRAMS scripts/setupvars/setupvars.sh
--            DESTINATION bin
--            COMPONENT setupvars)
- elseif(WIN32)
-     install(PROGRAMS scripts/setupvars/setupvars.bat
-             DESTINATION bin
-@@ -195,22 +190,12 @@ endif()
- # install install_dependencies
- 
- if(UNIX)
--    ie_cpack_add_component(install_dependencies REQUIRED)
--    install(DIRECTORY scripts/install_dependencies/
--            DESTINATION install_dependencies
--            COMPONENT install_dependencies)
- endif()
- 
- # install files for demo
- 
--ie_cpack_add_component(demo_scripts DEPENDS core)
- 
- if(UNIX)
--    install(DIRECTORY scripts/demo/
--            DESTINATION deployment_tools/demo
--            COMPONENT demo_scripts
--            USE_SOURCE_PERMISSIONS
--            PATTERN *.bat EXCLUDE)
- elseif(WIN32)
-     install(DIRECTORY scripts/demo/
-             DESTINATION deployment_tools/demo
-diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
-index 0e1fe76db2..97867a24f8 100644
---- a/cmake/developer_package/IEDevScriptsConfig.cmake
-+++ b/cmake/developer_package/IEDevScriptsConfig.cmake
-@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT)
-     if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
-         message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
-     endif()
--    set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
-+    set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
- endif()
- 
- # Enable postfixes for Debug/Release builds
-diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
-index 2b5e945b17..adc4bef0bc 100644
---- a/cmake/developer_package/packaging.cmake
-+++ b/cmake/developer_package/packaging.cmake
-@@ -5,7 +5,9 @@
- include(CPackComponent)
- unset(IE_CPACK_COMPONENTS_ALL CACHE)
- 
--set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
-+if (NOT DEFINED IE_CPACK_IE_DIR)
-+    set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
-+endif()
- 
- #
- # ie_cpack_set_library_dir()
-@@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir)
-         set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-     else()
--        set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
--        set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
-+        set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-+        set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
-     endif()
- endfunction()
-diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
-index aae1dbb7fb..e6dac2a478 100644
---- a/cmake/developer_package/plugins/plugins.cmake
-+++ b/cmake/developer_package/plugins/plugins.cmake
-@@ -124,7 +124,7 @@ function(ie_add_plugin)
- 
-         install(TARGETS ${IE_PLUGIN_NAME}
-             RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}
--            LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component})
-+            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component})
-     endif()
- endfunction()
- 
-diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
-index 45b2b3e9ed..55f7dfd214 100644
---- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
-+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
-@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
- if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
-     add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
- endif()
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index ae93857944..fba24c6fed 100644
---- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -33,7 +33,7 @@ endif()
- 
- if(IE_MAIN_SOURCE_DIR)
-     # in case if samples are built from IE repo
--    set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
-+    set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
-     # hint for find_package(InferenceEngine in the samples folder)
-     set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
-     # hint for find_package(ngraph in the samples folder)
-@@ -256,6 +256,8 @@ macro(ie_add_sample)
-     if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
-         add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS})
-     endif()
-+    
-+    install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
- endmacro()
- 
- # collect all samples subdirectories
-diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
-index d75061e56c..a2f8bd6397 100644
---- a/inference-engine/samples/common/format_reader/CMakeLists.txt
-+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
-@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
- 
- if(COMMAND add_clang_format_target)
-     add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
--endif()
-\ No newline at end of file
-+endif()
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 5d044e097c..103c187913 100644
---- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -227,35 +227,6 @@ list(APPEND core_components ngraph)
- list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR"
-                       "IE_PARALLEL_CMAKE")
- 
--if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
--    ie_cpack_add_component(tbb REQUIRED)
--    list(APPEND core_components tbb)
--
--    install(DIRECTORY "${TBB}/include"
--            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
--            COMPONENT tbb)
--    install(DIRECTORY "${TBB}/lib"
--            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
--            COMPONENT tbb)
--    if(EXISTS "${TBB}/bin")
--        install(DIRECTORY "${TBB}/bin"
--                DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
--                COMPONENT tbb)
--    endif()
--    install(FILES "${TBB}/LICENSE"
--            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
--            COMPONENT tbb)
--
--    set(IE_TBB_DIR_INSTALL "external/tbb/cmake")
--    set(IE_TBB_DIR "${TBB_DIR}")
--    list(APPEND PATH_VARS "IE_TBB_DIR")
--
--    install(FILES "${TBB}/cmake/TBBConfig.cmake"
--                  "${TBB}/cmake/TBBConfigVersion.cmake"
--            DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL}
--            COMPONENT tbb)
--endif()
--
- # Install Inference Engine
- 
- ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
-@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
-         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
- 
- install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
--        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT core)
- 
- # Install cmake scripts
-@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
- install(EXPORT InferenceEngineTargets
-         FILE InferenceEngineTargets.cmake
-         NAMESPACE IE::
--        DESTINATION ${IE_CPACK_IE_DIR}/share
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core_dev)
- 
- set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph")
-@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers
- install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-               "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
-               "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake"
--        DESTINATION ${IE_CPACK_IE_DIR}/share
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core_dev)
-diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
-index f9548339d1..2670a04b60 100644
---- a/inference-engine/src/preprocessing/CMakeLists.txt
-+++ b/inference-engine/src/preprocessing/CMakeLists.txt
-@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME})
- 
- install(TARGETS ${TARGET_NAME}
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
--        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
-+        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
-diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt
-index 6d2bd39f3c..0722702055 100644
---- a/inference-engine/src/readers/ir_reader/CMakeLists.txt
-+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt
-@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- 
- install(TARGETS ${TARGET_NAME}
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
--        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
-+        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
-diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-index a3e0182ed9..1b0e241485 100644
---- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
- # install
- if (LINUX)
-     install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
--        DESTINATION ${IE_CPACK_IE_DIR}/external
-+        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
-         COMPONENT myriad)
- endif()
-diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
-index dfa8ce9d3f..88e7fbf67f 100644
---- a/inference-engine/tests/unit/cpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
-@@ -25,3 +25,5 @@ addIeTargetTest(
- ie_faster_build(${TARGET_NAME}
-     UNITY
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-index 5c38c77b9b..927f93484f 100644
---- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-@@ -26,3 +26,5 @@ addIeTargetTest(
-         LABELS
-             IE
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
-index fcb9f567bb..d4ac1952b8 100644
---- a/inference-engine/tests/unit/vpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
-@@ -33,3 +33,5 @@ addIeTargetTest(
-             VPU
-             MYRIAD
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
-index 6e6f384289..a76ba55e64 100644
---- a/inference-engine/tools/compile_tool/CMakeLists.txt
-+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
-@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- ie_cpack_add_component(core_tools DEPENDS core)
- 
- install(TARGETS compile_tool
--        RUNTIME DESTINATION deployment_tools/tools/compile_tool
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-         COMPONENT core_tools)
- 
- install(FILES README.md
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index 830fb3eb36..3093596e4a 100644
---- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -183,10 +183,10 @@ endif()
- message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
- 
- # Destinations
--set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}")
--set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}")
--set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}")
--set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}")
-+set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}")
-+set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}")
-+set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}")
-+set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}")
- 
- #-----------------------------------------------------------------------------------------------
- # Compile Flags for nGraph...
--- 
-2.32.0
-

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
-

dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.4.2.bb

@@ -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"

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"

dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.4.2.bb

@@ -1,132 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
-HOMEPAGE = "https://github.com/opencv/dldt"
-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/2021/4;lfs=0 \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \
-           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
-           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
-           git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/ngraph/python/pybind11;name=pybind11;branch=master \
-           file://0001-inference-engine-use-system-installed-packages.patch \
-           file://0002-Disable-Werror.patch \
-           file://0003-inference-engine-installation-fixes.patch \
-           file://0001-dont-install-licenses-and-version-file.patch \
-           "
-
-SRCREV = "6c4462759e8974c0ce5b36ad22972a1c6ded76a8"
-SRCREV_mkl = "60f41b3a9988ce7b1bc85c4f1ce7f9443bc91c9d"
-SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
-SRCREV_pybind11 = "3b1dbebabc801c9cf6f0953a4c20b904d444f879"
-
-SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
-SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
-
-LICENSE = "Apache-2.0 & ISSL & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=c441291ac5f15bdc6b09b4cc02ece35b \
-                    file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
-                    file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-"
-LICENSE:${PN}-vpu-firmware = "ISSL"
-
-inherit cmake python3native
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += " \
-                  -DENABLE_OPENCV=0 \
-                  -DENABLE_PLUGIN_RPATH=0 \
-                  -DENABLE_GNA=0 \
-                  -DPYTHON_EXECUTABLE=${PYTHON} \
-                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR}/cmake/TBB \
-                  -DENABLE_SAMPLES=1 \
-                  -DIE_CPACK_IE_DIR=${prefix} \
-                  -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
-                  -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
-                  -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
-                  -DNGRAPH_JSON_ENABLE=FALSE \
-                  -DTREAT_WARNING_AS_ERROR=FALSE \
-                  -DENABLE_SPEECH_DEMO=FALSE \
-                  -DENABLE_DATA=FALSE \
-                  -DUSE_SYSTEM_PUGIXML=TRUE \
-                  "
-
-DEPENDS += "libusb1 \
-            ade \
-            opencv \
-            pugixml \
-            protobuf-native \
-            tbb \
-            zlib \
-            "
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-
-#Disable opencl temporarily. intel-compute-runtime depends on
-#intel-graphics-compiler and vc-intrinsics and these two recipes fail to
-#compile with LLVM13. Enable it after upstream has fixed it.
-#PACKAGECONFIG ?= "vpu opencl"
-PACKAGECONFIG ?= "vpu"
-PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime"
-PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
-PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware"
-PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
-
-do_install:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then
-        install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/
-        install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/
-    fi
-
-    if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-        install -d ${D}${datadir}/inference_engine
-        mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/
-
-        install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-        mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
-        mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
-        mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
-
-        rm -rf ${D}${prefix}/python
-    fi
-
-    rm -rf ${D}${prefix}/deployment_tools
-
-    # Remove the samples source directory. We install the built samples.
-    rm -rf ${D}/usr/samples
-}
-
-# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
-# instead of RSS
-SSTATE_SCAN_FILES:append = " *.cmake"
-
-FILES:${PN}-dev = "${includedir} \
-                   ${libdir}/cmake \
-                   "
-
-FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \
-                ${datadir}/openvino \
-                ${libdir}/custom_kernels \
-                ${libdir}/plugins.xml \
-                ${libdir}/cache.json \
-                "
-
-# Move inference engine samples into a separate package
-PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
-
-FILES:${PN}-samples = "${datadir}/inference_engine \
-                       ${bindir} \
-                       "
-FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd"
-
-# Package for inference engine python API
-PACKAGES =+ "${PN}-${PYTHON_PN}"
-
-FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"

dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.1.bb

@@ -0,0 +1,138 @@
+SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
+HOMEPAGE = "https://github.com/opencv/dldt"
+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/1.1;lfs=0 \
+           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \
+           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \
+           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
+           git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;branch=master \
+           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
+           git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \
+           git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.18.x \
+           git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \
+           git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \
+           git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/1 \
+           file://0001-inference-engine-use-system-installed-packages.patch \
+           file://0002-inference-engine-installation-fixes.patch \
+           "
+
+SRCREV = "39aba80957e10b66a6c8f3f590c2d90e8238ca75"
+SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8"
+SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6"
+SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
+SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b"
+SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea"
+SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c"
+SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1"
+SRCREV_omz = "0c94071faef095f544a228f8455718fbd653950e"
+
+SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
+SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
+
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
+                    file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
+                    file://thirdparty/protobuf/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
+                    file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \
+                    file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \
+                    file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://src/plugins/intel_cpu/thirdparty/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+                    file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \
+"
+
+inherit cmake python3native
+
+S = "${WORKDIR}/git"
+EXTRA_OECMAKE += " \
+                  -DENABLE_OPENCV=OFF \
+                  -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \
+                  -DENABLE_PLUGIN_RPATH=0 \
+                  -DENABLE_INTEL_GNA=OFF \
+                  -DENABLE_SYSTEM_TBB=ON \
+                  -DPYTHON_EXECUTABLE=${PYTHON} \
+                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                  -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
+                  -DENABLE_SAMPLES=ON \
+                  -DTREAT_WARNING_AS_ERROR=FALSE \
+                  -DENABLE_DATA=FALSE \
+                  -DENABLE_SYSTEM_PUGIXML=TRUE \
+                  -DENABLE_SYSTEM_PROTOBUF=TRUE \
+                  -DProtobuf_LIBRARIES=protobuf \
+                  -DProtobuf_LITE_LIBRARIES=protobuf-lite \
+                  -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \
+                  -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \
+                  -DENABLE_OV_ONNX_FRONTEND=FALSE \
+                  -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
+                  "
+
+DEPENDS += "libusb1 \
+            ade \
+            opencv \
+            pugixml \
+            protobuf \
+            protobuf-native \
+            tbb \
+            zlib \
+            "
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+
+PACKAGECONFIG ?= "vpu opencl"
+PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva,"
+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-opencv python3-progress python3-cython"
+PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware"
+PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
+
+do_install:append() {
+    if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
+        install -d ${D}${datadir}/openvino
+        mv ${D}/usr/samples/python ${D}${datadir}/openvino/
+
+        install -d ${D}${PYTHON_SITEPACKAGES_DIR}
+        mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
+        mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/
+
+        rm -rf ${D}${prefix}/python
+    fi
+
+    rm -rf ${D}${prefix}/deployment_tools
+
+    # Remove the samples source directory. We install the built samples.
+    rm -rf ${D}/usr/samples
+}
+
+# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
+# instead of RSS
+SSTATE_SCAN_FILES:append = " *.cmake"
+
+FILES:${PN}-dev = "${includedir} \
+                   ${libdir}/cmake \
+                   "
+
+FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \
+                ${datadir}/openvino \
+                ${libdir}/custom_kernels \
+                ${libdir}/plugins.xml \
+                ${libdir}/cache.json \
+                "
+
+# Move inference engine samples into a separate package
+PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
+
+FILES:${PN}-samples = "${datadir}/openvino \
+                       ${bindir} \
+                       "
+FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd"
+
+# Package for inference engine python API
+PACKAGES =+ "${PN}-${PYTHON_PN}"
+
+FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"

recipes-bsp/metee/metee_3.1.3.bb

@@ -11,7 +11,7 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 inherit cmake
 
 SRC_URI = "git://github.com/intel/metee.git;branch=master;protocol=https"
-SRCREV = "7356c1ba053c71aeada7955cd9c0360b2f0361bc"
+SRCREV = "0d6f19420bebaa92b0e3dcb6b81e352820f1f1cc"
 
 S = "${WORKDIR}/git"
 

recipes-core/microcode/intel-microcode_20230512.bb

@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721"
 SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \
            "
 
-SRCREV = "115c3e4cdad6a9d84bf06e066162c5c546a9d2c3"
+SRCREV = "752cd0a7f09244f9336b7bb6d570e780e502c290"
 
 DEPENDS = "iucode-tool-native"
 S = "${WORKDIR}/git"

recipes-graphics/gmmlib/gmmlib_22.1.2.bb

@@ -10,7 +10,7 @@ SRC_URI = " \
             git://github.com/intel/gmmlib.git;protocol=https;branch=master \
             "
 
-SRCREV = "8dcebfefaaacff0cbc262fe050b2b0fd060898d0"
+SRCREV = "29152fc6d39f87983b176664f225d42af039f716"
 
 S = "${WORKDIR}/git"
 

recipes-graphics/libva/libva-intel-utils_2.14.0.bb

@@ -14,8 +14,8 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.13-branch;protocol=https"
-SRCREV = "7bad184b2cf2ffaf4fb3cc71d4df63d7b142d592"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.14-branch;protocol=https"
+SRCREV = "f478fe4f9b66a19ac7ebc952223025f8771b2aba"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"

recipes-graphics/libva/libva-intel_2.14.0.bb

@@ -18,7 +18,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 
 SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460"
+SRC_URI[sha256sum] = "511e9a74d1ccfb548bc192290603082c11074ac59b17aadfd5d56a3f93e58454"
 
 S = "${WORKDIR}/libva-${PV}"
 

recipes-kernel/intel-ethernet/ixgbe_5.15.2.bb

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db56
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "6a9644299889a973803fb0d84f4cb0ec4e35708bae14bc38b0d441240a152974"
+SRC_URI[sha256sum] = "ca31fa581d6ddabee706b01fc59a5bbb841291fc0a392183adc9a80796eb9d04"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/"
 UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/"

recipes-kernel/intel-ethernet/ixgbevf_4.15.1.bb

@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db56
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "b03010df2c491192dfda489fb6b5a99e83670ac9bc12fc76b1a144ddb2af3f76"
+SRC_URI[sha256sum] = "851f595fe662ac08abe125843aadb1e7c45b3fcd4d6223583a033f84b821832e"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"
 UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/"

recipes-kernel/linux/linux-intel-dev.bb

@@ -6,7 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:"
 SRC_URI = " \
            git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \
-           file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+           file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
           "
 SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg"
 
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.12.0"
-SRCREV_machine ?= "9f4ad9e425a1d3b6a34617b8ea226d56a119a717"
-SRCREV_meta ?= "99570241ac88d6c7e32b6fccd83afce53816b275"
+LINUX_VERSION ?= "5.19.0"
+SRCREV_machine ?= "78859bbf98b359e2bfad06511b73c07d80ca404c"
+SRCREV_meta ?= "275c77754acc9e34656e1589478900a8ad965531"
 
 LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"

recipes-kernel/linux/linux-intel-rt_5.10.bb

@@ -18,9 +18,9 @@ KMETA_BRANCH = "yocto-5.10"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.10.78"
-SRCREV_machine ?= "c287378636ba3f627b4da448d62a75ed41a35982"
-SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
+LINUX_VERSION ?= "5.10.179"
+SRCREV_machine ?= "6f211f0eec79ebd4a63616dd92fe79e50e39b81c"
+SRCREV_meta ?= "bdf41f170f57425ff7ec651a88d787d8554b6f86"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 

recipes-kernel/linux/linux-intel-rt_5.15.bb

@@ -10,20 +10,26 @@ python () {
 }
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
-                   "
+SRC_URI:append = " file://0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+                 "
 
 KBRANCH = "5.15/preempt-rt"
 KMETA_BRANCH = "yocto-5.15"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.15.14"
-SRCREV_machine ?= "15cbc8c3dd31f9d2e406510adcdde381676e455f"
-SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95"
+LINUX_VERSION ?= "5.15.113"
+SRCREV_machine ?= "dd7ff4bdfc1ab8f8f78ef353a4860a3356564852"
+SRCREV_meta ?= "9a54ec8bf036353eded52cd15f9a59c03ff9537e"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 # Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
 # causes config warning too.
 KCONF_AUDIT_LEVEL:core2-32-intel-common = "0"
+
+# We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel
+# https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f
+# It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c.
+# Suppress the harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"

recipes-kernel/linux/linux-intel.inc

@@ -8,6 +8,8 @@ KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;n
 SRC_URI = " \
            git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \
            ${KERNEL_CONFIG_URI} \
+           file://0001-vt-conmakehash-improve-reproducibility.patch \
+           file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \
 	  "
 
 SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg"

recipes-kernel/linux/linux-intel/0001-lib-build_OID_registry-fix-reproducibility-issues.patch

@@ -0,0 +1,48 @@
+From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 10 Jul 2022 22:56:53 -0400
+Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
+
+The script build_OID_registry captures the full path of itself
+in the generated data. This causes reproduciblity issues as the
+path is captured and packaged.
+
+We use the basename of the script instead, and that allows us
+to be reprodicible, with slightly less information captured in
+the output data (but the generating script can still easily
+be found).
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+Upstream-Status: Inappropriate
+
+Taken from linux-yocto, v5.15/standard/base.
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ lib/build_OID_registry | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index d7fc32ea8ac2..f6de0a7f7457 100755
+--- a/lib/build_OID_registry
++++ b/lib/build_OID_registry
+@@ -8,6 +8,7 @@
+ #
+ 
+ use strict;
++use File::Basename;
+ 
+ my @names = ();
+ my @oids = ();
+@@ -35,7 +36,7 @@ close IN_FILE || die;
+ #
+ open C_FILE, ">$ARGV[1]" or die;
+ print C_FILE "/*\n";
+-print C_FILE " * Automatically generated by ", $0, ".  Do not edit\n";
++print C_FILE " * Automatically generated by ", basename $0, ".  Do not edit\n";
+ print C_FILE " */\n";
+ 
+ #
+-- 
+2.36.1
+

recipes-kernel/linux/linux-intel/0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch

@@ -0,0 +1,53 @@
+From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
+
+In some cross build environments such as the Yocto Project build
+environment it provides an ncurses library that is compiled
+differently than the host's version.  This causes display corruption
+problems when the host's curses includes are used instead of the
+includes from the provided compiler are overridden.  There is a second
+case where there is no curses libraries at all on the host system and
+menuconfig will just fail entirely.
+
+The solution is simply to allow an override variable in
+check-lxdialog.sh for environments such as the Yocto Project.  Adding
+a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+compiling and linking against the right headers and libraries.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+cc: Michal Marek <mmarek@suse.cz>
+cc: linux-kbuild@vger.kernel.org
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+
+Upstream-Status: Submitted
+
+Taken from 0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
+Change pkg-config parameter to HOSTPKG_CONFIG parameter
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index c812872d7f9d..42d20819025c 100755
+--- a/scripts/kconfig/mconf-cfg.sh
++++ b/scripts/kconfig/mconf-cfg.sh
+@@ -4,6 +4,14 @@
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
++if [ "$CROSS_CURSES_LIB" != "" ]; then
++       echo libs=\'$CROSS_CURSES_LIB\'
++       if [ x"$CROSS_CURSES_INC" != x ]; then
++               echo cflags=\'$CROSS_CURSES_INC\'
++       fi
++       exit 0
++fi
++
+ if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+ 	if pkg-config --exists $PKG; then
+ 		echo cflags=\"$(pkg-config --cflags $PKG)\"
+-- 
+2.17.1

recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch

@@ -0,0 +1,50 @@
+From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Fri, 12 Aug 2022 13:12:18 +0800
+Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
+
+In some cross build environments such as the Yocto Project build
+environment it provides an ncurses library that is compiled
+differently than the host's version.  This causes display corruption
+problems when the host's curses includes are used instead of the
+includes from the provided compiler are overridden.  There is a second
+case where there is no curses libraries at all on the host system and
+menuconfig will just fail entirely.
+
+The solution is simply to allow an override variable in
+check-lxdialog.sh for environments such as the Yocto Project.  Adding
+a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+compiling and linking against the right headers and libraries.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+cc: Michal Marek <mmarek@suse.cz>
+cc: linux-kbuild@vger.kernel.org
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index 025b565e0b7c..6514d19790e6 100755
+--- a/scripts/kconfig/mconf-cfg.sh
++++ b/scripts/kconfig/mconf-cfg.sh
+@@ -4,6 +4,15 @@
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
++if [ "$CROSS_CURSES_LIB" != "" ]; then
++    echo libs=\'$CROSS_CURSES_LIB\'
++    if [ x"$CROSS_CURSES_INC" != x ]; then
++        echo cflags=\'$CROSS_CURSES_INC\'
++    fi
++    exit 0
++fi
++
++
+ if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+ 	if ${HOSTPKG_CONFIG} --exists $PKG; then
+ 		echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
+-- 
+2.25.1
+

recipes-kernel/linux/linux-intel/0001-vt-conmakehash-improve-reproducibility.patch

@@ -0,0 +1,58 @@
+From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 10 Jul 2022 21:37:07 -0400
+Subject: [PATCH] vt/conmakehash: improve reproducibility
+
+The file generated by conmakehash capture the application
+path used to generate the file. While that can be informative,
+it varies based on where the kernel was built, as the full
+path is captured.
+
+We tweak the application to use a second input as the "capture
+name", and then modify the Makefile to pass the basename of
+the source, making it reproducible.
+
+This could be improved by using some sort of path mapping,
+or the application manipualing argv[1] itself, but for now
+this solves the reprodicibility issue.
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+
+Upstream-Status: Inappropriate 
+
+Taken from linux-yocto, v5.15/standard/base
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ drivers/tty/vt/Makefile      | 2 +-
+ drivers/tty/vt/conmakehash.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
+index fe30ce512819..cb51c21b58f9 100644
+--- a/drivers/tty/vt/Makefile
++++ b/drivers/tty/vt/Makefile
+@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
+ hostprogs += conmakehash
+ 
+ quiet_cmd_conmk = CONMK   $@
+-      cmd_conmk = $(obj)/conmakehash $< > $@
++      cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
+ 
+ $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
+ 	$(call cmd,conmk)
+diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
+index cddd789fe46e..d62510b280e9 100644
+--- a/drivers/tty/vt/conmakehash.c
++++ b/drivers/tty/vt/conmakehash.c
+@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
+ #include <linux/types.h>\n\
+ \n\
+ u8 dfont_unicount[%d] = \n\
+-{\n\t", argv[1], fontlen);
++{\n\t", argv[2], fontlen);
+ 
+   for ( i = 0 ; i < fontlen ; i++ )
+     {
+-- 
+2.36.1
+

recipes-kernel/linux/linux-intel_5.10.bb

@@ -11,9 +11,9 @@ SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurs
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.10.78"
-SRCREV_machine ?= "4e8162d8163c74e46a9f0bafb860f42249702791"
-SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
+LINUX_VERSION ?= "5.10.179"
+SRCREV_machine ?= "a60790fda7b098895a79befe8d7c941712259ba4"
+SRCREV_meta ?= "bdf41f170f57425ff7ec651a88d787d8554b6f86"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"

recipes-kernel/linux/linux-intel_5.15.bb

@@ -4,15 +4,14 @@ KBRANCH = "5.15/linux"
 KMETA_BRANCH = "yocto-5.15"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-SRC_URI:append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+SRC_URI:append = " file://0001-v5.15-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
                    "
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.15.14"
-SRCREV_machine ?= "8d501688407c1334339ae45c4d8e9d4544373cf3"
-SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95"
+LINUX_VERSION ?= "5.15.113"
+SRCREV_machine ?= "eecb5fe10f0776b67f65f6e4af128422a378151e"
+SRCREV_meta ?= "9a54ec8bf036353eded52cd15f9a59c03ff9537e"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"
@@ -24,3 +23,9 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/sec
 # Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
 # causes config warning too.
 KCONF_AUDIT_LEVEL:core2-32-intel-common = "0"
+
+# We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel
+# https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f
+# It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c.
+# Suppress the harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"

recipes-multimedia/libva/files/0001-upstream-ADLN.patch

@@ -1,376 +0,0 @@
-From 647893d233066b3ca79bccb48de4c26867fb9a88 Mon Sep 17 00:00:00 2001
-From: aidan2020sh <dan.ai@intel.com>
-Date: Fri, 24 Dec 2021 15:11:29 +0800
-Subject: [PATCH 1/2] upstream ADLN
-
-this patch is used to upstream new platform ADLN support
-
-This patch was imported from iHD media-driver git server
-(https://github.com/intel/media-driver/commit/348e98e90d240deecd3040f3846a27e9bb6c3ac1)
-
-Upstream-status: Backport
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
----
- .../linux/gen12/ddi/media_libva_caps_g12.cpp  |   6 +
- .../linux/gen12/ddi/media_sku_wa_g12.cpp      |  47 ++++++++
- .../linux/gen12/ddi/media_sysinfo_g12.cpp     |  32 ++++++
- .../media_interfaces_g12_adln.cpp             | 106 ++++++++++++++++++
- .../media_interfaces_g12_adln.h               |  45 ++++++++
- .../media_srcs.cmake                          |  49 ++++++++
- media_driver/media_interface/media_srcs.cmake |   4 +
- 7 files changed, 289 insertions(+)
- create mode 100644 media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.cpp
- create mode 100644 media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.h
- create mode 100644 media_driver/media_interface/media_interfaces_m12_adln/media_srcs.cmake
-
-diff --git a/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp b/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp
-index 1c47cb369..de6273089 100644
---- a/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp
-+++ b/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp
-@@ -2813,3 +2813,9 @@ static bool adlpRegistered = MediaLibvaCapsFactory<MediaLibvaCaps, DDI_MEDIA_CON
-     RegisterCaps<MediaLibvaCapsG12>((uint32_t)IGFX_ALDERLAKE_P);
- #endif
- 
-+#ifdef IGFX_GEN12_ADLN_SUPPORTED
-+static bool adlnRegistered = MediaLibvaCapsFactory<MediaLibvaCaps, DDI_MEDIA_CONTEXT>::
-+    RegisterCaps<MediaLibvaCapsG12>((uint32_t)IGFX_ALDERLAKE_N);
-+#endif
-+
-+
-diff --git a/media_driver/linux/gen12/ddi/media_sku_wa_g12.cpp b/media_driver/linux/gen12/ddi/media_sku_wa_g12.cpp
-index 88e03705e..8155d885d 100644
---- a/media_driver/linux/gen12/ddi/media_sku_wa_g12.cpp
-+++ b/media_driver/linux/gen12/ddi/media_sku_wa_g12.cpp
-@@ -587,6 +587,53 @@ static bool adlpDeviceRegister = DeviceInfoFactory<LinuxDeviceInit>::
- 
- #endif
- 
-+#ifdef IGFX_GEN12_ADLN_SUPPORTED
-+static bool InitAdlnMediaSku(struct GfxDeviceInfo *devInfo,
-+    MediaFeatureTable *                            skuTable,
-+    struct LinuxDriverInfo *                       drvInfo)
-+{
-+    if (!InitTglMediaSku(devInfo, skuTable, drvInfo))
-+    {
-+        return false;
-+    }
-+
-+    if (devInfo->eGTType == GTTYPE_GT0_5)
-+    {
-+        MEDIA_WR_SKU(skuTable, FtrGT0_5, 1);
-+    }
-+
-+    MEDIA_WR_SKU(skuTable, FtrAV1VLDLSTDecoding, 1);
-+    MEDIA_WR_SKU(skuTable, FtrGucSubmission, 1);
-+
-+    return true;
-+}
-+
-+static bool InitAdlnMediaWa(struct GfxDeviceInfo *devInfo,
-+    MediaWaTable *                                waTable,
-+    struct LinuxDriverInfo *                      drvInfo)
-+{
-+    if (!InitTglMediaWa(devInfo, waTable, drvInfo))
-+    {
-+        return false;
-+    }
-+
-+    //ADL-N keeps below setting same as ADL-S/ADL-P
-+    MEDIA_WR_WA(waTable, Wa_1409820462, 0);
-+
-+    return true;
-+}
-+
-+static struct LinuxDeviceInit adlnDeviceInit =
-+    {
-+        .productFamily    = IGFX_ALDERLAKE_N,
-+        .InitMediaFeature = InitAdlnMediaSku,
-+        .InitMediaWa      = InitAdlnMediaWa,
-+};
-+
-+static bool adlnDeviceRegister = DeviceInfoFactory<LinuxDeviceInit>::
-+    RegisterDevice(IGFX_ALDERLAKE_N, &adlnDeviceInit);
-+
-+#endif
- 
- static struct LinuxDeviceInit tgllpDeviceInit =
- {
-diff --git a/media_driver/linux/gen12/ddi/media_sysinfo_g12.cpp b/media_driver/linux/gen12/ddi/media_sysinfo_g12.cpp
-index b3c402191..f68fe6665 100644
---- a/media_driver/linux/gen12/ddi/media_sysinfo_g12.cpp
-+++ b/media_driver/linux/gen12/ddi/media_sysinfo_g12.cpp
-@@ -460,6 +460,38 @@ static bool adlpGt2Device4626 = DeviceInfoFactory<GfxDeviceInfo>::
- 
- #endif
- 
-+#ifdef IGFX_GEN12_ADLN_SUPPORTED
-+static struct GfxDeviceInfo adlnGt1Info = {
-+    .platformType     = PLATFORM_MOBILE,
-+    .productFamily    = IGFX_ALDERLAKE_N,
-+    .displayFamily    = IGFX_GEN12_CORE,
-+    .renderFamily     = IGFX_GEN12_CORE,
-+    .eGTType          = GTTYPE_GT1,
-+    .L3CacheSizeInKb  = 0,
-+    .L3BankCount      = 8,
-+    .EUCount          = 0,
-+    .SliceCount       = 0,
-+    .SubSliceCount    = 0,
-+    .MaxEuPerSubSlice = 0,
-+    .isLCIA           = 0,
-+    .hasLLC           = 0,
-+    .hasERAM          = 0,
-+    .InitMediaSysInfo = InitTglMediaSysInfo,
-+    .InitShadowSku    = InitTglShadowSku,
-+    .InitShadowWa     = InitTglShadowWa,
-+};
-+
-+static bool adlnGt1Device46D0 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x46D0, &adlnGt1Info);
-+
-+static bool adlnGt1Device46D1 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x46D1, &adlnGt1Info);
-+
-+static bool adlnGt1Device46D2 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x46D2, &adlnGt1Info);
-+#endif 
-+
-+
- static bool tgllpGt2Device9a40 = DeviceInfoFactory<GfxDeviceInfo>::
-     RegisterDevice(0x9A40, &tgllpGt2Info);
- 
-diff --git a/media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.cpp b/media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.cpp
-new file mode 100644
-index 000000000..089c8a51c
---- /dev/null
-+++ b/media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.cpp
-@@ -0,0 +1,106 @@
-+/*
-+* Copyright (c) 2011-2022, Intel Corporation
-+*
-+* Permission is hereby granted, free of charge, to any person obtaining a
-+* copy of this software and associated documentation files (the "Software"),
-+* to deal in the Software without restriction, including without limitation
-+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+* and/or sell copies of the Software, and to permit persons to whom the
-+* Software is furnished to do so, subject to the following conditions:
-+*
-+* The above copyright notice and this permission notice shall be included
-+* in all copies or substantial portions of the Software.
-+*
-+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+* OTHER DEALINGS IN THE SOFTWARE.
-+*/
-+
-+//!
-+//! \file     media_interfaces_g12_adln.cpp
-+
-+//! \brief    Helps with Gen12 ADL-N factory creation.
-+//!
-+
-+#include "media_interfaces_g12_adln.h"
-+
-+extern template class MediaInterfacesFactory<MhwInterfaces>;
-+extern template class MediaInterfacesFactory<MmdDevice>;
-+extern template class MediaInterfacesFactory<MosUtilDevice>;
-+extern template class MediaInterfacesFactory<CodechalDevice>;
-+extern template class MediaInterfacesFactory<CMHalDevice>;
-+extern template class MediaInterfacesFactory<VphalDevice>;
-+extern template class MediaInterfacesFactory<RenderHalDevice>;
-+extern template class MediaInterfacesFactory<Nv12ToP010Device>;
-+extern template class MediaInterfacesFactory<DecodeHistogramDevice>;
-+
-+static bool adlnRegisteredVphal =
-+MediaInterfacesFactory<VphalDevice>::
-+RegisterHal<VphalInterfacesG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+static bool adlnRegisteredMhw =
-+    MediaInterfacesFactory<MhwInterfaces>::
-+    RegisterHal<MhwInterfacesG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+#ifdef _MMC_SUPPORTED
-+static bool adlnRegisteredMmd =
-+    MediaInterfacesFactory<MmdDevice>::
-+    RegisterHal<MmdDeviceG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+#endif
-+
-+#define PLATFORM_INTEL_ADLN   24
-+#define GENX_TGLLP            12
-+
-+static bool adlnRegisteredNv12ToP010 =
-+    MediaInterfacesFactory<Nv12ToP010Device>::
-+    RegisterHal<Nv12ToP010DeviceG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+static bool adlnRegisteredCodecHal =
-+    MediaInterfacesFactory<CodechalDevice>::
-+    RegisterHal<CodechalInterfacesG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+static bool adlnRegisteredCMHal =
-+    MediaInterfacesFactory<CMHalDevice>::
-+    RegisterHal<CMHalInterfacesG12Adln>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+
-+MOS_STATUS CMHalInterfacesG12Adln::Initialize(CM_HAL_STATE *pCmState)
-+{
-+    if (pCmState == nullptr)
-+    {
-+        MHW_ASSERTMESSAGE("pCmState is nullptr.")
-+        return MOS_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    m_cmhalDevice = MOS_New(CMHal, pCmState);
-+    if (m_cmhalDevice == nullptr)
-+    {
-+        MHW_ASSERTMESSAGE("Create CM Hal interfaces failed.")
-+        return MOS_STATUS_NO_SPACE;
-+    }
-+
-+    m_cmhalDevice->SetGenPlatformInfo(PLATFORM_INTEL_ADLN, PLATFORM_INTEL_GT1, "TGLLP");
-+    uint32_t cisaIDs[] = { GENX_TGLLP };
-+    m_cmhalDevice->AddSupportedCisaIDs(cisaIDs, sizeof(cisaIDs)/sizeof(uint32_t));
-+    m_cmhalDevice->m_l3Plane = TGL_L3_PLANE;
-+    m_cmhalDevice->m_l3ConfigCount = TGL_L3_CONFIG_NUM;
-+    return MOS_STATUS_SUCCESS;
-+}
-+
-+static bool adlnRegisteredMosUtil =
-+    MediaInterfacesFactory<MosUtilDevice>::
-+    RegisterHal<MosUtilDeviceG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+
-+static bool adlnRegisteredRenderHal =
-+    MediaInterfacesFactory<RenderHalDevice>::
-+    RegisterHal<RenderHalInterfacesG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-+static bool adlnRegisteredDecodeHistogram =
-+    MediaInterfacesFactory<DecodeHistogramDevice>::
-+    RegisterHal<DecodeHistogramDeviceG12Tgllp>((uint32_t)IGFX_ALDERLAKE_N);
-+
-diff --git a/media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.h b/media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.h
-new file mode 100644
-index 000000000..a1f9c0d40
---- /dev/null
-+++ b/media_driver/media_interface/media_interfaces_m12_adln/media_interfaces_g12_adln.h
-@@ -0,0 +1,45 @@
-+/*
-+* Copyright (c) 2011-2022, Intel Corporation
-+*
-+* Permission is hereby granted, free of charge, to any person obtaining a
-+* copy of this software and associated documentation files (the "Software"),
-+* to deal in the Software without restriction, including without limitation
-+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+* and/or sell copies of the Software, and to permit persons to whom the
-+* Software is furnished to do so, subject to the following conditions:
-+*
-+* The above copyright notice and this permission notice shall be included
-+* in all copies or substantial portions of the Software.
-+*
-+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+* OTHER DEALINGS IN THE SOFTWARE.
-+*/
-+
-+//!
-+//! \file     media_interfaces_gen12_adln.h
-+//! \brief    All interfaces used for Gen12 ADL-N that require factory creation
-+//!
-+
-+#ifndef __MEDIA_INTERFACES_G12_adln_H__
-+#define __MEDIA_INTERFACES_G12_adln_H__
-+
-+
-+#include "media_interfaces_g12_tgllp.h"
-+#include "renderhal_g12_base.h"
-+
-+
-+class CMHalInterfacesG12Adln : public CMHalDevice
-+{
-+protected:
-+    using CMHal = CM_HAL_G12_X;
-+    MOS_STATUS Initialize(
-+        CM_HAL_STATE *pCmState);
-+};
-+
-+#endif // __MEDIA_INTERFACES_G12_adln_H__
-+
-diff --git a/media_driver/media_interface/media_interfaces_m12_adln/media_srcs.cmake b/media_driver/media_interface/media_interfaces_m12_adln/media_srcs.cmake
-new file mode 100644
-index 000000000..834c2298a
---- /dev/null
-+++ b/media_driver/media_interface/media_interfaces_m12_adln/media_srcs.cmake
-@@ -0,0 +1,49 @@
-+# Copyright (c) 2022, Intel Corporation
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included
-+# in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+# OTHER DEALINGS IN THE SOFTWARE.
-+
-+set(TMP_SOURCES_
-+    ${CMAKE_CURRENT_LIST_DIR}/media_interfaces_g12_adln.cpp
-+)
-+
-+set(TMP_HEADERS_
-+    ${CMAKE_CURRENT_LIST_DIR}/media_interfaces_g12_adln.h
-+)
-+
-+set(SOURCES_
-+    ${SOURCES_}
-+    ${TMP_SOURCES_}
-+)
-+
-+set(HEADERS_
-+    ${HEADERS_}
-+    ${TMP_HEADERS_}
-+)
-+
-+set(COMMON_SOURCES_
-+    ${COMMON_SOURCES_}
-+    ${TMP_SOURCES_}
-+)
-+
-+set(COMMON_HEADERS_
-+    ${COMMON_HEADERS_}
-+    ${TMP_HEADERS_}
-+)
-+
-+media_add_curr_to_include_path()
-diff --git a/media_driver/media_interface/media_srcs.cmake b/media_driver/media_interface/media_srcs.cmake
-index e4cb114d8..dfa7aa3f1 100644
---- a/media_driver/media_interface/media_srcs.cmake
-+++ b/media_driver/media_interface/media_srcs.cmake
-@@ -75,6 +75,10 @@ if(GEN12_ADLP)
-     media_include_subdirectory(media_interfaces_m12_adlp)
- endif()
- 
-+if(GEN12_ADLN)
-+    media_include_subdirectory(media_interfaces_m12_adln)
-+endif()
-+
- if(XEHP_SDV)
-     media_include_subdirectory(media_interfaces_xehp_sdv)
- endif()
--- 
-2.34.1
-

recipes-multimedia/libva/files/0002-Add-support-for-ADL-N-Enable-the-cmake-options.patch

@@ -1,44 +0,0 @@
-From a31f63721adbc39a96d75ba170669afd2e53c948 Mon Sep 17 00:00:00 2001
-From: Sudarshan S <sudarshan.s@intel.com>
-Date: Wed, 19 Jan 2022 16:06:10 +0530
-Subject: [PATCH 2/2] Add support for ADL-N: Enable the cmake options
-
-This patch was imported from iHD media-driver git server
-(https://github.com/intel/media-driver.git) as of pull request
-https://github.com/intel/media-driver/pull/1327
-
-Upstream status: submitted
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
----
- media_driver/cmake/linux/media_gen_flags_linux.cmake | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/media_driver/cmake/linux/media_gen_flags_linux.cmake b/media_driver/cmake/linux/media_gen_flags_linux.cmake
-index 936b09309..b8f256288 100644
---- a/media_driver/cmake/linux/media_gen_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_gen_flags_linux.cmake
-@@ -81,6 +81,10 @@ cmake_dependent_option(GEN12_ADLP
-     "Enabled ADLP support (Gen12)" ON
-     "GEN12_TGLLP" OFF)
- 
-+cmake_dependent_option(GEN12_ADLN
-+    "Enabled ADLN support (Gen12)" ON
-+    "GEN12_TGLLP" OFF)
-+
- cmake_dependent_option(Xe_M
-     "Enabled support for Xehp_sdv+ platforms" ON
-     "ENABLE_PRODUCTION_KMD" OFF)
-@@ -184,6 +188,10 @@ if(GEN12_ADLP)
-     add_definitions(-DIGFX_GEN12_ADLP_SUPPORTED)
- endif()
- 
-+if(GEN12_ADLN)
-+    add_definitions(-DIGFX_GEN12_ADLN_SUPPORTED)
-+endif()
-+
- if(DG2)
-     add_definitions(-DIGFX_DG2_SUPPORTED)
-     add_definitions(-DIGFX_DG2_CMFCPATCH_SUPPORTED)
--- 
-2.34.1
-

recipes-multimedia/libva/files/c8457540aed1ab9424661087276fb788c0e3aabb.patch

@@ -0,0 +1,109 @@
+From c8457540aed1ab9424661087276fb788c0e3aabb Mon Sep 17 00:00:00 2001
+From: "Wang, Pingli" <pingli.wang@intel.com>
+Date: Wed, 23 Mar 2022 20:14:04 +0800
+Subject: [PATCH] Fixes #1354
+
+Fixes #1354. It is to fix the compiling issue for gcc12.0.1.
+[-Werror=address] [-Werror=dangling-pointer=][-Werror=alloc-size-larger-than=]
+
+Signed-off-by: Wang, Pingli <pingli.wang@intel.com>
+
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ .../agnostic/common/os/mos_utilities.h        |  4 +--
+ .../codec/hal/codechal_encoder_base.cpp       |  2 +-
+ .../common/codec/ddi/media_ddi_decode_vp8.cpp | 25 ++++++++-----------
+ .../agnostic/common/os/mos_utilities_next.h   |  4 +--
+ 4 files changed, 16 insertions(+), 19 deletions(-)
+
+diff --git a/media_common/agnostic/common/os/mos_utilities.h b/media_common/agnostic/common/os/mos_utilities.h
+index 7c395816f..d41a3a065 100644
+--- a/media_common/agnostic/common/os/mos_utilities.h
++++ b/media_common/agnostic/common/os/mos_utilities.h
+@@ -181,10 +181,10 @@ _Ty* MOS_NewUtil(_Types&&... _Args)
+ template<class _Ty, class... _Types>
+ _Ty *MOS_NewArrayUtil(const char *functionName,
+     const char *filename,
+-    int32_t line, int32_t numElements)
++    int32_t line, size_t numElements)
+ #else
+ template<class _Ty, class... _Types>
+-_Ty* MOS_NewArrayUtil(int32_t numElements)
++_Ty* MOS_NewArrayUtil(size_t numElements)
+ #endif
+ {
+ #if MOS_MESSAGES_ENABLED
+diff --git a/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp b/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp
+index 4bf869c60..e9b3575fd 100644
+--- a/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp
++++ b/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp
+@@ -3891,6 +3891,7 @@ MOS_STATUS CodechalEncoderState::ReadCounterValue(uint16_t index, EncodeStatusRe
+     CODECHAL_ENCODE_FUNCTION_ENTER;
+     CODECHAL_ENCODE_CHK_NULL_RETURN(encodeStatusReport);
+     uint64_t *address2Counter = nullptr;
++    uint32_t ctr[4] = { 0 };
+ 
+     if (m_hwInterface->GetCpInterface()->IsHwCounterIncrement(m_osInterface))
+     {
+@@ -3923,7 +3924,6 @@ MOS_STATUS CodechalEncoderState::ReadCounterValue(uint16_t index, EncodeStatusRe
+     else
+     {
+         //Report driver generated counter which was submitted to HW by command
+-        uint32_t ctr[4] = { 0 };
+         eStatus = m_hwInterface->GetCpInterface()->GetCounterValue(ctr);
+         if (MOS_STATUS_SUCCESS == eStatus)
+         {
+diff --git a/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp b/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp
+index 72891d584..fac4c415d 100644
+--- a/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp
++++ b/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp
+@@ -235,20 +235,17 @@ VAStatus DdiDecodeVP8::ParsePicParams(
+     codecPicParams->ucUvModeProbs[0]            = picParam->uv_mode_probs[0];
+     codecPicParams->ucUvModeProbs[1]            = picParam->uv_mode_probs[1];
+     codecPicParams->ucUvModeProbs[2]            = picParam->uv_mode_probs[2];
+-    if (codecPicParams->ucMvUpdateProb[0] && picParam->mv_probs[0])
+-    {
+-        MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[0],
+-            sizeof(codecPicParams->ucMvUpdateProb[0]),
+-            picParam->mv_probs[0],
+-            sizeof(codecPicParams->ucMvUpdateProb[0]));
+-    }
+-    if (codecPicParams->ucMvUpdateProb[1] && picParam->mv_probs[1])
+-    {
+-        MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[1],
+-            sizeof(codecPicParams->ucMvUpdateProb[1]),
+-            picParam->mv_probs[1],
+-            sizeof(codecPicParams->ucMvUpdateProb[1]));
+-    }
++
++    MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[0],
++        sizeof(codecPicParams->ucMvUpdateProb[0]),
++        picParam->mv_probs[0],
++        sizeof(codecPicParams->ucMvUpdateProb[0]));
++
++    MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[1],
++        sizeof(codecPicParams->ucMvUpdateProb[1]),
++        picParam->mv_probs[1],
++        sizeof(codecPicParams->ucMvUpdateProb[1]));
++
+     codecPicParams->ucP0EntropyCount = (8 - picParam->bool_coder_ctx.count) & 0x7;  //hardware needs used bits not remaining bits in bool decoder
+     codecPicParams->ucP0EntropyValue = picParam->bool_coder_ctx.value;
+     codecPicParams->uiP0EntropyRange = picParam->bool_coder_ctx.range;
+diff --git a/media_softlet/agnostic/common/os/mos_utilities_next.h b/media_softlet/agnostic/common/os/mos_utilities_next.h
+index 509f2de3d..b6069bbc8 100644
+--- a/media_softlet/agnostic/common/os/mos_utilities_next.h
++++ b/media_softlet/agnostic/common/os/mos_utilities_next.h
+@@ -90,10 +90,10 @@ class MosUtilities
+     template<class _Ty, class... _Types>
+     static _Ty *MosNewArrayUtil(const char *functionName,
+         const char *filename,
+-        int32_t line, int32_t numElements)
++        int32_t line, size_t numElements)
+ #else
+     template<class _Ty, class... _Types>
+-    static _Ty* MosNewArrayUtil(int32_t numElements)
++    static _Ty* MosNewArrayUtil(size_t numElements)
+ #endif
+     {
+ #if (_DEBUG || _RELEASE_INTERNAL)

recipes-multimedia/libva/intel-media-driver_22.3.1.bb

@@ -19,11 +19,10 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 DEPENDS += "libva gmmlib"
 
 SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
-           file://0001-upstream-ADLN.patch \
-           file://0002-Add-support-for-ADL-N-Enable-the-cmake-options.patch \
+           file://c8457540aed1ab9424661087276fb788c0e3aabb.patch \
           "
 
-SRCREV = "31c1b995f49ef118a4b02f0b8e45bccdacf0d15e"
+SRCREV = "6547f46584633a7619440b39b34908e13c8c857d"
 S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST:x86-x32 = "null"

recipes-multimedia/libyami/libyami-utils/0001-Fix-build-with-clang.patch

@@ -1,96 +0,0 @@
-From f2e6d2ecfea635ab952649156e31ca893d4b1a47 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 12 Aug 2017 08:49:20 -0700
-Subject: [PATCH] Fix build with clang
-
-Fix errors e.g.
-error: comparison of constant -1 with expression of type 'char' is always true [-Werror,-Wtautological-constant-out-of-range-compare]error: comparison of constant -1 with expression of type 'char' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
-
-and
-
-psnr.cpp:225:17: error: bool literal returned from 'main' [-Werror,-Wmain]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
----
- tests/decodehelp.cpp    | 2 +-
- tests/encodehelp.h      | 2 +-
- tests/vpp.cpp           | 2 +-
- tests/yamitranscode.cpp | 2 +-
- testscripts/psnr.cpp    | 4 ++--
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tests/decodehelp.cpp b/tests/decodehelp.cpp
-index b27b977..62cca63 100644
---- a/tests/decodehelp.cpp
-+++ b/tests/decodehelp.cpp
-@@ -81,7 +81,7 @@ bool processCmdLine(int argc, char** argv, DecodeParameter* parameters)
-         { NULL, no_argument, NULL, 0 }
-     };
- 
--    char opt;
-+    int opt;
-     while ((opt = getopt_long_only(argc, argv, "h:m:n:i:f:o:w:?", long_opts,&option_index)) != -1){
-         switch (opt) {
-         case 'h':
-diff --git a/tests/encodehelp.h b/tests/encodehelp.h
-index 63580a4..651ec08 100644
---- a/tests/encodehelp.h
-+++ b/tests/encodehelp.h
-@@ -109,7 +109,7 @@ static VideoRateControl string_to_rc_mode(char *str)
- 
- static bool process_cmdline(int argc, char *argv[])
- {
--    char opt;
-+    int opt;
-     const struct option long_opts[] = {
-         { "help", no_argument, NULL, 'h' },
-         { "qp", required_argument, NULL, 0 },
-diff --git a/tests/vpp.cpp b/tests/vpp.cpp
-index 5a60c0a..52da43b 100644
---- a/tests/vpp.cpp
-+++ b/tests/vpp.cpp
-@@ -151,7 +151,7 @@ public:
- private:
-     bool processCmdLine(int argc, char* argv[])
-     {
--        char opt;
-+        int opt;
-         const struct option long_opts[] = {
-             { "help", no_argument, NULL, 'h' },
-             { "sharpening", required_argument, NULL, 's' },
-diff --git a/tests/yamitranscode.cpp b/tests/yamitranscode.cpp
-index 6207209..00164ce 100755
---- a/tests/yamitranscode.cpp
-+++ b/tests/yamitranscode.cpp
-@@ -100,7 +100,7 @@ static VideoRateControl string_to_rc_mode(char *str)
- 
- static bool processCmdLine(int argc, char *argv[], TranscodeParams& para)
- {
--    char opt;
-+    int opt;
-     const struct option long_opts[] = {
-         { "help", no_argument, NULL, 'h' },
-         { "qp", required_argument, NULL, 0 },
-diff --git a/testscripts/psnr.cpp b/testscripts/psnr.cpp
-index 5cc24c9..68bd668 100644
---- a/testscripts/psnr.cpp
-+++ b/testscripts/psnr.cpp
-@@ -215,14 +215,14 @@ int main(int argc, char *argv[])
-     const char* psnrresult = "average_psnr.txt";
-     int width=0,height=0;
-     int standardpsnr = NORMAL_PSNR;
--    char opt;
-+    int opt;
-     while ((opt = getopt(argc, argv, "h:W:H:i:o:s:?")) != -1)
-     {
-         switch (opt) {
-             case 'h':
-             case '?':
-                 print_help(argv[0]);
--                return false;
-+                return -1;
-             case 'i':
-                 filename1 = optarg;
-                 break;

recipes-multimedia/libyami/libyami-utils_1.3.2.bb

@@ -1,26 +0,0 @@
-SUMMARY = "Applications and Scripts for libyami."
-DESCRIPTION = "Applications and Scripts for libyami."
-
-HOMEPAGE = "https://github.com/intel/libyami-utils"
-BUGTRACKER = "https://github.com/intel/libyami-utils/issues/new"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SRC_URI = "git://github.com/intel/libyami-utils.git;branch=master;protocol=https \
-           file://0001-Fix-build-with-clang.patch \
-           "
-SRCREV = "c3d25b64b05aeb0c4eecc140aef617cfeced6b8e"
-S = "${WORKDIR}/git"
-
-DEPENDS = "libva libyami"
-
-inherit autotools pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-
-# --enable-x11 needs libva-x11
-# gles-tests fail to build without x11: see https://github.com/intel/libyami-utils/issues/91
-PACKAGECONFIG[x11] = "--enable-x11 --enable-egl,--disable-x11 --disable-egl, virtual/libx11"

recipes-multimedia/libyami/libyami_1.3.2.bb

@@ -1,24 +0,0 @@
-SUMMARY = "Yami is media infrastructure base on libva"
-DESCRIPTION = "Yet Another Media Infrastructure \
-light weight hardware codec library base on VA-API "
-
-HOMEPAGE = "https://github.com/intel/libyami"
-BUGTRACKER = "https://github.com/intel/libyami/issues/new"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://github.com/intel/libyami.git;branch=apache;protocol=https \
-"
-SRCREV = "08606d0a43e0ef15e5b61cc13563169370ce8715"
-S = "${WORKDIR}/git"
-
-CXXFLAGS:append = " -Wno-error"
-
-PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}"
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender"
-
-DEPENDS = "libva"
-inherit autotools pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"

recipes-multimedia/mediasdk/intel-mediasdk_22.3.0.bb

@@ -35,7 +35,7 @@ SRC_URI = "git://github.com/Intel-Media-SDK/MediaSDK.git;protocol=https;nobranch
            file://0001-FindITT.cmake-fix-detection-of-header-library.patch \
            "
 
-SRCREV = "0db73aa1b2dec5b61900ee54db3fa574de6d1752"
+SRCREV = "f577d724de6cf8d040a113d337d4433b0f7478e2"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^intel-mediasdk-(?P<pver>(\d+(\.\d+)+))$"

recipes-multimedia/onevpl/onevpl-intel-gpu/0001-HEVCe-lib-Fix-REXT-DDIID-issue-2566.patch

@@ -0,0 +1,31 @@
+From aad7c533f3d34a1ce6a4c65c4631077e1ee3502f Mon Sep 17 00:00:00 2001
+From: gfxVPLsdm <gfxvplsdm@intel.com>
+Date: Fri, 8 Apr 2022 20:31:35 +0800
+Subject: [PATCH] [HEVCe/lib] Fix REXT DDIID issue (#2566)
+
+Fixed REXT DDIID issue by adding missing reference symbol of PickDDIIDREXT function interface
+
+Upstream-Status: Backport
+
+Co-authored-by: Lightny Gong <lightny.gong@intel.com>
+Signed-off-by: Teng, Jin Chung <jin.chung.teng@intel.com>
+---
+ _studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_lin.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_lin.cpp b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_lin.cpp
+index 1d4c7ce..eb3ae50 100644
+--- a/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_lin.cpp
++++ b/_studio/mfx_lib/encode_hw/hevc/linux/base/hevcehw_base_va_lin.cpp
+@@ -108,7 +108,7 @@ mfxStatus PickDDIIDNormal(VAID*& DDIID, Defaults::Param defPar, const mfxVideoPa
+     return MFX_ERR_NONE;
+ }
+ 
+-mfxStatus PickDDIIDREXT(VAID* DDIID, const mfxVideoParam& par)
++mfxStatus PickDDIIDREXT(VAID* &DDIID, const mfxVideoParam& par)
+ {
+     auto& fi = par.mfx.FrameInfo;
+     const mfxExtCodingOption3* pCO3 = ExtBuffer::Get(par);
+-- 
+2.7.4
+

recipes-multimedia/onevpl/onevpl-intel-gpu/fix-gcc11-2-error.patch

@@ -1,27 +0,0 @@
-From 34a7b0803102c5a6d669efe617ff29623ef12a63 Mon Sep 17 00:00:00 2001
-From: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
-Date: Wed, 9 Feb 2022 16:35:46 -0800
-Subject: [PATCH] build: fix build with gcc-11
-
-Fixes: oneapi-src/oneVPL-intel-gpu#196
-
-Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
-
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- _studio/shared/mfx_logging/include/mfx_utils_logging.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/_studio/shared/mfx_logging/include/mfx_utils_logging.h b/_studio/shared/mfx_logging/include/mfx_utils_logging.h
-index e48928b3f..af6af8d2e 100644
---- a/_studio/shared/mfx_logging/include/mfx_utils_logging.h
-+++ b/_studio/shared/mfx_logging/include/mfx_utils_logging.h
-@@ -25,6 +25,7 @@
- 
- #include <iostream>
- #include <thread>
-+#include <memory>
- #include <mutex>
- #include <string>
- #include <map>

recipes-multimedia/onevpl/onevpl-intel-gpu_22.3.2.bb

@@ -16,11 +16,15 @@ COMPATIBLE_HOST:x86-x32 = "null"
 
 DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native"
 
-SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;branch=main;lfs=0 \
-           file://fix-gcc11-2-error.patch \
+SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;branch=intel-onevpl-22.3;lfs=0 \
+           file://0001-HEVCe-lib-Fix-REXT-DDIID-issue-2566.patch \
             "
 
-SRCREV = "6676f7652249bb20ad51d229012f8a6ef26f67b0"
+SRCREV = "0f7e5f41160bb5a48e24f7cec2ced1ef9dd9c5be"
 S = "${WORKDIR}/git"
 
+FILES:${PN} += " \
+                ${libdir}/libmfx-gen/enctools.so \
+               "
+
 inherit cmake

recipes-multimedia/onevpl/onevpl_2022.0.3.bb

@@ -32,14 +32,13 @@ do_install:append() {
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
 
-PACKAGES += "${PN}-examples"
+PACKAGES =+ "${PN}-examples"
 
-FILES:${PN}-examples = "${datadir}/oneVPL/examples \
+FILES:${PN}-examples = "${datadir}/oneVPL \
                        "
 
 FILES_SOLIBSDEV = ""
 FILES:${PN}-dev += "${libdir}/libvpl.so"
 
-FILES:${PN} += "${datadir} \
-                ${libdir}/oneVPL/libvpl_wayland.so \
+FILES:${PN} += " ${libdir}/oneVPL/libvpl_wayland.so \
                 "

recipes-oneapi/crypto/intel-crypto-mb_git.bb

@@ -9,13 +9,14 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://../../../LICENSE;md5=e787af283468feca985d6b865d27d95b"
 
 SRC_URI = " \
-            git://github.com/intel/ipp-crypto;protocol=https;branch=ipp-crypto_2021_5 \
+            git://github.com/intel/ipp-crypto;protocol=https;branch=develop \
             file://0001-CMakeLists.txt-exclude-host-system-headers.patch;striplevel=4 \
             file://0002-cmake-exclude-Yocto-build-flags.patch;striplevel=4 \
             "
-SRCREV = "2b8c5c82c87e3fe37f132f632557367d9bc8a69b"
+SRCREV = "46944bd18e6dbad491ef9b9a3404303ef7680c09"
 
 S = "${WORKDIR}/git/sources/ippcp/crypto_mb"
+PV = "2021.5+git${SRCPV}"
 
 DEPENDS = "openssl"
 

recipes-oneapi/onedpl/onedpl_2021.7.bb

@@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://licensing/LICENSE.txt;md5=2e982d844baa4df1c80de75470e
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://github.com/oneapi-src/oneDPL.git;protocol=https;branch=release/2021.6 \
+SRC_URI = "git://github.com/oneapi-src/oneDPL.git;protocol=https;branch=release/2021.7 \
             "
-SRCREV = "bfa2cd2fc07ea105a07d4772276e8c15f7530cd4"
+SRCREV = "df96969b76f075bd9ce14c303659595c747c7223"
 
 do_compile[noexec] = "1"
 do_configure[noexec] = "1"