@openziti/ziti-sdk-nodejs 0.16.0 → 0.17.0

package/vcpkg/ports/numcpp/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "numcpp",
-  "version": "2.11.0",
+  "version": "2.12.1",
   "description": "C++ implementation of the Python Numpy library",
   "homepage": "https://dpilger26.github.io/NumCpp",
   "license": "MIT",

package/vcpkg/ports/nuspell/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nuspell/nuspell
-    REF v5.1.2
-    SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8
+    REF "v${VERSION}"
+    SHA512 f4119b3fe5944be8f5bc35ccff8d7a93b0f4fa9f129bc97a7b96879a11b5b35bd714b41dd209267417e94c5fed45fd3a74b349f94424f4b90bde07d9694d1d7d
     HEAD_REF master
 )
 

package/vcpkg/ports/nuspell/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "nuspell",
-  "version-semver": "5.1.2",
-  "port-version": 1,
+  "version-semver": "5.1.4",
   "description": [
     "Nuspell is a fast and safe spelling checker software program.",
     "It is designed for languages with rich morphology and complex word compounding.",

package/vcpkg/ports/oatpp-sqlite/fix-usage.patch

@@ -0,0 +1,14 @@
+diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in
+index 5cc12b0..5d94df8 100644
+--- a/cmake/module-config.cmake.in
++++ b/cmake/module-config.cmake.in
+@@ -1,5 +1,9 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(oatpp CONFIG)
++find_dependency(unofficial-sqlite3 CONFIG)
++
+ if(NOT TARGET oatpp::@OATPP_MODULE_NAME@)
+     include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake")
+ endif()

package/vcpkg/ports/oatpp-sqlite/portfile.cmake

@@ -8,6 +8,8 @@ vcpkg_from_github(
     REF ${OATPP_VERSION}
     SHA512 8a208145ee10ed858767b4b56c220b6befd83e6858759128103ce679b889e6218a95ed6627af5098e4d26367be8add82de26e1f1f8ef581b1913b8386f9d56de
     HEAD_REF master
+    PATCHES
+        fix-usage.patch
 )
 
 vcpkg_cmake_configure(
@@ -21,4 +23,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-sqlite CONFIG_PATH lib/cmake/oatpp-s
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/oatpp-sqlite/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "oatpp-sqlite",
   "version": "1.3.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Oat++ SQLite adapter for Oat++ ORM.",
   "homepage": "https://github.com/oatpp/oatpp-sqlite",
   "license": "Apache-2.0",

package/vcpkg/ports/octomap/portfile.cmake

@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OctoMap/octomap
-    REF c4a4304895f6cfc31723dc95df252fe7e756a0ef # v1.9.6
-    SHA512 ec321a5355091acbd3d3fda7c858e2078c29195e73461c8a34db2c4614c6b2e38b35a59671f1071f7eb397cac4df78869f14a13af2e68d64e5a2e2d8727846cd
+    REF "v${VERSION}"
+    SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e
     HEAD_REF master
     PATCHES
       001-fix-exported-targets.patch

package/vcpkg/ports/octomap/vcpkg.json

@@ -1,10 +1,11 @@
 {
   "name": "octomap",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "port-version": 1,
   "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees",
   "homepage": "https://octomap.github.io/",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

package/vcpkg/ports/ode/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO odedevs/ode
     REF ${VERSION}
-    SHA512 3ea6245f622c5ca616cc4ae5e9877526c16d9174262fe107867a98b0976284d530ad71a97e5feac1fbfcc780bcd056330f47d3c9eb2bcc66e0696e17d54b93b1
+    SHA512 d253bc06bca85ed5af95e92acc57b5a9c4382393365c4a0c852a5872a4061ce1bff875a9121624276a60d74e919fb976c2a2b37864203f6c3bcd2def8af953c6
     HEAD_REF master
     PATCHES
 )

package/vcpkg/ports/ode/vcpkg.json

@@ -1,10 +1,11 @@
 {
   "name": "ode",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "port-version": 1,
   "description": "Open Dynamics Engine",
   "homepage": "https://bitbucket.org/odedevs/ode/src/master/",
   "license": "BSD-3-Clause OR LGPL-2.1-or-later",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

package/vcpkg/ports/ogre-next/avoid-name-clashes.patch

@@ -1,3 +1,7 @@
+diff --git a/CMake/FeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake
+similarity index 100%
+rename from CMake/FeatureSummary.cmake
+rename to CMake/OgreFeatureSummary.cmake
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 800e956..436c3d3 100644
 --- a/CMakeLists.txt

package/vcpkg/ports/ogre-next/fix-dependencies.patch

@@ -1,10 +1,7 @@
 diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
 --- a/CMake/Dependencies.cmake
 +++ b/CMake/Dependencies.cmake
-@@ -73,23 +73,26 @@
- # Core dependencies
- #######################################################################
- 
+@@ -76,17 +76,20 @@
  # Find zlib
 -find_package(ZLIB)
 +find_package(ZLIB REQUIRED)
@@ -29,15 +26,46 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
 +find_package(FREETYPE NAMES freetype REQUIRED)
 +set(FREETYPE_LIBRARIES freetype)
  macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
+@@ -107,3 +111,3 @@
+ # Find rapidjson
+-find_package(Rapidjson)
++find_package(Rapidjson NAMES RapidJSON CONFIG REQUIRED)
+ macro_log_feature(Rapidjson_FOUND "rapidjson" "C++ JSON parser" "https://rapidjson.org/" FALSE "" "")
+@@ -257,3 +261,3 @@
+ # ThreadingBuildingBlocks
+-find_package(TBB)
++find_package(TBB CONFIG REQUIRED)
+ macro_log_feature(TBB_FOUND "tbb" "Threading Building Blocks" "http://www.threadingbuildingblocks.org/" FALSE "" "")
+@@ -279,5 +283,5 @@
+ # Find sdl2
+-find_package(SDL2)
++find_package(SDL2 CONFIG REQUIRED)
+ macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "")
  
- find_package(Vulkan)
- macro_log_feature(Vulkan_FOUND "vulkan-sdk" "Vulkan SDK" "https://vulkan.lunarg.com/" FALSE "" "")
+ #######################################################################
 diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
-@@ -43,14 +43,10 @@
+@@ -21,9 +21,7 @@
+ 
+ set(INST_FILES
+-  Packages/FindRapidjson.cmake
+   Packages/FindRemotery.cmake
+-  Packages/FindSDL2.cmake
+   Packages/FindOGRE.cmake
+   Utils/FindPkgMacros.cmake
+   Utils/MacroLogFeature.cmake
+   Utils/PreprocessorUtils.cmake
+@@ -37,18 +35,12 @@
+ if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco")
+   set(INST_FILES ${INST_FILES} Packages/FindPOCO.cmake)
  endif ()
  
+-if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "tbb")
+-  set(INST_FILES ${INST_FILES} Packages/FindTBB.cmake)
+-endif ()
+ 
++
  set(STATIC_INST_FILES
    Packages/FindDirectX.cmake
 -  Packages/FindFreeImage.cmake
@@ -48,8 +76,6 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
 -  Packages/FindZZip.cmake
    Packages/FindSoftimage.cmake
  )
- if (WIN32)
-   set(INST_FILES ${INST_FILES}
 diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake
 similarity index 100%
 rename from CMake/Packages/FindZLIB.cmake
@@ -66,3 +92,15 @@ diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOT
 similarity index 100%
 rename from CMake/Packages/FindFreetype.cmake
 rename to CMake/Packages/FindFreetype_NOTUSE.cmake
+diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2_NOTUSE.cmake
+similarity index 100%
+rename from CMake/Packages/FindSDL2.cmake
+rename to CMake/Packages/FindSDL2_NOTUSE.cmake
+diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB_NOTUSE.cmake
+similarity index 100%
+rename from CMake/Packages/FindTBB.cmake
+rename to CMake/Packages/FindTBB_NOTUSE.cmake
+diff --git a/CMake/Packages/FindRapidjson.cmake b/CMake/Packages/FindRapidjson_NOTUSE.cmake
+similarity index 100%
+rename from CMake/Packages/FindRapidjson.cmake
+rename to CMake/Packages/FindRapidjson_NOTUSE.cmake

package/vcpkg/ports/ogre-next/osx.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,3 +29,3 @@
+ endif()
+-
++set(CMAKE_CXX_STANDARD 17)
+ # Use relative paths
+@@ -387,3 +387,3 @@
+   else()
+-    set(CMAKE_OSX_SYSROOT macosx)
++    # set(CMAKE_OSX_SYSROOT macosx)
+   endif()

package/vcpkg/ports/ogre-next/portfile.cmake

@@ -1,8 +1,3 @@
-# This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile.
-if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
-    message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
-endif()
-
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     message("${PORT} currently requires the following library from the system package manager:\n    Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev")
 endif()
@@ -11,21 +6,16 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OGRECave/ogre-next
     REF v${VERSION}
-    SHA512 62c721680ed77e74b6e1649ab7324bd49fc3c7c2e60ad76a62ec5f899f327d65a140462d75300eac4f41567a8903a748d07a760dc376eddcadf0aeea5a3ca5a7
+    SHA512 52ed2d2a3375c0d35f0dc695b986514484ad1d47966c5c18351d3b09913123b2487b9729738c6b8b1219c1a992a8c8509a2303e097a6eb26497e152a14d48830
     HEAD_REF master
     PATCHES
         toolchain_fixes.patch
-        fix_find_package_sdl2.patch
         avoid-name-clashes.patch
         fix-error-c2039.patch
         fix-dependencies.patch
+        osx.patch
 )
 
-file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
-if(EXISTS "${SOURCE_PATH}/CMake/FeatureSummary.cmake")
-    file(RENAME "${SOURCE_PATH}/CMake/FeatureSummary.cmake" "${SOURCE_PATH}/CMake/OgreFeatureSummary.cmake")
-endif()
-
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(OGRE_STATIC ON)
 else()
@@ -42,6 +32,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF
         -DOGRE_COPY_DEPENDENCIES=OFF
         -DOGRE_BUILD_SAMPLES2=OFF
         -DOGRE_BUILD_TESTS=OFF
@@ -62,14 +53,13 @@ vcpkg_cmake_configure(
         -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
         -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
         -DOGRE_CMAKE_DIR=share/ogre-next
+        -DOGRE_USE_NEW_PROJECT_NAME=ON
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup()
 
-
-
 file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg")
 if(REL_CFGS)
   file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
@@ -86,15 +76,15 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
+#Remove OgreNextMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
 #manual-link subfolder is here to the rescue!
 if(VCPKG_TARGET_IS_WINDOWS)
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
         file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
         if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMain.lib")
         else()
-            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMainStatic.lib")
         endif()
         file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*")
         file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*")
@@ -105,9 +95,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug")
         file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
         if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMain_d.lib")
         else()
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMainStatic_d.lib")
         endif()
         file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*")
         file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*")
@@ -119,7 +109,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake")
     foreach(SHARE_FILE ${SHARE_FILES})
         file(READ "${SHARE_FILE}" _contents)
-        string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}")
+        string(REPLACE "lib/OgreNextMain" "lib/manual-link/OgreNextMain" _contents "${_contents}")
         file(WRITE "${SHARE_FILE}" "${_contents}")
     endforeach()
 endif()
@@ -130,4 +120,23 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
+if(VCPKG_TARGET_IS_OSX)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/")
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
+        file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*")
+        file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*")
+        file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/")
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug")
+        file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*")
+        file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*")
+        file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/")
+    endif() 
+endif()
+
 vcpkg_fixup_pkgconfig()

package/vcpkg/ports/ogre-next/toolchain_fixes.patch

@@ -1,24 +1,21 @@
 diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
-index f3a62f2..b53df6f 100644
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
-@@ -13,10 +13,12 @@
+@@ -13,8 +13,10 @@
  # directory, but can also be used for custom projects.
  #############################################################
  
 -if(WIN32 OR APPLE)
 -	set(OGRE_CMAKE_DIR "CMake")
 -else()
--	set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
+-  set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
 +if(NOT DEFINED OGRE_CMAKE_DIR)
 +  if(WIN32 OR APPLE)
 +    set(OGRE_CMAKE_DIR "CMake")
 +  else()
-+    set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
++    set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake")
 +  endif()
  endif()
- 
- set(INST_FILES
 diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
 index dd4b179..6f158fc 100644
 --- a/CMake/Packages/FindGLSLOptimizer.cmake
@@ -107,35 +104,6 @@ index 6b6d7fa..3667b8b 100644
 +make_library_set(POCO_XML)
  findpkg_finish(POCO_XML)
  
-diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake
-index 4200aa0..35e4ea3 100644
---- a/CMake/Packages/FindTBB.cmake
-+++ b/CMake/Packages/FindTBB.cmake
-@@ -104,7 +104,7 @@ findpkg_framework(TBB)
- find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
- find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
- find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
--make_library_set(TBB_LIBRARY)
-+make_library_set(TBB)
- 
- findpkg_finish(TBB)
- 
-@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES)
- find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} )
- find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
- find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
--make_library_set(TBB_MALLOC_LIBRARY)
-+make_library_set(TBB_MALLOC)
- findpkg_finish(TBB_MALLOC)
- 
- # Look for TBB's malloc proxy package
-@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)
- find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
- find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
- find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
--make_library_set(TBB_MALLOC_PROXY_LIBRARY)
-+make_library_set(TBB_MALLOC_PROXY)
- findpkg_finish(TBB_MALLOC_PROXY)
 diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
 index 53111e0..8dffbbc 100644
 --- a/CMake/Utils/FindPkgMacros.cmake
