@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/libsbml/portfile.cmake

@@ -2,16 +2,24 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sbmlteam/libsbml
     REF "v${VERSION}"
-    SHA512 c40f164ebd05a36f140ce2684dedb4bbccc51a2732383d3935fca1258738a9b9ba5bc1be2061f3b113b213e5cbb7fe22e9dca43ff78d91964c79cad093e55466
+    SHA512 2770c1d3295e22ed8fb8dfa2480efa160fc61fbeeca3a9e214e210acb3fd6531a5cfb22eeb72c5334158bf8ba21c27015d0910487a7ef060f594a708f197676c
     HEAD_REF development
     PATCHES
-        fix-deps-libxml.patch
+        dependencies.diff
+        dirent.diff
+        no-docs.diff
+        test-shared.diff
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LIBRARY)
 
+if("expat" IN_LIST FEATURES AND "libxml2" IN_LIST FEATURES)
+    message("Feature expat conflicts with feature libxml2. Selecting libxml2.")
+    list(REMOVE_ITEM FEATURES "expat")
+endif()
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         comp        ENABLE_COMP
@@ -22,76 +30,46 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         qual        ENABLE_QUAL
         render      ENABLE_RENDER
         bzip2       WITH_BZIP2
+        expat       WITH_EXPAT
+        libxml2     WITH_LIBXML
         zlib        WITH_ZLIB
         test        WITH_CHECK
         namespace   WITH_CPP_NAMESPACE
 )
 
-# Handle conflict features
-set(WITH_EXPAT OFF)
-if ("expat" IN_LIST FEATURES)
-    set(WITH_EXPAT ON)
-endif()
-
-set(WITH_LIBXML OFF)
-if ("libxml2" IN_LIST FEATURES)
-    set(WITH_LIBXML ON)
-endif()
-
-if (WITH_EXPAT AND WITH_LIBXML)
-    message("Feature expat conflict with feature libxml2, currently using libxml2...")
-    set(WITH_EXPAT OFF)
-endif()
-
-if ("test" IN_LIST FEATURES AND WIN32)
-    message(FATAL_ERROR "Feature test only support UNIX.")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS ${FEATURE_OPTIONS}
-        -DWITH_EXPAT=${WITH_EXPAT}
-        -DWITH_LIBXML=${WITH_LIBXML}
+    OPTIONS
+        ${FEATURE_OPTIONS}
         -DENABLE_L3V2EXTENDEDMATH:BOOL=ON
         -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME}
         -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY}
         -DLIBSBML_SKIP_STATIC_LIBRARY=${DYNAMIC_LIBRARY}
+    MAYBE_UNUSED_VARIABLES
+        WITH_STATIC_RUNTIME
 )
 
 vcpkg_cmake_install()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
-else()
-    vcpkg_cmake_config_fixup(PACKAGE_NAME libsbml-static CONFIG_PATH lib/cmake)
-    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libsbml-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-endif()
-
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt")
-if (TXT_FILES)
-    file(REMOVE ${TXT_FILES})
-endif()
-file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt")
-if (TXT_FILES)
-    file(REMOVE ${TXT_FILES})
-endif()
-
-if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-endif()
-
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md")
+foreach(name IN ITEMS libsbml libsbml-static sbml sbml-static)
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${name}-config.cmake")
+        vcpkg_cmake_config_fixup(PACKAGE_NAME "${name}" CONFIG_PATH lib/cmake)
+        if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake")
+            configure_file("${CURRENT_PORT_DIR}/libsbml-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY)
+        endif()
+        break()
+    endif()
+endforeach()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/common/extern.h" "defined LIBSBML_STATIC" "1")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/xml/XMLExtern.h" "defined(LIBLAX_STATIC)" "1")
 endif()
 
-if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md")
-endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
-vcpkg_fixup_pkgconfig()

package/vcpkg/ports/libsbml/test-shared.diff

@@ -0,0 +1,14 @@
+diff --git a/src/sbml/test/CMakeLists.txt b/src/sbml/test/CMakeLists.txt
+index 7a408d7..462d58a 100644
+--- a/src/sbml/test/CMakeLists.txt
++++ b/src/sbml/test/CMakeLists.txt
+@@ -49,6 +49,9 @@ if (EXTRA_INCLUDE_DIRS)
+  include_directories(${EXTRA_INCLUDE_DIRS})
+ endif(EXTRA_INCLUDE_DIRS)
+ 
++if(NOT TARGET ${LIBSBML_LIBRARY}-static)
++	add_library(${LIBSBML_LIBRARY}-static ALIAS ${LIBSBML_LIBRARY})
++endif()
+ 
+ add_executable(test_sbml_sbml ${TEST_FILES})
+ target_link_libraries(test_sbml_sbml ${LIBSBML_LIBRARY}-static CHECK::CHECK)

