@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/openssl/disable-install-docs.patch

@@ -1,5 +1,5 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 110ba06..5b6b1c7 100644
+index a48fae5..c82c086 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
 @@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime
@@ -10,12 +10,12 @@ index 110ba06..5b6b1c7 100644
 +install_docs:
  
  uninstall_docs: uninstall_man_docs uninstall_html_docs
- 	$(RM) -r $(DESTDIR)$(DOCDIR)
+ 	$(RM) -r "$(DESTDIR)$(DOCDIR)"
 diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
-index d054431..b5c1c88 100644
+index 9250b98..2b63c85 100644
 --- a/Configurations/windows-makefile.tmpl
 +++ b/Configurations/windows-makefile.tmpl
-@@ -487,7 +487,7 @@ install_sw: install_dev install_engines install_modules install_runtime
+@@ -493,7 +493,7 @@ install_sw: install_dev install_engines install_modules install_runtime
  
  uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
  

package/vcpkg/ports/openssl/portfile.cmake

@@ -19,7 +19,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openssl/openssl
     REF "openssl-${VERSION}"
-    SHA512 248353b000ef6b9a3434bf808b147eb4672c82f36968b2995c159373680f80208183bb70c02effa36ae4a1705fe5a5e315960075e8899352c4e84069d6c651c2
+    SHA512 04349ba554ddc5a9c26ff44714c1adca3c6431e98d11af5e7b6a5f58ed44e016da68c09cc53415716ab1936c6aaac04887ced470707dbc3f7816c04e06be69c1
     PATCHES
         disable-apps.patch
         disable-install-docs.patch

package/vcpkg/ports/openssl/unix/move-openssldir.patch

@@ -1,15 +1,16 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index dd96254..c4458ca 100644
+index c82c086..6c5402d 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -689,6 +689,10 @@ install_ssldirs:
- 		cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
- 		chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
+@@ -690,6 +690,11 @@ install_ssldirs:
+ 		chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
  	fi