@@ -185,15 +153,13 @@ index 48af55b..b18ac57 100644
      string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
    else()
 diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
-index 0424ebb..b019269 100644
 --- a/OgreMain/CMakeLists.txt
 +++ b/OgreMain/CMakeLists.txt
-@@ -434,8 +434,6 @@ if (APPLE)
-     set_target_properties(OgreMain PROPERTIES
+@@ -438,7 +438,5 @@ if (APPLE)
+     set_target_properties(${OGRE_NEXT}Main PROPERTIES
          LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo"
      )
 -
 -    set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
    
-   	add_custom_command(TARGET OgreMain POST_BUILD
- 		COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
+ 	add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD

package/vcpkg/ports/ogre-next/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "ogre-next",
-  "version": "2.3.1",
-  "port-version": 3,
+  "version": "2.3.3",
   "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++",
   "homepage": "https://github.com/OGRECave/ogre-next",
   "license": "MIT",
@@ -10,7 +9,10 @@
     "boost-thread",
     "freeimage",
     "freetype",
-    "openvr",
+    {
+      "name": "openvr",
+      "platform": "!osx"
+    },
     "pkgconf",
     "poco",
     "rapidjson",

package/vcpkg/ports/onednn/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oneapi-src/oneDNN
-    REF v3.1.1
-    SHA512 0dae0ccff1e459ce24356694732bf4ee3c459469de70984863e1aed3bc965471793a110dedbb11f2baa762749cea7652a150d2f9a442c299d9ffa00febd87fec
+    REF "v${VERSION}"
+    SHA512 85f424403be4231e57929c77c6e30def3e6c6ae7e706b94585e4228cbebd625eb9f0440084315032310caed066c6746f4dbbbbd2f42660c0de5313d6bce34c1e
     HEAD_REF master
 )
 

package/vcpkg/ports/onednn/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "onednn",
-  "version": "3.1.1",
+  "version": "3.3",
   "description": "oneAPI Deep Neural Network Library (oneDNN)",
   "homepage": "https://github.com/oneapi-src/oneDNN",
   "license": "Apache-2.0",

package/vcpkg/ports/onnx/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/onnx
     REF "v${VERSION}"
-    SHA512 8a525b365fd203f0a59bcf82fa7f2e29d7e0563885ebe38269c596cd4eb949bcfc65d848b92b7abafa7ddecedcfc019f8779097ffcb5087f06037cace24462fc
+    SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
@@ -73,6 +73,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/onnx/bin"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator"
+    "${CURRENT_PACKAGES_DIR}/include/onnx/defs/image"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn"
@@ -82,6 +83,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence"
+    "${CURRENT_PACKAGES_DIR}/include/onnx/defs/text"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml"
     "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training"
     "${CURRENT_PACKAGES_DIR}/include/onnx/examples"

package/vcpkg/ports/onnx/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "onnx",
-  "version-semver": "1.14.0",
+  "version-semver": "1.15.0",
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",

package/vcpkg/ports/onnx-optimizer/portfile.cmake

@@ -4,10 +4,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/optimizer
     REF "v${VERSION}"
-    SHA512 919790201f0d4d3eb107de9ed34c71d289d3c442f38f62721c838c9f60067a8c3478e991682983d8dad59476cab93466e2d23cc6d10b8b921282b939c29a1ad7
+    SHA512 419aeaac60fa27f54708c864a2f907777aaa4de882725c83cade33053dec546ede6f95f7f133b50991e3b9b17e300c1a108729cad00ac99dc5ba5d2982b09737
     HEAD_REF master
     PATCHES
         fix-cmakelists.patch
+        remove-outdate-headers.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)