package/vcpkg/ports/libsbml/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libsbml",
-  "version": "5.20.0",
-  "port-version": 1,
+  "version": "5.20.2",
   "description": "A library for reading / writing SBML files",
   "homepage": "https://github.com/sbmlteam/libsbml",
   "license": "LGPL-2.1",
@@ -69,6 +68,7 @@
       "dependencies": [
         {
           "name": "libsbml",
+          "default-features": false,
           "features": [
             "layout"
           ]
@@ -77,8 +77,10 @@
     },
     "test": {
       "description": "Unit testing of libSBMLs implementation",
+      "supports": "!windows | mingw | (windows & static)",
       "dependencies": [
-        "check"
+        "check",
+        "dirent"
       ]
     },
     "zlib": {

package/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1b28fe..b9a9d40 100644
+index c4b291c..2475881 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -84,13 +84,13 @@ install (FILES
+@@ -86,13 +86,13 @@ install (FILES
  		DESTINATION 
  			"${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
  
@@ -20,10 +20,10 @@ index e1b28fe..b9a9d40 100644
  
  set (PROJECT_CMAKE_NAME		"${PROJECT_NAME}-3")
 diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
-index fa5a91a..86f1be7 100644
+index dd2d339..8480a5e 100644
 --- a/sigc++/CMakeLists.txt
 +++ b/sigc++/CMakeLists.txt
-@@ -23,7 +23,7 @@ set (SOURCE_FILES
+@@ -24,7 +24,7 @@ set (SOURCE_FILES
  
  set (SIGCPP_LIB_NAME sigc-${SIGCXX_API_VERSION})
  

package/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch

@@ -1,32 +1,19 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1b28fe..73990c4 100644
+index 2475881..3828a13 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -53,6 +53,13 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++")
+@@ -54,6 +54,14 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++")
  include_directories (${sigc++_SOURCE_DIR})
  include_directories (${sigc++_BINARY_DIR})
  
 +if (BUILD_SHARED_LIBS)
-+    add_compile_options (-DBUILD_SHARED)
 +    if (MSVC)
 +        add_compile_options (-D_WINDLL)
 +    endif()
++else()
++    add_compile_options (-DLIBSIGCXX_STATIC)
 +endif()
 +
  configure_file (sigc++config.h.cmake sigc++config.h)
  
  set (prefix ${CMAKE_INSTALL_PREFIX})
-diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake
-index 74d348a..43a99c5 100644
---- a/sigc++config.h.cmake
-+++ b/sigc++config.h.cmake
-@@ -16,7 +16,9 @@
- # if defined(_MSC_VER)
- #  define SIGC_MSC 1
- #  define SIGC_WIN32 1
-+# ifdef BUILD_SHARED
- #  define SIGC_DLL 1
-+# endif
- # elif defined(__CYGWIN__)
- #  define SIGC_CONFIGURE 1
- # elif defined(__MINGW32__)

package/vcpkg/ports/libsigcpp/fix_include_path.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73990c4..38424a2 100644
+index 3828a13..bc0a854 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ add_custom_target(uninstall
+@@ -87,7 +87,7 @@ endif()
  install (FILES
  			"${CMAKE_CURRENT_BINARY_DIR}/sigc++config.h"
  		DESTINATION
@@ -11,7 +11,7 @@ index 73990c4..38424a2 100644
  
  install (FILES 
  			"${CMAKE_CURRENT_BINARY_DIR}/sigc++-${SIGCXX_API_VERSION}.pc"
-@@ -102,7 +102,7 @@ add_subdirectory (sigc++)
+@@ -105,7 +105,7 @@ add_subdirectory (sigc++)
  
  set (PROJECT_CMAKE_NAME		"${PROJECT_NAME}-3")
  set (VERSION_CONFIG     	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CMAKE_NAME}ConfigVersion.cmake")
@@ -21,20 +21,20 @@ index 73990c4..38424a2 100644
  set (CONFIG_INSTALL_DIR 	"lib/cmake/${PROJECT_CMAKE_NAME}")
  set (TARGETS_EXPORT_NAME    "${PROJECT_CMAKE_NAME}Targets")
 diff --git a/sigc++.pc.in b/sigc++.pc.in
-index 05de315..171b38d 100644
+index e162f2f..7e9b298 100644
 --- a/sigc++.pc.in
 +++ b/sigc++.pc.in
 @@ -15,4 +15,4 @@ Description: Typesafe signal and callback system for C++
  Version: @PACKAGE_VERSION@
  URL: https://libsigcplusplus.github.io/libsigcplusplus/
  Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@
--Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include
-+Cflags: -I${includedir}
+-Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include @MSVC_STATIC_CXXFLAG@
++Cflags: -I${includedir} @MSVC_STATIC_CXXFLAG@
 diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
-index 86f1be7..076959b 100644
+index 8480a5e..b51b023 100644
 --- a/sigc++/CMakeLists.txt
 +++ b/sigc++/CMakeLists.txt
-@@ -29,7 +29,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION})
+@@ -30,7 +30,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION})
  set_property(TARGET ${SIGCPP_LIB_NAME}  PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION})
  target_compile_definitions( ${SIGCPP_LIB_NAME} PRIVATE -DSIGC_BUILD )
  

package/vcpkg/ports/libsigcpp/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsigcplusplus/libsigcplusplus
     REF "${VERSION}"
-    SHA512 8b80f0988daea4eb2c827be57de21167f54a9bf3e9704d64d17d12aef064d8ad87d00f95ce4b5add7666452561c5ca42aa45cf677e54068974a4ea813af3b235
+    SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27
     HEAD_REF master
     PATCHES
         disable_tests_enable_static_build.patch

package/vcpkg/ports/libsigcpp/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "libsigcpp",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "Typesafe callback framework for C++",
   "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/",
   "license": "LGPL-3.0-or-later",

package/vcpkg/ports/libsndfile/001-avoid-installing-find-modules.patch

@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b501f08..022864f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -855,11 +847,6 @@ if (ENABLE_PACKAGE_CONFIG)
+ 			${CMAKE_CURRENT_BINARY_DIR}/SndFileConfigVersion.cmake
+ 		DESTINATION	${CMAKE_INSTALL_PACKAGEDIR}
+ 		)
+-
+-		if (NOT BUILD_SHARED_LIBS AND FIND_MODULES_INSTALL_LIST)
+-			file(COPY ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+-			install(FILES ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
+-		endif ()
+ else ()
+ 
+ 	install (TARGETS sndfile ${sdnfile_PROGRAMS}

package/vcpkg/ports/libsndfile/portfile.cmake

@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsndfile/libsndfile
-    REF 1.2.0
-    SHA512 58d2567a4eb67f9af7a472ae02f62ce64bb6f54687bf670c84335a4d1c194d3e8d6933089ae9e2603137a035155447df4b0f59c054731d74d9814c1b757c833a
+    REF 1.2.2
+    SHA512 fb8b4d367240a8ac9d55be6f053cb19419890691c56a8552d1600d666257992b6e8e41a413a444c9f2d6c5d71406013222c92a3bfa67228944a26475444240a1
     HEAD_REF master
+    PATCHES
+        001-avoid-installing-find-modules.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

package/vcpkg/ports/libsndfile/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libsndfile",
-  "version-semver": "1.2.0",
-  "port-version": 2,
+  "version-semver": "1.2.2",
   "description": "A library for reading and writing audio files",
   "homepage": "https://github.com/erikd/libsndfile",
   "license": "LGPL-2.1-or-later",

package/vcpkg/ports/libspatialite/portfile.cmake

@@ -19,7 +19,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS unused
     FEATURES
         freexl          ENABLE_FREEXL
         gcp             ENABLE_GCP
-        geocallbacks    ENABLE_GEOCALLBACKS
         rttopo          ENABLE_RTTOPO
 )
 
@@ -39,9 +38,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     if(ENABLE_GCP)
         string(APPEND CL_FLAGS " /DENABLE_GCP")
     endif()
-    if(NOT ENABLE_GEOCALLBACKS)
-        string(APPEND CL_FLAGS " /DOMIT_GEOCALLBACKS")
-    endif()
     if(ENABLE_RTTOPO)
         string(APPEND CL_FLAGS " /DENABLE_RTTOPO")
     endif()
@@ -184,10 +180,10 @@ else()
             ${TARGET_ALIAS}
             ${FREEXL_OPTION}
             ${GCP_OPTION}
-            ${GEOCALLBACKS_OPTION}
             ${RTTOPO_OPTION}
             "--disable-examples"
             "--disable-minizip"
+            "cross_compiling=yes" # avoid conftest rpath trouble
         OPTIONS_DEBUG
             "LIBS=${PKGCONFIG_LIBS_DEBUG} ${SYSTEM_LIBS}"
         OPTIONS_RELEASE

package/vcpkg/ports/libspatialite/vcpkg.json

@@ -1,14 +1,16 @@
 {
   "name": "libspatialite",
   "version": "5.1.0",
+  "port-version": 1,
   "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.",
-  "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources",
+  "homepage": "https://www.gaia-gis.it/fossil/libspatialite/index",
   "license": null,
   "dependencies": [
     "geos",
     "libiconv",
     {
       "name": "libxml2",
+      "default-features": false,
       "features": [
         "http"
       ]
@@ -28,8 +30,7 @@
     "zlib"
   ],
   "default-features": [
-    "freexl",
-    "geocallbacks"
+    "freexl"
   ],
   "features": {
     "freexl": {
@@ -41,9 +42,6 @@
     "gcp": {
       "description": "Ground control points support. This feature reduces the license options to GPLv2+."
     },
-    "geocallbacks": {
-      "description": "Geometry callbacks support."
-    },
     "rttopo": {
       "description": "RTTOPO support. This feature reduces the license options to GPLv2+.",
       "dependencies": [

package/vcpkg/ports/libspng/fix-spngconfig-cmake.patch

@@ -0,0 +1,11 @@
+diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
+index d0123db..5756179 100644
+--- a/cmake/Config.cmake.in
++++ b/cmake/Config.cmake.in
+@@ -1,5 +1,6 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
+ find_dependency(ZLIB REQUIRED)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")

package/vcpkg/ports/libspng/portfile.cmake

@@ -0,0 +1,33 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO randy408/libspng
+    REF "v${VERSION}"
+    SHA512 cd729653599ed97f80d19f3048c1b3bc2ac16f922b3465804b1913bc45d9fc8b28b56bc2121fda36e9d3dcdd12612cced5383313b722a5342b613f8781879f1a
+    HEAD_REF master
+    PATCHES
+        fix-spngconfig-cmake.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SPNG_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPNG_BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DSPNG_STATIC=${SPNG_BUILD_STATIC}
+        -DSPNG_SHARED=${SPNG_BUILD_SHARED}
+        -DBUILD_EXAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spng PACKAGE_NAME spng)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/libspng/usage

@@ -0,0 +1,4 @@
+libspng provides CMake targets:
+
+    find_package(SPNG CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:spng::spng>,spng::spng,spng::spng_static>) 

package/vcpkg/ports/libspng/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "libspng",
+  "version": "0.7.4",
+  "description": "Simple, modern libpng alternative",
+  "homepage": "https://github.com/randy408/libspng",
+  "license": "BSD-2-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}

package/vcpkg/ports/libssh/portfile.cmake

@@ -14,7 +14,6 @@ vcpkg_extract_source_archive(SOURCE_PATH
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        mbedtls WITH_MBEDTLS
         zlib    WITH_ZLIB
 )
 

package/vcpkg/ports/libssh/vcpkg.json

@@ -1,18 +1,15 @@
 {
   "name": "libssh",
   "version": "0.10.5",
+  "port-version": 1,
   "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side",
   "homepage": "https://www.libssh.org/",
   "license": "LGPL-2.1-only",
   "supports": "!uwp & !xbox",
   "dependencies": [
     {
-      "name": "libssh",
-      "default-features": false,
-      "features": [
-        "mbedtls"
-      ],
-      "platform": "android"
+      "name": "openssl",
+      "default-features": false
     },
     {
       "name": "vcpkg-cmake",
@@ -23,43 +20,7 @@
       "host": true
     }
   ],
-  "default-features": [
-    "crypto"
-  ],
   "features": {
-    "crypto": {
-      "description": "Default crypto backend",
-      "dependencies": [
-        {
-          "name": "libssh",
-          "features": [
-            "mbedtls"
-          ]
-        }
-      ]
-    },
-    "mbedtls": {
-      "description": "Crypto support (mbedTLS)",
-      "dependencies": [
-        {
-          "name": "mbedtls",
-          "default-features": false
-        },
-        {
-          "name": "mbedtls",
-          "features": [
-            "pthreads"
-          ],
-          "platform": "!android"
-        }
-      ]
-    },
-    "openssl": {
-      "description": "Crypto support (OpenSSL)",
-      "dependencies": [
-        "openssl"
-      ]
-    },
     "zlib": {
       "description": "libssh with zlib",
       "dependencies": [

package/vcpkg/ports/libsystemd/portfile.cmake

@@ -7,6 +7,8 @@ vcpkg_from_github(
     pkgconfig.patch
 )
 
+vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")
+
 vcpkg_configure_meson(
   SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS

package/vcpkg/ports/libsystemd/vcpkg.json

@@ -1,11 +1,16 @@
 {
   "name": "libsystemd",
   "version": "254",
+  "port-version": 1,
   "description": "Libsystemd",
   "homepage": "https://github.com/systemd/systemd",
   "license": "LGPL-2.1+",
   "supports": "linux",
   "dependencies": [
+    {
+      "name": "gperf",
+      "host": true
+    },
     "libcap",
     "liblzma",
     "libmount",

package/vcpkg/ports/libtheora/CMakeLists.txt

@@ -141,3 +141,16 @@ install(EXPORT unofficial-theora-targets
   NAMESPACE unofficial::theora::
   DESTINATION "lib/unofficial-theora"
 )
+
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(libdir "\${prefix}/lib")
+set(exec_prefix "\${prefix}")
+set(includedir "\${prefix}/include")
+configure_file(theora.pc.in theora.pc @ONLY)
+configure_file(theoradec.pc.in theoradec.pc @ONLY)
+configure_file(theoraenc.pc.in theoraenc.pc @ONLY)
+
+install(
+  FILES "${PROJECT_BINARY_DIR}/theora.pc" "${PROJECT_BINARY_DIR}/theoradec.pc" "${PROJECT_BINARY_DIR}/theoraenc.pc"
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)

package/vcpkg/ports/libtheora/portfile.cmake

@@ -21,12 +21,13 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        "-DVERSION:STRING=${VERSION}"
         -DUSE_X86=${THEORA_X86_OPT}
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/unofficial-theora" PACKAGE_NAME "unofficial-theora")
-
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

package/vcpkg/ports/libtheora/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libtheora",
   "version-string": "1.2.0alpha1-20170719",
-  "port-version": 6,
+  "port-version": 7,
   "description": "Theora is a free and open video compression format from the Xiph.org Foundation.",
   "homepage": "https://github.com/xiph/theora",
   "license": null,

package/vcpkg/ports/libtommath/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libtom/libtommath
-    REF v1.2.0
-    SHA512 500bce4467d6cdb0b014e6c66d3b994a8d63b51475db6c3cd77c15c8368fbab4e3b5c458fcd5b35838b74c457a33c15b42d2356964f5ef2a0bd31fd544735c9a
+    REF "v${VERSION}"
+    SHA512 8da4a935913e8a44a24ba7d8c2bc4926398bdc9aea0cd4975418771979c2b7667c2ee04e8a7e38f04cc87abe5bb369fcbf9167ab662ad747602fc840cb3788e6
     HEAD_REF develop
 )
 

package/vcpkg/ports/libtommath/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libtommath",
-  "version": "1.2.0",
-  "port-version": 3,
+  "version": "1.2.1",
   "description": "LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C.",
   "homepage": "https://www.libtom.net/LibTomMath/"
 }

package/vcpkg/ports/libunibreak/portfile.cmake

@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO adah1972/libunibreak
-  REF libunibreak_5_0 # libunibreak_5_0
-  SHA512 909c12cf5df92f0374050fc7a0ef9e91bc1efe6a5dc5a80f4e2c81a507f1228ecaba417c3ee001e11b2422024bea68cc14eb66e08360ae69f830cdaa18764484
+  REF libunibreak_5_1
+  SHA512 c47d6445cab36febb214b31aeb48585a4d3685714588079e84be87019f6e6ffb752e0e0e527232e2d164b1efeeeea64b8b4b21e605ebc60f10fb5a169edc2ed0
   HEAD_REF master
 )