+ 
 +	$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR)
 +	for I in $(DESTDIR)$(OPENSSLDIR)/*; do \
 +		mv $$I $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR)/; \
 +	done
- 
++
  install_dev: install_runtime_libs
  	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+ 	@$(ECHO) "*** Installing development files"

package/vcpkg/ports/openssl/unix/no-empty-dirs.patch

@@ -1,21 +1,21 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 5b6b1c7..4c8c916 100644
+index 6c5402d..fc982df 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -818,7 +818,7 @@ _install_modules_deps: install_runtime_libs build_modules
+@@ -823,7 +823,7 @@ _install_modules_deps: install_runtime_libs build_modules
  
  install_engines: _install_modules_deps
  	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
--	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
+-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)/"
 +	@[ -z "$(INSTALL_ENGINES)" ] || $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
  	@$(ECHO) "*** Installing engines"
  	@set -e; for e in dummy $(INSTALL_ENGINES); do \
  		if [ "$$e" = "dummy" ]; then continue; fi; \
-@@ -842,7 +842,7 @@ uninstall_engines:
+@@ -847,7 +847,7 @@ uninstall_engines:
  
  install_modules: _install_modules_deps
  	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
--	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/
+-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)/"
 +	@[ -z "$(INSTALL_MODULES)" ] || $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/
  	@$(ECHO) "*** Installing modules"
  	@set -e; for e in dummy $(INSTALL_MODULES); do \

package/vcpkg/ports/openssl/unix/no-static-libs-for-shared.patch

@@ -1,12 +1,12 @@
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 4c8c916..dd96254 100644
+index fc982df..10f1c54 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -708,6 +708,7 @@ install_dev: install_runtime_libs
+@@ -713,6 +713,7 @@ install_dev: install_runtime_libs
  	done
- 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
+ 	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)"
  	@set -e; for l in $(INSTALL_LIBS); do \
-+		if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \
++        if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \
  		fn=`basename $$l`; \
  		$(ECHO) "install $$l -> $(DESTDIR)$(libdir)/$$fn"; \
- 		cp $$l $(DESTDIR)$(libdir)/$$fn.new; \
+ 		cp $$l "$(DESTDIR)$(libdir)/$$fn.new"; \

package/vcpkg/ports/openssl/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "openssl",
-  "version": "3.1.3",
+  "version": "3.1.4",
+  "port-version": 1,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",

package/vcpkg/ports/openssl/windows/portfile.cmake

@@ -6,6 +6,9 @@ vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
 vcpkg_add_to_path("${PERL_EXE_PATH}")
 
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(OPENSSL_ARCH VC-WIN32)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
@@ -13,7 +16,13 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
     set(OPENSSL_ARCH VC-WIN32-ARM)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-    set(OPENSSL_ARCH VC-WIN64-ARM)
+    if(VCPKG_TARGET_IS_UWP)
+        set(OPENSSL_ARCH VC-WIN64-ARM)
+    elseif(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(OPENSSL_ARCH VC-CLANG-WIN64-CLANGASM-ARM)
+    else()
+        set(OPENSSL_ARCH VC-WIN64-CLANGASM-ARM)
+    endif()
 else()
     message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
@@ -33,17 +42,30 @@ endif()
 
 cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native)
 
-vcpkg_cmake_get_vars(cmake_vars_file)
-include("${cmake_vars_file}")
-
 # Clang always uses /Z7;  Patching /Zi /Fd<Name> out of openssl requires more work.
 set(OPENSSL_BUILD_MAKES_PDBS ON)
 if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(OPENSSL_BUILD_MAKES_PDBS OFF)
 endif()
 
-cmake_path(NATIVE_PATH NASM NORMALIZE as)
-cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc)
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND NOT VCPKG_TARGET_IS_UWP)
+    vcpkg_find_acquire_program(CLANG)
+    set(clang "${CLANG}")
+    cmake_path(GET clang PARENT_PATH clang_path)
+    vcpkg_add_to_path("${clang_path}")
+
+    set(as clang-cl)
+
+    vcpkg_list(APPEND CONFIGURE_OPTIONS "ASFLAGS=--target=aarch64-win32-msvc")
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang")
+        string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " --target=aarch64-win32-msvc")
+        string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " --target=aarch64-win32-msvc")
+    endif()
+else()
+    cmake_path(NATIVE_PATH NASM NORMALIZE as)
+    cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc)
+endif()
+
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_AR NORMALIZE ar)
 cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_LINKER NORMALIZE ld)
 

package/vcpkg/ports/opentelemetry-cpp/portfile.cmake

@@ -6,19 +6,14 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-telemetry/opentelemetry-cpp
     REF "v${VERSION}"
-    SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62
+    SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb
     HEAD_REF main
     PATCHES
-        # Use the compiler's default C++ version. Picking a version with
-        # CMAKE_CXX_STANDARD is not needed as the Abseil port already picked
-        # one and propagates that version across all its downstream deps.
-        use-default-cxx-version.patch
         # When compiling code generated by gRPC we need to link the gRPC library
         # too.
         add-missing-dependencies.patch
         # Missing find_dependency for Abseil
         add-missing-find-dependency.patch
-        add-missing-include-file.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -28,19 +23,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         prometheus WITH_PROMETHEUS
         elasticsearch WITH_ELASTICSEARCH
         jaeger WITH_JAEGER
-        otlp WITH_OTLP
         otlp-http WITH_OTLP_HTTP
         zpages WITH_ZPAGES
         otlp-grpc WITH_OTLP_GRPC
 )
 
 # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it.
-if(WITH_OTLP)
-    set(OTEL_PROTO_VERSION "0.19.0")
+if(WITH_OTLP_GRPC)
+    set(OTEL_PROTO_VERSION "1.0.0")
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz"
         FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz"
-        SHA512 b6d47aaa90ff934eb24047757d5fdb8a5be62963a49b632460511155f09a725937fb7535cf34f738b81cc799600adbbc3809442aba584d760891c0a1f0ce8c03
+        SHA512 74de78304a91fe72cfcdbd87fcb19c0d6338c161d6624ce09eac0527b1b43b8a5d8790ae055e1d3d44319eaa070a506f47e740f888c91d724a0aef8b509688f0
     )
 
     vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}")
@@ -63,6 +57,8 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
     MAYBE_UNUSED_VARIABLES
         WITH_OTLP_GRPC
+        WITH_JAEGER
+        WITH_LOGS_PREVIEW
 )
 
 vcpkg_cmake_install()

package/vcpkg/ports/opentelemetry-cpp/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "opentelemetry-cpp",
-  "version-semver": "1.9.1",
+  "version-semver": "1.12.0",
   "port-version": 1,
   "description": [
     "OpenTelemetry is a collection of tools, APIs, and SDKs.",
@@ -39,7 +39,14 @@
     "otlp": {
       "description": "Whether to include the OpenTelemetry Protocol in the SDK",
       "dependencies": [
-        "protobuf"
+        {
+          "name": "opentelemetry-cpp",
+          "default-features": false,
+          "features": [
+            "otlp-grpc",
+            "otlp-http"
+          ]
+        }
       ]
     },
     "otlp-grpc": {

package/vcpkg/ports/opentelemetry-fluentd/fix_include_path.patch

@@ -0,0 +1,26 @@
+diff --git a/exporters/fluentd/src/log/recordable.cc b/exporters/fluentd/src/log/recordable.cc
+index 5af84d8..1b124eb 100644
+--- a/exporters/fluentd/src/log/recordable.cc
++++ b/exporters/fluentd/src/log/recordable.cc
+@@ -1,6 +1,9 @@
+ /// Copyright The OpenTelemetry Authors
+ // SPDX-License-Identifier: Apache-2.0
+ 
++#include "opentelemetry/logs/severity.h"
++#include "opentelemetry/trace/span_id.h"
++#include "opentelemetry/trace/trace_id.h"
+ #include "opentelemetry/exporters/fluentd/log/recordable.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_common.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h"
+diff --git a/exporters/fluentd/src/trace/recordable.cc b/exporters/fluentd/src/trace/recordable.cc
+index 5c0a5ed..c24aa0c 100644
+--- a/exporters/fluentd/src/trace/recordable.cc
++++ b/exporters/fluentd/src/trace/recordable.cc
+@@ -4,6 +4,7 @@
+ #include "opentelemetry/exporters/fluentd/trace/recordable.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_common.h"
+ #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h"
++#include "opentelemetry/sdk/resource/resource.h"
+ 
+ #include <map>
+ #include <string>

package/vcpkg/ports/opentelemetry-fluentd/portfile.cmake

@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF 7afa91952f08aad1fa79b8992f20a4b0cdaadaff  # Maps to 2.0.0
     HEAD_REF main
     SHA512 b28415c867aee5efe99f7521a145b5c402ac555d83be75a8b1d2760aed226ac109a6d092e86d7afedcc2ed8dc848d9662ac6505133d32f99b810f51e2748d1fc
+    PATCHES
+        fix_include_path.patch
 )
 
 vcpkg_cmake_configure(

package/vcpkg/ports/opentelemetry-fluentd/vcpkg.json

@@ -2,6 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "opentelemetry-fluentd",
   "version-semver": "2.0.0",
+  "port-version": 1,
   "description": "mdsd/fluentd exporter for OpenTelemetry C++",
   "homepage": "https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/exporters",
   "license": "Apache-2.0",

package/vcpkg/ports/openvdb/{0003-fix-cmake.patch → fix_cmake.patch}

@@ -1,14 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9330c29..a98516a 100644
+index 8329dda9..71f45701 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -283,13 +283,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+@@ -284,12 +284,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
  
  if(OPENVDB_INSTALL_CMAKE_MODULES)
    set(OPENVDB_CMAKE_MODULES
 -    cmake/FindBlosc.cmake
      cmake/FindJemalloc.cmake
--    cmake/FindIlmBase.cmake
      cmake/FindLog4cplus.cmake
 -    cmake/FindOpenEXR.cmake
      cmake/FindOpenVDB.cmake
@@ -17,7 +16,7 @@ index 9330c29..a98516a 100644
      cmake/OpenVDBHoudiniSetup.cmake
      cmake/OpenVDBMayaSetup.cmake
 diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
-index 5ff96f6..c3de6f9 100644
+index c4213c85..86b24e9d 100644
 --- a/cmake/FindOpenVDB.cmake
 +++ b/cmake/FindOpenVDB.cmake
 @@ -490,7 +490,7 @@ endif()
@@ -26,10 +25,10 @@ index 5ff96f6..c3de6f9 100644
  
 -find_package(TBB REQUIRED COMPONENTS tbb)
 +find_package(TBB CONFIG REQUIRED)
+ find_package(Boost REQUIRED COMPONENTS iostreams)
  
- if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
-   # @note  Both of these must be set for Boost 1.70 (VFX2020) to link against
-@@ -651,7 +651,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
+ # Add deps for pyopenvdb
+@@ -641,7 +641,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
  endif()
  
  if(OpenVDB_USES_BLOSC)
@@ -38,16 +37,7 @@ index 5ff96f6..c3de6f9 100644
  endif()
  
  if(OpenVDB_USES_ZLIB)
-@@ -665,7 +665,7 @@ endif()
- if(OpenVDB_USES_IMATH_HALF)
-   find_package(Imath CONFIG)
-   if (NOT TARGET Imath::Imath)
--    find_package(IlmBase REQUIRED COMPONENTS Half)
-+    find_package(IlmBase CONFIG REQUIRED)
-   endif()
- 
-   if(WIN32)
-@@ -716,7 +716,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
+@@ -694,7 +694,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
  
  if(NOT OPENVDB_USE_STATIC_LIBS)
    if(OpenVDB_USES_BLOSC)
@@ -57,31 +47,19 @@ index 5ff96f6..c3de6f9 100644
    if(OpenVDB_USES_ZLIB)
      list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
 diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
-index 1b48e84..5d055ac 100644
+index 33d4e5cc..63699b2c 100644
 --- a/openvdb/openvdb/CMakeLists.txt
 +++ b/openvdb/openvdb/CMakeLists.txt
-@@ -130,9 +130,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
+@@ -123,7 +123,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
    endif()
  endif()
  
 -find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb)
 +find_package(TBB CONFIG REQUIRED)
  if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
--  if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
-+  if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
+   if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
      message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
-       "is deprecated and will be removed.")
-   endif()
-@@ -141,7 +141,7 @@ endif()
- if(USE_IMATH_HALF)
-   find_package(Imath CONFIG)
-   if (NOT TARGET Imath::Imath)
--    find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
-+    find_package(IlmBase CONFIG REQUIRED)
-     if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
-       if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION)
-         message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} "
-@@ -160,26 +160,7 @@ endif()
+@@ -152,26 +152,7 @@ endif()
  
  if(USE_BLOSC)
    # Find Blosc libraries
@@ -109,12 +87,12 @@ index 1b48e84..5d055ac 100644
  else()
    message(WARNING "Blosc support is disabled. It is strongly recommended to "
      "enable blosc for optimal builds of OpenVDB and to support compatible "
-@@ -237,7 +218,11 @@ endif()
+@@ -228,7 +209,11 @@ endif()
  # /usr/local
  
  if(USE_BLOSC)
 -  list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
-+    if(BUILD_SHARED_LIBS)
++  if(BUILD_SHARED_LIBS)
 +    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_shared)
 +  else()
 +    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_static)
@@ -123,7 +101,7 @@ index 1b48e84..5d055ac 100644
  
  if(USE_BLOSC OR USE_ZLIB)
 diff --git a/openvdb_cmd/CMakeLists.txt b/openvdb_cmd/CMakeLists.txt
-index c4351f4..b480334 100644
+index c4351f49..b4803341 100644
 --- a/openvdb_cmd/CMakeLists.txt
 +++ b/openvdb_cmd/CMakeLists.txt
 @@ -53,7 +53,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")

package/vcpkg/ports/openvdb/fix_nanovdb.patch

@@ -1,8 +1,8 @@
 diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt
-index d20b4928..257d005a 100644
+index 7bb3ab86..9311ed17 100644
 --- a/nanovdb/nanovdb/CMakeLists.txt
 +++ b/nanovdb/nanovdb/CMakeLists.txt
-@@ -128,7 +128,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb)
+@@ -127,7 +127,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb)
  endif()
  
  if(NANOVDB_USE_BLOSC AND NOT TARGET Blosc::blosc)
@@ -11,7 +11,7 @@ index d20b4928..257d005a 100644
  endif()
  
  if(NANOVDB_USE_ZLIB AND NOT TARGET ZLIB::ZLIB)
-@@ -224,7 +224,7 @@ if(NANOVDB_USE_TBB)
+@@ -236,7 +236,7 @@ if(NANOVDB_USE_TBB)
  endif()
  
  if(NANOVDB_USE_BLOSC)

package/vcpkg/ports/openvdb/portfile.cmake

@@ -1,10 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/openvdb
-    REF be0e7a78861d2b7d9643f7a0cab04f3ab5951686 # v10.0.0
-    SHA512 92301bf675d700fedb0a2b3c4653158eeda6105e70623e5e4bda15d73391427cf0295a0426204888e2fe062847025542717bff34ceb923e51cffa1721e9d4105
+    REF "v${VERSION}"
+    SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4
     PATCHES
-        0003-fix-cmake.patch
+        fix_cmake.patch
         fix_nanovdb.patch
 )
 

package/vcpkg/ports/openvdb/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "openvdb",
-  "version": "10.0.0",
-  "port-version": 6,
+  "version": "11.0.0",
   "description": "Sparse volume data structure and tools",
   "homepage": "https://github.com/dreamworksanimation/openvdb",
   "license": "MPL-2.0",

package/vcpkg/ports/openvino/001-disable-tools.patch

@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3182d12693..db70cca198 100644
+index e4d31492a4..38c009b3cb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -134,7 +134,7 @@ if (ENABLE_TESTS OR ENABLE_TEMPLATE)
- endif()
+@@ -151,7 +151,7 @@ endif()
+ 
  include(cmake/extra_modules.cmake)
  add_subdirectory(docs)
 -add_subdirectory(tools)

package/vcpkg/ports/openvino/002-git-version.patch

@@ -0,0 +1,31 @@
+diff --git a/cmake/developer_package/version.cmake b/cmake/developer_package/version.cmake
+index 1b71befe44..b78f44995a 100644
+--- a/cmake/developer_package/version.cmake
++++ b/cmake/developer_package/version.cmake
+@@ -5,7 +5,7 @@
+ find_package(Git QUIET)
+ 
+ function(ov_branch_name VAR REPO_ROOT)
+-    if(GIT_FOUND)
++    if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git")
+         execute_process(
+                 COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+                 WORKING_DIRECTORY ${REPO_ROOT}
+@@ -16,7 +16,7 @@ function(ov_branch_name VAR REPO_ROOT)
+ endfunction()
+ 
+ function(ov_commit_hash VAR REPO_ROOT)
+-    if(GIT_FOUND)
++    if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git")
+         execute_process(
+                 COMMAND ${GIT_EXECUTABLE} rev-parse --short=11 HEAD
+                 WORKING_DIRECTORY ${REPO_ROOT}
+@@ -27,7 +27,7 @@ function(ov_commit_hash VAR REPO_ROOT)
+ endfunction()
+ 
+ function(ov_commit_number VAR REPO_ROOT)
+-    if(GIT_FOUND)
++    if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git")
+         execute_process(
+                 COMMAND ${GIT_EXECUTABLE} rev-list --count --first-parent HEAD
+                 WORKING_DIRECTORY ${REPO_ROOT}

package/vcpkg/ports/openvino/portfile.cmake

@@ -2,13 +2,12 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openvinotoolkit/openvino
     REF "${VERSION}"
-    SHA512 29ee621c1428808607ce499e527b5943b8a2172769cb7315ef25253db818f54f2da4bbf5539198c012e25e78c8c830205b46f6e6a83032e732e82a7d00d46312
+    SHA512 d44aa06763b18fabb6e9fb52834cbe9b6c91384541177093741519c7cf6f209720cb9aabf0b4a2b2b32625399ca2076d7b1a3430ea00dadeda86255fb8baf720
     PATCHES
+        # vcpkg specific patch, because OV creates a file in source tree, which is prohibited
         001-disable-tools.patch
-        003-fix-find-onnx.patch
-        004-compilation-with-cpp17.patch
-        005-tflite-search.patch
-        007-macos-14.patch # from https://github.com/openvinotoolkit/openvino/pull/19946
+        # https://github.com/openvinotoolkit/openvino/pull/19628
+        002-git-version.patch
     HEAD_REF master)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -30,17 +29,20 @@ if(ENABLE_INTEL_GPU)
     # python is required for conversion of OpenCL source files into .cpp.
     vcpkg_find_acquire_program(PYTHON3)
 
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # remove 'rapidjson' directory and use vcpkg's one to comply with ODR
+    file(REMOVE_RECURSE ${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/rapidjson)
+
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND ENABLE_INTEL_CPU)
         message(WARNING
             "OneDNN for GPU is not available for static build, which is required for dGPU."
-            "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\".")
-        list(APPEND FEATURE_OPTIONS "-DENABLE_ONEDNN_FOR_GPU=OFF")
+            "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\" or disable CPU plugin,"
+            "which uses another flavor of oneDNN.")
     else()
         vcpkg_from_github(
             OUT_SOURCE_PATH DEP_SOURCE_PATH
             REPO oneapi-src/oneDNN
-            REF ec0b2ee85fc2a2dbdeec10035c5ef5813d8fb5ea
-            SHA512 abc09c9ab190cc043ba675fdcaf2da0069eacce14aad6e788a9957d8b6704cfcefe5a707e78d544d25acac35bc83217660ee64528150311f577d2ccbdd165de1
+            REF 284ad4574939fa784e4ddaa1f4aa577b8eb7a017
+            SHA512 b8b003659b5972ce7a4d5cfd6bcac9377d06055fa67bd2830af0780b2272d2faed3d1d58fb1cbd5aa8bee68c9d6005ac5ae63381b5f80c3ac86442f88cce73a3
             PATCHES 006-onednn-gpu-build.patch
         )
         file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
@@ -48,23 +50,23 @@ if(ENABLE_INTEL_GPU)
 
     list(APPEND FEATURE_OPTIONS
         "-DENABLE_SYSTEM_OPENCL=ON"
-        "-DPYTHON_EXECUTABLE=${PYTHON3}")
+        "-DPython3_EXECUTABLE=${PYTHON3}")
 endif()
 
 if(ENABLE_INTEL_CPU)
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO openvinotoolkit/oneDNN
-        REF a1aa20ca8f19465dc2fd18389953ed83798b2fd3
-        SHA512 0ff5b235a6f349ad94f52a3b8282f5c825eac7275ad784986d7f533863ace7a4ed71094b9f5cac85d473d2678e197727c1cb33dee5cf75cd793ded7be58f946e
+        REF 2ead5d4fe5993a797d9a7a4b8b5557b96f6ec90e
+        SHA512 e254f331275e174e7f191f99bf2abcea73aa5954efd0984e1a8418ffa73d2de1ad148e77314b4be04f36ac293202e01835be0ac6e65a6af1391258987aaa8dc4
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
 
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO openvinotoolkit/mlas
-        REF c7c8a631315000f17c650af34431009d2f22129c
-        SHA512 4146598ce6b30a3eaea544d6703b949061118398e67b773aa11a3c0f3e8fbcc446d09ea893b9879f8869e977162bcada0d4895cb225cf2e2469fb71cd5942e53
+        REF f6425b1394334822390fcd9da12788c9cd0d11da
+        SHA512 3b7fc28ad80a85a459f3370ba84acf79355c3d14be68df57c436e8e0f7b8a3e37ef192fc9b0db2f751dac458f3ef2e9ccb8dbe08e2d31c4636ea30eb970628fe
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas")
 
@@ -82,8 +84,8 @@ if(ENABLE_INTEL_CPU)
         vcpkg_from_github(
             OUT_SOURCE_PATH DEP_SOURCE_PATH
             REPO ARM-software/ComputeLibrary
-            REF v23.02.1
-            SHA512 ee9439e0804bacd365f079cedc548ffe2c12b0d4a86780e0783186884eb5a6d7aa7ceac11c504e242bedc55c3d026b826c90adaafbdbd3e5cfa2562a1c4ee04d
+            REF v23.08
+            SHA512 8379fdf804732ef4e69a3e91807810d413f35855d035cfde9d81059679f62cd625c0347f07dc1f76468dc82c06217a5ae8df25b4581a29558ac32b2a4f7d8af4
         )
         file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
     endif()
@@ -117,7 +119,6 @@ vcpkg_cmake_configure(
         "-DENABLE_PYTHON=OFF"
         "-DENABLE_GAPI_PREPROCESSING=OFF"
         "-DCPACK_GENERATOR=VCPKG"
-        "-DCMAKE_DISABLE_FIND_PACKAGE_pybind11=ON"
 )
 
 vcpkg_cmake_install()
@@ -129,6 +130,7 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
+
 vcpkg_install_copyright(
     FILE_LIST
         "${SOURCE_PATH}/LICENSE"

package/vcpkg/ports/openvino/usage

@@ -2,3 +2,9 @@ The package OpenVINO can be used in cmake scripts as:
 
     find_package(OpenVINO REQUIRED)
     target_link_libraries(main PRIVATE openvino::runtime)
+
+Note: static build of Intel GPU plugin disables usage of oneDNN for GPU, which is important
+for decent performance on discrete GPU devices. If you want to levarage performance of dGPU,
+please, consider either option:
+- Building with 'VCPKG_LIBRARY_LINKAGE=dynamic'
+- Disable Intel CPU plugin, because it uses different oneDNN flavor