package/vcpkg/ports/onnx-optimizer/remove-outdate-headers.patch

@@ -0,0 +1,24 @@
+diff --git a/onnxoptimizer/optimize.h b/onnxoptimizer/optimize.h
+index f25e6c3f..506e2554 100644
+--- a/onnxoptimizer/optimize.h
++++ b/onnxoptimizer/optimize.h
+@@ -9,7 +9,6 @@
+ 
+ #include "onnx/common/ir.h"
+ #include "onnx/common/ir_pb_converter.h"
+-#include "onnx/common/stl_backports.h"
+ #include "onnx/proto_utils.h"
+ 
+ #include "onnxoptimizer/pass_manager.h"
+diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h
+index 51a2c161..b8dc26f9 100644
+--- a/onnxoptimizer/pass_registry.h
++++ b/onnxoptimizer/pass_registry.h
+@@ -12,7 +12,6 @@
+ 
+ #include "onnx/common/ir.h"
+ #include "onnx/common/ir_pb_converter.h"
+-#include "onnx/common/stl_backports.h"
+ #include "onnx/proto_utils.h"
+ #include "onnxoptimizer/passes/adjust_add.h"
+ #include "onnxoptimizer/passes/adjust_slice_and_matmul.h"

package/vcpkg/ports/onnx-optimizer/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "onnx-optimizer",
-  "version-semver": "0.3.17",
+  "version-semver": "0.3.18",
   "description": "Actively maintained ONNX Optimizer",
   "homepage": "https://github.com/onnx/optimizer",
   "license": "Apache-2.0",

