aboutsummaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch86
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch45
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch256
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch33
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch215
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch45
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch23
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch52
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch126
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb61
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb54
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb124
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb146
14 files changed, 383 insertions, 913 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
new file mode 100644
index 00000000..7f5b46c6
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -0,0 +1,86 @@
+From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:42:57 +0530
+Subject: [PATCH] cmake: yocto specific tweaks to the build process
+
+* Dont try to detect glibc version as that doesn't work when cross compiling.
+* Dont try to detect CXX11_ABI
+* Install sample binaries as well.
+* Dont try to write triggers for CPack. We package ourselves.
+* Fix the installation path for Python modules when baselib = lib64.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
+ cmake/developer_package/target_flags.cmake | 4 ++--
+ samples/cpp/CMakeLists.txt | 6 +++---
+ src/bindings/python/CMakeLists.txt | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
+index 99f11730983..1a1f61fcd3d 100644
+--- a/cmake/developer_package/packaging/rpm/rpm.cmake
++++ b/cmake/developer_package/packaging/rpm/rpm.cmake
+@@ -156,7 +156,7 @@ ov_rpm_specific_settings()
+ # needed to add triggers for packages with libraries
+ set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
+ set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
+-file(WRITE "${def_triggers}" "${triggers_content}")
++#file(WRITE "${def_triggers}" "${triggers_content}")
+
+ #
+ # Functions helpful for packaging your modules with RPM cpack
+diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
+index d047a1aebd9..4e8ca68c60f 100644
+--- a/cmake/developer_package/target_flags.cmake
++++ b/cmake/developer_package/target_flags.cmake
+@@ -149,7 +149,7 @@ function(ov_glibc_version)
+ endif()
+ endfunction()
+
+-ov_glibc_version()
++#ov_glibc_version()
+
+ #
+ # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler
+@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi)
+ endif()
+ endmacro()
+
+-ov_get_glibcxx_use_cxx11_abi()
++#ov_get_glibcxx_use_cxx11_abi()
+diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
+index 4d33bff944e..3e7f1458578 100644
+--- a/samples/cpp/CMakeLists.txt
++++ b/samples/cpp/CMakeLists.txt
+@@ -206,9 +206,9 @@ macro(ov_add_sample)
+ target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES})
+
+ install(TARGETS ${SAMPLE_NAME}
+- RUNTIME DESTINATION samples_bin/
+- COMPONENT samples_bin
+- EXCLUDE_FROM_ALL)
++ DESTINATION ${CMAKE_INSTALL_BINDIR}
++ COMPONENT samples_bin)
++
+
+ # create global target with all samples / demo apps
+ if(NOT TARGET ov_samples)
+diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
+index 6cf43ec3fed..d539b9d003f 100644
+--- a/src/bindings/python/CMakeLists.txt
++++ b/src/bindings/python/CMakeLists.txt
+@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING)
+ # install OpenVINO Python API
+
+ set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
+- set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
++ set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
+ set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
+ set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO")
+
+--
+2.34.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
deleted file mode 100644
index 185a475b..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a7ee6a27135fef24a398690d9280aca79315fa25 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>
----
- CMakeLists.txt | 13 ++-----------
- 1 file changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c347cb465d..9f57a5ed9c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -641,7 +641,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
- install(EXPORT ngraphTargets
- FILE ngraphTargets.cmake
- NAMESPACE ngraph::
-- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
- COMPONENT ngraph)
-
- configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in
-@@ -654,15 +654,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
-- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
- COMPONENT ngraph)
- endif()
--
--install(DIRECTORY
-- ${CMAKE_CURRENT_SOURCE_DIR}/licenses
-- DESTINATION "${NGRAPH_COMPONENT_PREFIX}."
-- COMPONENT ngraph
--)
--
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
---
-2.25.4
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
deleted file mode 100644
index 3fff5607..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From cc44429f0e55efa0fa142cc043e83123e3b376e4 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:43:55 +0800
-Subject: [PATCH] inference-engine: use system installed packages
-
-Use installed versions of pugixml, ade, protobuf and tbb.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- cmake/dependencies.cmake | 17 --------------
- inference-engine/CMakeLists.txt | 2 +-
- inference-engine/cmake/ie_parallel.cmake | 10 ++-------
- .../src/inference_engine/CMakeLists.txt | 22 +------------------
- .../src/legacy_api/CMakeLists.txt | 3 +--
- .../src/vpu/graph_transformer/CMakeLists.txt | 1 -
- .../common_test_utils/CMakeLists.txt | 7 ++----
- .../unit_test_utils/CMakeLists.txt | 3 +--
- .../tests_deprecated/helpers/CMakeLists.txt | 1 -
- inference-engine/thirdparty/CMakeLists.txt | 14 +-----------
- 10 files changed, 9 insertions(+), 71 deletions(-)
-
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index 2a5a74db6..9cc9a6c94 100644
---- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING)
-
- set(protoc_version "3.7.1")
- if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
-- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
-- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
-- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
-- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
- else()
- message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
- endif()
-
-- reset_deps_cache(SYSTEM_PROTOC)
--
-- message("${SYSTEM_PROTOC_ROOT}/bin")
-- find_program(
-- SYSTEM_PROTOC
-- NAMES protoc
-- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
-- NO_DEFAULT_PATH)
-- if(NOT SYSTEM_PROTOC)
-- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
-- endif()
--
-- 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 39ff413bc..ba8ed354c 100644
---- a/inference-engine/CMakeLists.txt
-+++ b/inference-engine/CMakeLists.txt
-@@ -54,7 +54,7 @@ function(ie_developer_export)
- APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
-
- # Custom target to build only Inference Engine Developer Package targets
-- add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets} gflags)
-+ add_custom_target(ie_dev_targets ALL DEPENDS ${IEDeveloperPackageTargets})
- endfunction()
-
- add_subdirectory(thirdparty)
-diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index 0f3c41e0a..b3b2dfdab 100644
---- a/inference-engine/cmake/ie_parallel.cmake
-+++ b/inference-engine/cmake/ie_parallel.cmake
-@@ -48,14 +48,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
- set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
-
- if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-- find_package(TBB COMPONENTS tbb tbbmalloc)
-- if (TBB_FOUND)
-- set(IE_THREAD_DEFINE "IE_THREAD_TBB")
-- ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
-- else ()
-- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
-- SEQ method will be used for ${TARGET_NAME}")
-- endif ()
-+ set(IE_THREAD_DEFINE "IE_THREAD_TBB")
-+ target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
- elseif (THREADING STREQUAL "OMP")
- if (WIN32)
- set(omp_lib_name libiomp5md)
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 4ae0d5607..4106cf8b4 100644
---- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -124,8 +124,7 @@ if(NGRAPH_ONNX_IMPORT_ENABLE)
- target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE)
- endif()
-
--target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
-- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
-+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
-
- target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
- $<TARGET_PROPERTY:${TARGET_NAME}_reader_api,INTERFACE_INCLUDE_DIRECTORIES>
-@@ -233,25 +232,6 @@ list(APPEND core_components ngraph)
- if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
- 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)
-- install(FILES "${TBB}/cmake/TBBConfig.cmake"
-- "${TBB}/cmake/TBBConfigVersion.cmake"
-- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
-- COMPONENT tbb)
- endif()
-
- ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
-diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
-index 85524310b..dc25cae2f 100644
---- a/inference-engine/src/legacy_api/CMakeLists.txt
-+++ b/inference-engine/src/legacy_api/CMakeLists.txt
-@@ -33,8 +33,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE ${PUBLIC_HEADERS_DIR} ${CM
- ${IE_MAIN_SOURCE_DIR}/src/inference_engine # For CNNNetworkNGraphImpl
- $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-- $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
-- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
-+ $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
-
- # Create shared library
-
-diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-index 982d3c7fa..db881246c 100644
---- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
-
- target_include_directories(${TARGET_NAME}
- SYSTEM PUBLIC
-- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
- "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
-
-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 efead7271..732abee2d 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
-@@ -23,7 +23,7 @@ function(add_gtest_libraries)
- PROPERTIES FOLDER thirdparty)
- endfunction()
-
--add_gtest_libraries()
-+#add_gtest_libraries()
-
- if (MSVC)
- set(PUGI pugixml_mt)
-@@ -32,10 +32,7 @@ else ()
- endif ()
-
- list(APPEND EXPORT_DEPENDENCIES
-- ${PUGI}
- ${NGRAPH_LIBRARIES}
-- gtest
-- gtest_main
- )
-
- set(TARGET_NAME commonTestUtils)
-@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME)
- PUBLIC
- ${IE_TESTS_ROOT}/ie_test_utils
- $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
-- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
- PRIVATE
- $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
- )
-@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME)
- target_link_libraries(${ADD_TARGET_NAME}
- PUBLIC
- ${EXPORT_DEPENDENCIES}
-+ pugixml
- )
- endfunction()
-
-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 df611c700..06bd911ae 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
-@@ -10,8 +10,7 @@ list(APPEND EXPORT_DEPENDENCIES
- commonTestUtils_s
- inference_engine_s
- inference_engine_lp_transformations
-- inference_engine_ir_reader
-- gmock)
-+ inference_engine_ir_reader)
-
- addIeTarget(
- NAME ${TARGET_NAME}
-diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-index bf915e52d..9e7173db6 100644
---- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-@@ -23,7 +23,6 @@ function(add_helpers target_name)
- "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
- $<TARGET_PROPERTY:inference_engine_ir_reader,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
-- $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
- "${IE_MAIN_SOURCE_DIR}/src/vpu/"
- PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
-
-diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
-index f94453e06..b3c25daf4 100644
---- a/inference-engine/thirdparty/CMakeLists.txt
-+++ b/inference-engine/thirdparty/CMakeLists.txt
-@@ -38,28 +38,16 @@ function(build_with_lto)
- function(ie_build_pugixml)
- set(BUILD_TESTS_current ${BUILD_TESTS})
- set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
-- add_subdirectory(pugixml)
- set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
- endfunction()
-
- ie_build_pugixml()
- add_subdirectory(stb_lib)
-- add_subdirectory(ade)
- add_subdirectory(fluid/modules/gapi)
-
-- target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
--
-- set_target_properties(pugixml ade fluid stb_image
-+ set_target_properties(fluid stb_image
- PROPERTIES FOLDER thirdparty)
-
-- # developer package
--
-- ie_developer_export_targets(ade fluid pugixml)
-- if(TARGET pugixml_mt)
-- ie_developer_export_targets(pugixml_mt)
-- set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty)
-- endif()
--
- if(ENABLE_MKL_DNN)
- set(SDL_cmake_included ON)
- include(mkldnn.cmake)
---
-2.26.2
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
deleted file mode 100644
index a4e58b8e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 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 2/5] cldNN: 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 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-index 4b444eca..8610b9b8 100644
---- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
-+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
- MultiProcessorCompilation
- DeadCodeEliminate
- ExtensionsEnabled
-- TreatWarnAsErrorEnabled
- WarnLevel4
- NoFastMath
- StackProtector
---
-2.25.4
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
new file mode 100644
index 00000000..8a1464d5
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -0,0 +1,33 @@
+From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:49:35 +0530
+Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error
+
+* Remove -Werror for:
+|git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
+| 129 | virtual JitDefinitions GetDefinitions() const = 0;
+| |
+
+Upstream-Status: Pending
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ src/plugins/intel_gpu/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
+index 2f3d9127dde..2fd4f5c1b3c 100644
+--- a/src/plugins/intel_gpu/CMakeLists.txt
++++ b/src/plugins/intel_gpu/CMakeLists.txt
+@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
+ include(thirdparty/cmake/rapidjson.cmake)
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- ov_add_compiler_flags(-Werror)
++ #ov_add_compiler_flags(-Werror)
+ endif()
+
+ add_subdirectory(src/runtime)
+--
+2.34.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
deleted file mode 100644
index ac34fa4f..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From d9adfdc9c802fdb880fb658085854384f90a88c2 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 | 14 --------------
- cmake/developer_package.cmake | 10 ++++++----
- .../ie_bridges/c/samples/common/CMakeLists.txt | 2 ++
- inference-engine/samples/CMakeLists.txt | 9 +++------
- .../samples/common/format_reader/CMakeLists.txt | 2 ++
- .../src/inference_engine/CMakeLists.txt | 4 ++--
- .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
- inference-engine/tests/unit/cpu/CMakeLists.txt | 4 +++-
- .../tests/unit/inference_engine/CMakeLists.txt | 2 ++
- inference-engine/tests/unit/vpu/CMakeLists.txt | 4 +++-
- 10 files changed, 24 insertions(+), 29 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1f981ed25..2c014ca27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,12 +121,8 @@ add_subdirectory(docs)
-
- # 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
-@@ -136,22 +132,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 REQUIRED 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.cmake b/cmake/developer_package.cmake
-index 5e022244b..6e2cbf44e 100644
---- a/cmake/developer_package.cmake
-+++ b/cmake/developer_package.cmake
-@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH
- 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()
-
- # Search packages for the host system instead of packages for the target system
- # in case of cross compilation these macros should be defined by the toolchain file
-@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir)
- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
- set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
- else()
-- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
-- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} 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} PARENT_SCOPE)
- endif()
- endfunction()
-@@ -147,7 +149,7 @@ endif()
-
- # allow to override default OUTPUT_ROOT root
- if(NOT DEFINED OUTPUT_ROOT)
-- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
-+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
- endif()
-
- # Enable postfixes for Debug/Release builds
-diff --git a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt
-index b8d5ddf62..d086478f6 100644
---- a/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt
-+++ b/inference-engine/ie_bridges/c/samples/common/CMakeLists.txt
-@@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
- if(COMMAND add_cpplint_target)
- add_cpplint_target(${TARGET_NAME}_cpplint 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 594e581b1..4e95a7808 100644
---- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -34,7 +34,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)
-@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1)
- set (INTTYPES_FORMAT C99)
- set (BUILD_TESTING OFF)
-
--if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
-- add_subdirectory(thirdparty/gflags)
-- set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
--endif()
--
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- endif()
-@@ -239,6 +234,8 @@ macro(ie_add_sample)
- add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
- CUSTOM_FILTERS ${custom_filters})
- 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 48dbed9f2..76532fd04 100644
---- a/inference-engine/samples/common/format_reader/CMakeLists.txt
-+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
-@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
-
- set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
- FOLDER cpp_samples)
-+
-+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 4ae0d5607..b9ee12498 100644
---- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -265,8 +265,8 @@ install(TARGETS ${TARGET_NAME}
- install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
- "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
- "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
-- DESTINATION ${IE_CPACK_IE_DIR}/share
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
- COMPONENT core)
- install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
-- DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT core)
-diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-index bf30d127c..6ed8c4081 100644
---- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
- # install
-
- 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)
-diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
-index 9ec5ad025..45c62571a 100644
---- a/inference-engine/tests/unit/cpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
-@@ -22,4 +22,6 @@ addIeTargetTest(
- ADD_CPPLINT
- LABELS
- CPU
--)
-\ No newline at end of file
-+)
-+
-+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 3eb21a434..09ba9225a 100644
---- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-@@ -15,3 +15,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 072103292..117cc9ee1 100644
---- a/inference-engine/tests/unit/vpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
-@@ -26,4 +26,6 @@ addIeTargetTest(
- LABELS
- VPU
- MYRIAD
--)
-\ No newline at end of file
-+)
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
---
-2.26.2
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
new file mode 100644
index 00000000..bbdeaa2a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -0,0 +1,45 @@
+From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 29 Nov 2023 12:55:19 +0530
+Subject: [PATCH 3/3] protobuf: allow target protoc to be built
+
+We can run target binaries using a qemu wrapper so allow these to be
+built and run.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/frontends/frontends.cmake | 2 +-
+ thirdparty/protobuf/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
+index f3b5520d6d2..7579f638c5a 100644
+--- a/cmake/developer_package/frontends/frontends.cmake
++++ b/cmake/developer_package/frontends/frontends.cmake
+@@ -163,7 +163,7 @@ macro(ov_add_frontend)
+ set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
+ add_custom_command(
+ OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
+- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
++ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
+ DEPENDS ${PROTOC_DEPENDENCY} ${proto_file}
+ COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
+ VERBATIM
+diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
+index 15f32601f23..36853caf7dc 100644
+--- a/thirdparty/protobuf/CMakeLists.txt
++++ b/thirdparty/protobuf/CMakeLists.txt
+@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE)
+ if(CMAKE_CROSSCOMPILING OR
+ (APPLE AND (HOST_X86_64 AND AARCH64)) OR
+ (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
+- set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
++ set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ else()
+ set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ endif()
+--
+2.34.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
deleted file mode 100644
index 1a54a124..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-fix-compilation-errors.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ed444bf9f4dda442bd2da51140f45631163e0e55 Mon Sep 17 00:00:00 2001
-From: Vladimir Zinoviev <vladimir.zinoviev@intel.com>
-Date: Sun, 14 Jun 2020 18:54:36 +0300
-Subject: [PATCH] [CLDNN] Fix std::runtime_error missing (#871)
-
-Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/ed444bf9f4dda442bd2da51140f45631163e0e55]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- .../thirdparty/clDNN/kernel_selector/common/tensor_type.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
-index 3dbdfd0b22..2226f1a874 100644
---- a/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
-+++ b/inference-engine/thirdparty/clDNN/kernel_selector/common/tensor_type.h
-@@ -25,6 +25,7 @@
- #include <array>
- #include <string>
- #include <utility>
-+#include <stdexcept>
-
- namespace kernel_selector {
- #define KERNEL_SELECTOR_TENSOR_DIM_MAX 9
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
deleted file mode 100644
index d47d273c..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f201d67c965318ebe49f0d38ea36e530c35a4701 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:50:19 +0800
-Subject: [PATCH] cldnn: fix inclusion of headers
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- inference-engine/include/gpu/gpu_ocl_wrapper.hpp | 2 +-
- inference-engine/src/cldnn_engine/CMakeLists.txt | 1 +
- .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-index fce7d8f17..827e5764a 100644
---- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-@@ -21,4 +21,4 @@
- # pragma GCC system_header
- #endif
-
--#include <CL/cl2.hpp>
-+#include <cl2.hpp>
-diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
-index eeb9b5c80..32a283ba4 100644
---- a/inference-engine/src/cldnn_engine/CMakeLists.txt
-+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
-@@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}
- $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
- ${CLDNN__IOCL_ICD_INCDIRS}
-+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
- ${CLDNN_TOP_FOLDER})
-
- # install
-diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
-index c67c81726..5ca48c597 100644
---- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
-+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
-@@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
- typedef cl_va_api_device_source_intel cl_device_source_intel;
- typedef cl_va_api_device_set_intel cl_device_set_intel;
- #endif
--#include <CL/cl_intel_planar_yuv.h>
-+#include <CL/cl_ext_intel.h>
- #include "cl_intel_usm_defs.h"
-
- #include <memory>
---
-2.25.4
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
index a938b942..816a98a3 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
@@ -1,115 +1,27 @@
-From d63d1a1291a2715b7d70ed88c4d764b22e6f2f4d Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Fri, 22 May 2020 15:47:44 +0800
-Subject: [PATCH] use meta-oe gflags
+From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Fri, 21 Oct 2022 11:38:23 +0800
+Subject: [PATCH] demos: use gflags from meta-oe
-gflags is available in meta-oe, use this one instead of the thirdparty
-one in open-model-zoo
+Upstream-Status: Inappropriate
-Upstream-Status: Inappropriate [meta-intel specific]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
---
- CMakeLists.txt | 8 ++++----
- multi_channel/common/CMakeLists.txt | 2 +-
- multi_channel/face_detection_demo/CMakeLists.txt | 2 +-
- multi_channel/human_pose_estimation_demo/CMakeLists.txt | 2 +-
- multi_channel/object_detection_demo_yolov3/CMakeLists.txt | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
+ demos/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 40b549f..dfdbf93 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,12 +89,10 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
- endif()
- ####################################
-
--set (GFLAGS_IS_SUBPROJECT TRUE)
-+set (GFLAGS_IS_SUBPROJECT FALSE)
- set (HAVE_SYS_STAT_H 1)
- set (HAVE_INTTYPES_H 1)
+diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
+index 51767051c..fb7e3d22f 100644
+--- a/demos/CMakeLists.txt
++++ b/demos/CMakeLists.txt
+@@ -141,7 +141,7 @@ endmacro()
+ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
+ find_package(OpenVINO REQUIRED COMPONENTS Runtime)
-add_subdirectory(thirdparty/gflags)
--
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- endif()
-@@ -177,7 +175,7 @@ macro(ie_add_sample)
- target_include_directories(${IE_SAMPLE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../common")
-
- target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${OpenCV_LIBRARIES} ${InferenceEngine_LIBRARIES}
-- ${IE_SAMPLE_DEPENDENCIES} gflags)
-+ ${IE_SAMPLE_DEPENDENCIES} ${GFLAGS_LIBRARIES})
-
- if(UNIX)
- target_link_libraries(${IE_SAMPLE_NAME} PRIVATE pthread)
-@@ -198,11 +196,13 @@ endmacro()
- # use this flag if you need to throw custom message in case if the IE package is not found.
- if (IE_NOT_FOUND_MESSAGE)
- find_package(InferenceEngine 2.0 QUIET)
-+ find_package(gflags 2.2 QUIET)
- if (NOT(InferenceEngine_FOUND))
- message(FATAL_ERROR ${IE_NOT_FOUND_MESSAGE})
- endif()
- else()
- find_package(InferenceEngine 2.0 REQUIRED)
-+ find_package(gflags 2.2 REQUIRED)
- endif()
-
- find_package(ngraph REQUIRED)
-diff --git a/multi_channel/common/CMakeLists.txt b/multi_channel/common/CMakeLists.txt
-index d5e5d93..c33afbb 100644
---- a/multi_channel/common/CMakeLists.txt
-+++ b/multi_channel/common/CMakeLists.txt
-@@ -110,7 +110,7 @@ endif()
-
- target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
-
--target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES})
-+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES})
-
- if(UNIX)
- target_link_libraries( ${TARGET_NAME} pthread)
-diff --git a/multi_channel/face_detection_demo/CMakeLists.txt b/multi_channel/face_detection_demo/CMakeLists.txt
-index 5b497fc..78c518e 100644
---- a/multi_channel/face_detection_demo/CMakeLists.txt
-+++ b/multi_channel/face_detection_demo/CMakeLists.txt
-@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
- endif()
- endif()
++#add_subdirectory(thirdparty/gflags)
+ add_subdirectory(common/cpp)
--target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
-+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
-
- if(UNIX)
- target_link_libraries( ${TARGET_NAME} pthread)
-diff --git a/multi_channel/human_pose_estimation_demo/CMakeLists.txt b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
-index 7fe4823..7e76796 100644
---- a/multi_channel/human_pose_estimation_demo/CMakeLists.txt
-+++ b/multi_channel/human_pose_estimation_demo/CMakeLists.txt
-@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
- endif()
- endif()
-
--target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} common)
-+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} common)
-
- if(UNIX)
- target_link_libraries( ${TARGET_NAME} pthread)
-diff --git a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
-index e959349..cf1de4a 100644
---- a/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
-+++ b/multi_channel/object_detection_demo_yolov3/CMakeLists.txt
-@@ -60,7 +60,7 @@ if(MULTICHANNEL_DEMO_USE_TBB)
- endif()
- endif()
-
--target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} gflags ${OpenCV_LIBRARIES} ngraph::ngraph common)
-+target_link_libraries(${TARGET_NAME} ${InferenceEngine_LIBRARIES} ${GFLAGS_LIBRARIES} ${OpenCV_LIBRARIES} ngraph::ngraph common)
-
- if(UNIX)
- target_link_libraries( ${TARGET_NAME} pthread)
---
-2.25.4
-
+ find_package(OpenCV QUIET COMPONENTS gapi)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb
deleted file mode 100644
index 31bdb412..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2020.4.bb
+++ /dev/null
@@ -1,61 +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=git;branch=master \
- file://0001-use-oe-gflags.patch \
- "
-
-SRCREV = "366130da8fc27dd4d896639cb526a079acc07831"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-"
-
-inherit cmake
-
-S = "${WORKDIR}/git/demos"
-
-DEPENDS += "openvino-inference-engine opencv gflags"
-
-RDEPENDS_${PN} += " \
- python3-decorator \
- python3-defusedxml \
- python3-networkx \
- python3-protobuf \
- python3-test-generator \
- python3-requests \
- python3-pyyaml \
-"
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-
-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
- 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/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools
-}
-
-FILES_${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
new file mode 100644
index 00000000..a9422e70
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.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=master \
+ file://0001-use-oe-gflags.patch \
+ "
+
+SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf"
+
+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 ${B}/intel64/Release/*.a ${D}${libdir}
+ cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir}
+ cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo
+ cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo
+ cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
+}
+
+FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb
deleted file mode 100644
index c2863e65..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2020.4.bb
+++ /dev/null
@@ -1,124 +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=git;branch=releases/2020/4;lfs=0 \
- https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1223.zip;name=ma2450 \
- https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1223.zip;name=ma248x \
- https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1223.zip;name=ma2x8x \
- git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
- file://0001-inference-engine-use-system-installed-packages.patch \
- file://0002-cldNN-disable-Werror.patch \
- file://0003-inference-engine-installation-fixes.patch \
- file://0004-fix-compilation-errors.patch \
- file://0005-cldnn-fix-inclusion-of-headers.patch \
- file://0001-dont-install-licenses-and-version-file.patch;patchdir=ngraph \
- "
-
-SRCREV = "023e7c2c3f8a8ac83564db09799d2049115d9cf6"
-SRCREV_mkl = "2706f56ebab54415be48add2751072065f4b52ab"
-
-SRC_URI[ma2450.sha256sum] = "4dc246bd12d7a21c1b10ac3e090b30043777c4ea862e1e4119536ba03c5878ef"
-SRC_URI[ma248x.sha256sum] = "64dd77ecd2f7172421414a388a87be4e6271894a982a58b3829f9de1a1869abd"
-SRC_URI[ma2x8x.sha256sum] = "d1d209221c1389a9a04e14ffeeaff1c3308f6ab105c7bd22f0e300df01cce4d8"
-
-LICENSE = "Apache-2.0 & ISSL & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
- file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \
- file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
- file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \
-"
-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} \
- -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 \
- "
-
-DEPENDS += "libusb1 \
- ade \
- opencv \
- pugixml \
- protobuf-native \
- tbb \
- onednn \
- "
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_libc-musl = "null"
-
-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-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.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-ma2450.mvcmd ${D}${libdir}/
- install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/
- install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.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/
-
- rm -rf ${D}${prefix}/python
- rm -rf ${D}${prefix}/deployment_tools
- fi
-
- # 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"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
new file mode 100644
index 00000000..675d9920
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
@@ -0,0 +1,146 @@
+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;name=openvino;branch=releases/2024/1;lfs=0 \
+ git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
+ git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
+ git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
+ git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \
+ git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \
+ git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \
+ git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \
+ git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \
+ git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \
+ git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \
+ git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \
+ git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \
+ file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \
+ file://0002-cmake-Fix-overloaded-virtual-error.patch \
+ file://0003-protobuf-allow-target-protoc-to-be-built.patch \
+ "
+
+SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78"
+SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3"
+SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c"
+SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
+SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
+SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e"
+SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
+SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
+SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
+SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
+SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
+SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b"
+SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry"
+
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+ file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \
+ file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
+ file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \
+ file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \
+ file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \
+ file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+ file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+ file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+ file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \
+ file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \
+ file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+"
+
+inherit cmake python3native pkgconfig qemu
+
+S = "${WORKDIR}/git"
+EXTRA_OECMAKE += " \
+ -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+ -DENABLE_OPENCV=OFF \
+ -DENABLE_INTEL_GNA=OFF \
+ -DENABLE_SYSTEM_TBB=ON \
+ -DPYTHON_EXECUTABLE=${PYTHON} \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
+ -DTREAT_WARNING_AS_ERROR=FALSE \
+ -DENABLE_DATA=FALSE \
+ -DENABLE_SYSTEM_PUGIXML=TRUE \
+ -DENABLE_OV_ONNX_FRONTEND=FALSE \
+ -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
+ -DENABLE_FUZZING=OFF \
+ -DENABLE_TBBBIND_2_5=OFF \
+ -DCPACK_GENERATOR=RPM \
+ -DENABLE_SYSTEM_FLATBUFFERS=ON \
+ -DENABLE_SYSTEM_SNAPPY=ON \
+ -DFETCHCONTENT_BASE_DIR="${S}" \
+ -DENABLE_INTEL_NPU=OFF \
+ "
+
+DEPENDS += "\
+ flatbuffers-native \
+ pugixml \
+ python3-pybind11 \
+ python3-pybind11-native \
+ qemu-native \
+ snappy \
+ tbb \
+ "
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+
+PACKAGECONFIG ?= "opencl samples"
+PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp,"
+PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress"
+PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv"
+PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
+
+do_configure:prepend() {
+ # Dont set PROJECT_ROOT_DIR
+ sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
+
+ # qemu wrapper that can be used by cmake to run target binaries.
+ qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+ cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+ chmod +x ${WORKDIR}/qemuwrapper
+}
+
+do_install:append() {
+ rm -rf ${D}${prefix}/install_dependencies
+ rm -rf ${D}${prefix}/setupvars.sh
+
+ find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} +
+}
+
+# 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} += "\
+ ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \
+ ${libdir}/openvino-${PV}/plugins.xml \
+ ${libdir}/openvino-${PV}/cache.json \
+ "
+
+# Move inference engine samples into a separate package
+PACKAGES =+ "${PN}-samples"
+
+FILES:${PN}-samples = "${datadir}/openvino \
+ ${bindir} \
+ ${libdir}/libformat_reader.a \
+ ${libdir}/libopencv_c_wrapper.a \
+ "
+
+RDEPENDS:${PN}-samples += "python3-core"
+
+# Package for inference engine python API
+PACKAGES =+ "${PN}-python3"
+
+FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}"
+
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-06-18 19:25:16 +0000