@openziti/ziti-sdk-nodejs 0.16.0 → 0.17.0

package/vcpkg/ports/opencascade/dependencies.patch

@@ -0,0 +1,112 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb6ab2db..e58b1afa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -596,7 +596,8 @@ if (CAN_USE_FREETYPE)
+   if (USE_FREETYPE)
+     message (STATUS "Info: FreeType is used by OCCT")
+     add_definitions (-DHAVE_FREETYPE)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
++    find_package(Freetype MODULE REQUIRED)
++    set(CSF_FREETYPE Freetype::Freetype)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
+     OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
+@@ -613,7 +614,9 @@ endif()
+ if (USE_VTK)
+   add_definitions (-DHAVE_VTK)
+   set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
+-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
++  find_package(VTK REQUIRED)
++  set(CSF_VTK VTK::CommonCore)
++  set(IS_VTK_9XX 1)
+ else()
+   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
+ 
+@@ -629,7 +632,8 @@ endif()
+ if (CAN_USE_FREEIMAGE)
+   if (USE_FREEIMAGE)
+     add_definitions (-DHAVE_FREEIMAGE)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage")
++    find_package(freeimage CONFIG REQUIRED)
++    set(CSF_FreeImagePlus freeimage::FreeImagePlus)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
+     OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
+@@ -730,7 +734,8 @@ endif()
+ if (NOT DEFINED ANDROID AND CAN_USE_TBB)
+   if (USE_TBB)
+     add_definitions (-DHAVE_TBB)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
++    find_package(TBB CONFIG REQUIRED)
++    set(CSF_TBB TBB::tbb TBB::tbbmalloc)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
+@@ -750,7 +755,8 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
+ if (CAN_USE_RAPIDJSON)
+   if (USE_RAPIDJSON)
+     add_definitions (-DHAVE_RAPIDJSON)
+-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
++    find_package(RapidJSON CONFIG REQUIRED)
++    set(CSF_RapidJSON rapidjson)
+   else()
+     OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
+     OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
+diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
+index c9399159..f707e00f 100644
+--- a/adm/cmake/occt_toolkit.cmake
++++ b/adm/cmake/occt_toolkit.cmake
+@@ -475,11 +475,11 @@ else()
+   endif()
+ endif()
+ 
+-if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
++if (1)
+   if(IS_VTK_9XX)
+     string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+   endif()
+-  target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
++  target_link_libraries (${PROJECT_NAME} PRIVATE ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+ endif()
+ 
+ if (USE_QT)
+diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
+index c926c499..3b6db678 100644
+--- a/adm/templates/OpenCASCADEConfig.cmake.in
++++ b/adm/templates/OpenCASCADEConfig.cmake.in
+@@ -4,6 +4,22 @@
+ #
+ # This file is configured by OpenCASCADE.
+ #
++include(CMakeFindDependencyMacro)
++if("@USE_FREEIMAGE@")
++  find_dependency(freeimage CONFIG)
++endif()
++if("@USE_FREETYPE@")
++  find_dependency(Freetype MODULE)
++endif()
++if("@USE_RAPIDJSON@")
++  find_package(RapidJSON CONFIG REQUIRED)
++endif()
++if("@USE_TBB@")
++  find_dependency(TBB CONFIG)
++endif()
++if("@USE_VTK@")
++  find_dependency(VTK REQUIRED)
++endif()
+ 
+ if(OpenCASCADE_ALREADY_INCLUDED)
+   return()
+diff --git a/src/Standard/Standard_MMgrTBBalloc.cxx b/src/Standard/Standard_MMgrTBBalloc.cxx
+index 8c7a2df1..8499e1af 100644
+--- a/src/Standard/Standard_MMgrTBBalloc.cxx
++++ b/src/Standard/Standard_MMgrTBBalloc.cxx
+@@ -18,7 +18,6 @@
+ 
+ // paralleling with Intel TBB
+ #ifdef HAVE_TBB
+-#pragma comment (lib, "tbbmalloc.lib")
+ #include <tbb/scalable_allocator.h>
+ using namespace tbb;
+ #else

package/vcpkg/ports/opencascade/drop-bin-letter-d.patch

@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2c4e570..8eac318c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,7 +244,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+ 
+ set (BIN_LETTER "")
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-  set (BIN_LETTER "d")
+ elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+   set (BIN_LETTER "i")
+ endif()
+@@ -917,6 +916,7 @@ if (WIN32)
+   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
++  set (CMAKE_PDB_OUTPUT_DIRECTORY_DEBUG              "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+ endif()
+ 
+ string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
+diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
+index 9fd3ec4c..dc9ff18b 100644
+--- a/adm/cmake/occt_macros.cmake
++++ b/adm/cmake/occt_macros.cmake
+@@ -609,7 +609,7 @@ macro (OCCT_INSERT_CODE_FOR_TARGET)
+   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
+     set (OCCT_INSTALL_BIN_LETTER \"i\")
+   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
+-    set (OCCT_INSTALL_BIN_LETTER \"d\")
++    set (OCCT_INSTALL_BIN_LETTER \"\")
+   endif()")
+ endmacro()
+ 
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index beb934f7..95cec74a 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -172,7 +172,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+ 
+ set (BIN_LETTER "")
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-  set (BIN_LETTER "d")
+ elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+   set (BIN_LETTER "i")
+ endif()

package/vcpkg/ports/opencascade/install-include-dir.patch

@@ -1,17 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4ec871..59e5134 100644
+index a80e39e6..bb6ab2db 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1246,6 +1246,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
+@@ -1273,6 +1273,11 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
  endforeach()
  set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED})
  
-+foreach (OCCT_LIBRARY ${OCCT_LIBRARIES})
-+  target_include_directories(
-+    ${OCCT_LIBRARY} 
-+    INTERFACE
-+    $<INSTALL_INTERFACE:include>
-+    $<INSTALL_INTERFACE:include/opencascade>)
++foreach (OCCT_LIBRARY IN LISTS OCCT_LIBRARIES)
++  target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include/opencascade>) # OpenCASCADE_INCLUDE_DIR
++  target_include_directories(${OCCT_LIBRARY} INTERFACE $<INSTALL_INTERFACE:include>) # vcpkg lock-in
 +endforeach()
 +
  # Add all targets to the build-tree export set

package/vcpkg/ports/opencascade/portfile.cmake

@@ -1,17 +1,16 @@
+string(REPLACE "." "_" VERSION_STR "V${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Open-Cascade-SAS/OCCT
-    REF cec1ecd0c9f3b3d2572c47035d11949e8dfa85e2 #V7.7.2
-    SHA512 2fe98eadd7f9b922729bf80b56f260729d1c257c41392e4be4f070667ee77e94e2b286a873430b41ea61076acf1388aee7ba8b91789aa6199db56066796bb2d3
+    REF "${VERSION_STR}"
+    SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee
     HEAD_REF master
     PATCHES
+        dependencies.patch
+        drop-bin-letter-d.patch
         fix-pdb-find.patch
         fix-install-prefix-path.patch
         install-include-dir.patch
-        fix-depend-freetype.patch
-        fix-depend-vtk.patch
-        fix-dependence.patch
-        fix-find-tbb.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -22,11 +21,12 @@ endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        "freeimage"  USE_FREEIMAGE
-        "tbb"        USE_TBB
-        "rapidjson"  USE_RAPIDJSON
-        "samples"    INSTALL_SAMPLES
-        "vtk"        USE_VTK
+        freeimage   USE_FREEIMAGE
+        freetype    USE_FREETYPE
+        rapidjson   USE_RAPIDJSON
+        samples     INSTALL_SAMPLES
+        tbb         USE_TBB
+        vtk         USE_VTK
 )
 
 # We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 
@@ -38,12 +38,15 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         -DBUILD_LIBRARY_TYPE=${BUILD_TYPE}
         -DBUILD_MODULE_Draw=OFF
-        -DINSTALL_DIR_LAYOUT=Unix
-        -DBUILD_SAMPLES_MFC=OFF
-        -DBUILD_SAMPLES_QT=OFF
         -DBUILD_DOC_Overview=OFF
-        -DINSTALL_TEST_CASES=OFF
         -DBUILD_MODULE_DETools=OFF
+        -DINSTALL_DIR_LAYOUT=Unix
+        -DINSTALL_DIR_DOC=share/trash
+        -DINSTALL_DIR_SCRIPT=share/trash # not relocatable
+        -DINSTALL_TEST_CASES=OFF
+        -DUSE_TK=OFF
+    OPTIONS_DEBUG
+        -DINSTALL_SAMPLES=OFF
 )
 
 vcpkg_cmake_install()
@@ -51,73 +54,26 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade)
 
 #make occt includes relative to source_file