package/vcpkg/ports/onnxruntime-gpu/portfile.cmake

@@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/microsoft/onnxruntime/releases/download/v${VERSION}/onnxruntime-win-x64-gpu-${VERSION}.zip"
     FILENAME "onnxruntime-win-x64-gpu-${VERSION}.zip"
-    SHA512 6e95199e8cfdee7c056811c2c27f45f7b45bd00b48424d331d8685993102d1b59e14fc3c86e7307b780531ac3e5dcbe760c93018d1b1f106bb36fe32dc44974c
+    SHA512 7ab350a2ede0fc8c716cf083e16a9303acbcc855982e53900f8843773ec32fd20a7396f0bde82bb29f382012b1d05dea41708797f112d9096c8b5048fc5eb7d8
 )
 
 vcpkg_extract_source_archive(
@@ -17,7 +17,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH REPO_PATH
     REPO microsoft/onnxruntime
     REF v${VERSION}
-    SHA512 c9ad2ab1102bb97bdd88aa8e06432fff2960fb21172891eee9631ff7cbbdf3366cd7cf5c0baa494eb883135eab47273ed3128851ff4d9adfa004a479e941b6b5
+    SHA512 f2fec4ded88da6bf67ae7d0aa3082736cb3b8ba29e723b5a516d7632b68ce02aed461f24d3e82cbab20757729e0ab45d736bd986c9b7395f2879b16a091c12a1
 )
 
 file(COPY

package/vcpkg/ports/onnxruntime-gpu/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "onnxruntime-gpu",
-  "version": "1.15.1",
+  "version": "1.16.3",
   "description": "onnxruntime (GPU)",
   "homepage": "https://github.com/microsoft/onnxruntime",
   "license": "MIT",

package/vcpkg/ports/open62541/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open62541/open62541
     REF "v${VERSION}"
-    SHA512 bb45d288a097b461d2a7106153c7f4b4c38c73cf767fe15c6c9c2213a6e3fcaf9b436fb70c1e7c6dcbc8ef45f232a5bd2f140285fab486358cb5a3a17da96d6e
+    SHA512 48ae61fd096c3a45f57ecc70bec9bb4223d046eed017532937c99883e4e92f79d7425b4db02c1a7e451764b787313efd76b2ae3cd3011d575154199d5350a790
     HEAD_REF master
 )
 
@@ -34,6 +34,7 @@ vcpkg_cmake_configure(
         ${FEATURE_OPTIONS}
         ${OPEN62541_ENCRYPTION_OPTIONS}
         -DOPEN62541_VERSION=${VERSION}
+        -DUA_MSVC_FORCE_STATIC_CRT=OFF
     OPTIONS_DEBUG
         -DCMAKE_DEBUG_POSTFIX=d
 )
@@ -47,4 +48,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/open62541/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "open62541",
-  "version": "1.3.5",
+  "version": "1.3.8",
   "port-version": 1,
   "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
   "homepage": "https://open62541.org",

package/vcpkg/ports/openblas/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xianyi/OpenBLAS
     REF "v${VERSION}"
-    SHA512 fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0
+    SHA512 69bcf8082575b01ce1734fc9d33454314964a7e81ff29a7c1a764af3083ac0dc24289fd72bbe22c9583398bda7b658d6e4ab1d5036e43412745f0be3c2185b3c
     HEAD_REF develop
     PATCHES
         uwp.patch

package/vcpkg/ports/openblas/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "openblas",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
   "homepage": "https://github.com/xianyi/OpenBLAS",
   "license": "BSD-3-Clause",