-list(APPEND ADDITIONAL_HEADERS 
-      "ExprIntrp.tab.h"
-      "FlexLexer.h"
-      "glext.h"
-      "igesread.h"
-      "NCollection_Haft.h"
-      "OSD_PerfMeter.h"
-      "Standard_values.h"
-    )
-
-file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx")
+file(GLOB extra_headers
+    LIST_DIRECTORIES false
+    RELATIVE "${CURRENT_PACKAGES_DIR}/include/opencascade"
+    "${CURRENT_PACKAGES_DIR}/include/opencascade/*.h"
+)
+list(JOIN extra_headers "|" extra_headers)
+file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/*.[hgl]xx")
 foreach(file_name IN LISTS files)
     file(READ "${file_name}" filedata)
-    string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}")
-    foreach(extra_header IN LISTS ADDITIONAL_HEADERS)
-        string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}")
-    endforeach()
+    string(REGEX REPLACE "(# *include) <([a-zA-Z0-9_]*[.][hgl]xx|${extra_headers})>" [[\1 "\2"]] filedata "${filedata}")
     file(WRITE "${file_name}" "${filedata}")
 endforeach()
 
-# Remove libd to lib, libd just has cmake files we dont want too
-if( WIN32 )
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
-file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib")
-endif()
-
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencascade/samples/qt")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/trash")
 
-if (NOT VCPKG_BUILD_TYPE)
-    # fix paths in target files
-    list(APPEND TARGET_FILES 
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake"
-        "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake"
-    )
-
-    foreach(TARGET_FILE IN LISTS TARGET_FILES)
-        file(READ "${TARGET_FILE}" filedata)
-        string(REGEX REPLACE "/libd" "/lib" filedata "${filedata}")
-        string(REGEX REPLACE "/bind" "/bin" filedata "${filedata}")
-        file(WRITE "${TARGET_FILE}" "${filedata}")
-    endforeach()
-
-endif()
-
-if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    # debug creates libd and bind directories that need moving
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin")
-
-    # the bin directory ends up with bat files that are noise, let's clean that up
-    file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat")
-    file(REMOVE_RECURSE ${BATS})
-else()
-    # remove scripts in bin dir
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-if (INSTALL_SAMPLES)
-    foreach(dir "Tutorial" "FuncDemo" "IESample" "OCCTOverview")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencascade/samples/qt/${dir}/env.sh" "${CURRENT_PACKAGES_DIR}/bin/env.sh" "<not/existing>")
-    endforeach()
-endif()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt")
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE_LGPL_21.txt"
+        "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt"
+)

package/vcpkg/ports/opencascade/vcpkg.json

@@ -1,14 +1,20 @@
 {
   "name": "opencascade",
   "version": "7.7.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
   "homepage": "https://github.com/Open-Cascade-SAS/OCCT",
-  "license": "LGPL-2.1",
-  "supports": "!(uwp | xbox | osx | arm)",
+  "license": "LGPL-2.1-only",
+  "supports": "!xbox",
   "dependencies": [
-    "fontconfig",
-    "freetype",
+    {
+      "name": "angle",
+      "platform": "uwp"
+    },
+    {
+      "name": "opengl",
+      "platform": "!(android | ios | uwp | wasm32)"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -18,6 +24,12 @@
       "host": true
     }
   ],
+  "default-features": [
+    {
+      "name": "freetype",
+      "platform": "!uwp"
+    }
+  ],
   "features": {
     "freeimage": {
       "description": "Enable optional usage of freeimage",
@@ -25,6 +37,17 @@
         "freeimage"
       ]
     },
+    "freetype": {
+      "description": "Use of freetype",
+      "supports": "!uwp",
+      "dependencies": [
+        "fontconfig",
+        {
+          "name": "freetype",
+          "default-features": false
+        }
+      ]
+    },
     "rapidjson": {
       "description": "Enable optional usage of rapidjson",
       "dependencies": [

package/vcpkg/ports/opencv3/0020-fix-supportqnx.patch

@@ -0,0 +1,21 @@
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 9bade08..28f006e 100644
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -129,11 +129,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); }
+ #include <cstdlib>        // std::abort
+ #endif
+ 
+-#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__
++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __QNX__
+ #  include <unistd.h>
+ #  include <fcntl.h>
+ #if defined __QNX__
+ #  include <sys/elf.h>
++#  include <sys/auxv.h>
++using Elf64_auxv_t = auxv64_t;
++#  include <elfdefinitions.h>
++constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP;
+ #else
+ #  include <elf.h>
+ #endif

package/vcpkg/ports/opencv3/portfile.cmake

@@ -24,6 +24,7 @@ vcpkg_from_github(
       0012-fix-zlib.patch
       0019-missing-include.patch
       fix-tbb-error.patch
+      0020-fix-supportqnx.patch
 )
 # Disallow accidental build of vendored copies
 file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")

package/vcpkg/ports/opencv3/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 11,
+  "port-version": 12,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",

package/vcpkg/ports/opencv4/0021-static-openvino.patch

@@ -0,0 +1,25 @@
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 437042958e..a90eb5a5ab 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -1632,13 +1632,19 @@ function(ocv_add_external_target name inc link def)
+   endif()
+ endfunction()
+ 
++set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "" CACHE INTERNAL "")
+ function(ocv_install_used_external_targets)
+   if(NOT BUILD_SHARED_LIBS
+       AND NOT (CMAKE_VERSION VERSION_LESS "3.13.0")  # upgrade CMake: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/2152
+   )
+     foreach(tgt in ${ARGN})
+       if(tgt MATCHES "^ocv\.3rdparty\.")
+-        install(TARGETS ${tgt} EXPORT OpenCVModules)
++        list(FIND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}" _found)
++        if(_found EQUAL -1)  # don't export target twice
++          install(TARGETS ${tgt} EXPORT OpenCVModules)
++          list(APPEND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}")
++          set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "${__OPENCV_EXPORTED_EXTERNAL_TARGETS}" CACHE INTERNAL "")
++        endif()
+       endif()
+     endforeach()
+   endif()

package/vcpkg/ports/opencv4/0022-fix-supportqnx.patch

@@ -0,0 +1,21 @@
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 7811ab7..8f00891 100644
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -120,11 +120,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); }
+ #include <cstdlib>        // std::abort
+ #endif
+ 
+-#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__
++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__ || defined __QNX__
+ #  include <unistd.h>
+ #  include <fcntl.h>
+ #if defined __QNX__
+ #  include <sys/elf.h>
++#  include <sys/auxv.h>
++using Elf64_auxv_t = auxv64_t;
++#  include <elfdefinitions.h>
++constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP;
+ #else
+ #  include <elf.h>
+ #endif

package/vcpkg/ports/opencv4/portfile.cmake

@@ -29,7 +29,9 @@ vcpkg_from_github(
       0017-fix-flatbuffers.patch
       0019-missing-include.patch
       0020-fix-compat-cuda12.2.patch
+      0021-static-openvino.patch # https://github.com/opencv/opencv/pull/23963
       "${ARM64_WINDOWS_FIX}"
+      0022-fix-supportqnx.patch
 )
 # Disallow accidental build of vendored copies
 file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
@@ -67,9 +69,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "gtk"       WITH_GTK
  "halide"    WITH_HALIDE
  "jasper"    WITH_JASPER
+ "openjpeg"  WITH_OPENJPEG
  "jpeg"      WITH_JPEG
  "lapack"    WITH_LAPACK
  "nonfree"   OPENCV_ENABLE_NONFREE
+ "openvino"  WITH_OPENVINO
  "openexr"   WITH_OPENEXR
  "opengl"    WITH_OPENGL
  "ovis"      CMAKE_REQUIRE_FIND_PACKAGE_OGRE
@@ -396,6 +400,7 @@ vcpkg_cmake_configure(
         -Dade_DIR=${ADE_DIR}
         ###### Disable build 3rd party libs
         -DBUILD_JASPER=OFF
+        -DBUILD_OPENJPEG=OFF
         -DBUILD_JPEG=OFF
         -DBUILD_OPENEXR=OFF
         -DBUILD_PNG=OFF
@@ -446,8 +451,8 @@ vcpkg_cmake_configure(
         -DWITH_PROTOBUF=${BUILD_opencv_dnn}
         -DWITH_PYTHON=${WITH_PYTHON}
         -DWITH_OPENCLAMDBLAS=OFF
+        -DWITH_OPENVINO=${WITH_OPENVINO}
         -DWITH_TBB=${WITH_TBB}
-        -DWITH_OPENJPEG=OFF
         -DWITH_CPUFEATURES=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
@@ -526,6 +531,9 @@ find_dependency(Tesseract)")
   if("lapack" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)")
   endif()
+  if(WITH_OPENVINO)
+    string(APPEND DEPS_STRING "\nfind_dependency(OpenVINO CONFIG)")
+  endif()
   if("openexr" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
   endif()

package/vcpkg/ports/opencv4/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.8.0",
-  "port-version": 7,
+  "port-version": 12,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
@@ -207,7 +207,7 @@
       "description": "Enable Intel Integrated Performance Primitives"
     },
     "jasper": {
-      "description": "JPEG 2000 support for opencv",
+      "description": "JPEG 2000 support for opencv (deprecated)",
       "dependencies": [
         "jasper"
       ]
@@ -240,9 +240,45 @@
         "opengl"
       ]
     },
+    "openjpeg": {
+      "description": "JPEG 2000 support for opencv",
+      "dependencies": [
+        "openjpeg"
+      ]
+    },
     "openmp": {
       "description": "Enable openmp support for opencv"
     },
+    "openvino": {
+      "description": "OpenVINO support for OpenCV DNN",
+      "supports": "!uwp & !x86",
+      "dependencies": [
+        {
+          "name": "opencv4",
+          "default-features": false,
+          "features": [
+            "dnn"
+          ]
+        },
+        {
+          "name": "openvino",
+          "default-features": false,
+          "features": [
+            "auto",
+            "cpu",
+            "hetero"
+          ]
+        },
+        {
+          "name": "openvino",
+          "default-features": false,
+          "features": [
+            "gpu"
+          ],
+          "platform": "x64 & !(osx | uwp)"
+        }
+      ]
+    },
     "ovis": {
       "description": "opencv_ovis module",
       "dependencies": [

package/vcpkg/ports/openimageio/portfile.cmake

@@ -40,7 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         libheif     USE_LIBHEIF
         pybind11    USE_PYTHON
         tools       OIIO_BUILD_TOOLS
-        tools       USE_QT
+        viewer      ENABLE_IV
 )
 
 vcpkg_cmake_configure(
@@ -75,7 +75,14 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO)
 
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(
-        TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool iv
+        TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool
+        AUTO_CLEAN
+    )
+endif()
+
+if("viewer" IN_LIST FEATURES)
+    vcpkg_copy_tools(
+        TOOL_NAMES iv
         AUTO_CLEAN
     )
 endif()

package/vcpkg/ports/openimageio/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "openimageio",
   "version": "2.4.14.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "license": "BSD-3-Clause",
@@ -104,9 +104,18 @@
       ]
     },
     "tools": {
-      "description": "Build openimageio tools",
+      "description": "Build openimageio tools"
+    },
+    "viewer": {
+      "description": "Build openimageio viewer",
       "dependencies": [
         "opengl",
+        {
+          "name": "openimageio",
+          "features": [
+            "tools"
+          ]
+        },
         {
           "name": "qtbase",
           "default-features": false

package/vcpkg/ports/openmpi/portfile.cmake

@@ -1,12 +1,12 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-set(OpenMPI_FULL_VERSION "4.1.3")
+set(OpenMPI_FULL_VERSION "4.1.6")
 set(OpenMPI_SHORT_VERSION "4.1")
 
 vcpkg_download_distfile(ARCHIVE
   URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
   FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
-  SHA512 f7b177121863ef79df6106639d18a89c028442b1314340638273b12025c4dc2cf9b5316cb7e6ecca8b65a51ee40a306a6b0970d7cce727fbb269a14f89af3161
+  SHA512 6fb38cafa75021f12a9674a05056d25cc9bb5e6dd88f26fee73a89736fb741bbfb37efee31e07edb372f21583144ccc2c03cd7861e9055e87699a22740173e0b
 )
 
 vcpkg_extract_source_archive(

package/vcpkg/ports/openmpi/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "openmpi",
-  "version": "4.1.3",
-  "port-version": 2,
+  "version": "4.1.6",
   "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.",
   "homepage": "https://www.open-mpi.org/",
   "supports": "!(windows | uwp)"