@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/libunibreak/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libunibreak",
-  "version": "5.0",
-  "port-version": 1,
+  "version": "5.1",
   "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.",
   "homepage": "https://github.com/adah1972/libunibreak",
   "license": "zlib-acknowledgement",

package/vcpkg/ports/liburing/fix-configure.patch

@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 28f3eb0..b3ac6bc 100755
+index 88b8ee7..bf9312f 100755
 --- a/configure
 +++ b/configure
-@@ -36,7 +36,7 @@ for opt do
+@@ -20,7 +20,7 @@ for opt do
    ;;
    --mandir=*) mandir="$optarg"
    ;;
@@ -11,23 +11,22 @@ index 28f3eb0..b3ac6bc 100755
    ;;
    --cc=*) cc="$optarg"
    ;;
-@@ -44,10 +44,12 @@ for opt do
+@@ -28,10 +28,12 @@ for opt do
    ;;
-   --nolibc) nolibc_deprecated
+   --use-libc) use_libc=yes
    ;;
 +  --enable-shared) ENABLE_SHARED=1
 +  ;;
 +  --enable-static) ENABLE_SHARED=0
-+  ;;  
++  ;;
    *)
--    echo "ERROR: unknown option $opt"
+     echo "ERROR: unknown option $opt"
 -    echo "Try '$0 --help' for more information"
 -    exit 1
-+    echo "WARNING: unknown option $opt"
    ;;
    esac
  done
-@@ -146,6 +148,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak
+@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak
  printf "# Configured with:" >> $config_host_mak
  printf " '%s'" "$0" "$@" >> $config_host_mak
  echo >> $config_host_mak

package/vcpkg/ports/liburing/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO axboe/liburing
     REF "liburing-${VERSION}"
-    SHA512 8033f813262472b695d15ce20cc6cbe76a5577f16bfa7e8bc2f21c7925ec831b0f2eaf135af721e80cccce9ebe7f4431148dba2e66fa5f0278be457d9aca6535
+    SHA512 53742c23211de7194322874eb8186b942ccc1611c231d49f60fd1d8bc2bb93d231ed521af77802db68c30557d71fa5799ae40cbacfc24ba1db3d650c7ba8cc62
     HEAD_REF master
     PATCHES
         fix-configure.patch     # ignore unsupported options, handle ENABLE_SHARED

package/vcpkg/ports/liburing/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "liburing",
-  "version": "2.4",
+  "version": "2.5",
   "description": "Linux-native io_uring I/O access library",
   "homepage": "https://github.com/axboe/liburing",
   "license": "MIT OR LGPL-2.1 OR GPL-2.0",

package/vcpkg/ports/libusb/portfile.cmake

@@ -41,9 +41,21 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
       vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" " -lusb-1.0" " -llibusb-1.0")
   endif()
 else()
+    vcpkg_list(SET MAKE_OPTIONS)
+    vcpkg_list(SET LIBUSB_LINK_LIBRARIES)
+    if(VCPKG_TARGET_IS_EMSCRIPTEN)
+        vcpkg_list(APPEND MAKE_OPTIONS BUILD_TRIPLET --host=wasm32)
+    endif()
+    if("udev" IN_LIST FEATURES)
+        vcpkg_list(APPEND MAKE_OPTIONS "--enable-udev")
+        vcpkg_list(APPEND LIBUSB_LINK_LIBRARIES udev)
+    else()
+        vcpkg_list(APPEND MAKE_OPTIONS "--disable-udev")
+    endif()
     vcpkg_configure_make(
         SOURCE_PATH "${SOURCE_PATH}"
         AUTOCONFIG
+        OPTIONS ${MAKE_OPTIONS}
     )
     vcpkg_install_make()
 endif()

package/vcpkg/ports/libusb/vcpkg-cmake-wrapper.cmake

@@ -8,9 +8,7 @@ select_library_configurations(LIBUSB)
 
 set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}")
 
-if (@VCPKG_TARGET_IS_LINUX@)
-    list(APPEND LIBUSB_LIBRARIES udev)
-endif()
+list(APPEND LIBUSB_LIBRARIES @LIBUSB_LINK_LIBRARIES@)
 
 if (@VCPKG_TARGET_IS_OSX@)
     list(APPEND LIBUSB_LIBRARIES "-framework Cocoa")

package/vcpkg/ports/libusb/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libusb",
   "version": "1.0.26.11791",
-  "port-version": 3,
+  "port-version": 5,
   "description": "a cross-platform library to access USB devices",
   "homepage": "https://github.com/libusb/libusb",
   "license": "LGPL-2.1-or-later",
@@ -12,5 +12,17 @@
       "host": true,
       "platform": "windows"
     }
-  ]
+  ],
+  "default-features": [
+    {
+      "name": "udev",
+      "platform": "linux"
+    }
+  ],
+  "features": {
+    "udev": {
+      "description": "Enable udev",
+      "supports": "linux"
+    }
+  }
 }

package/vcpkg/ports/libuv/vcpkg.json

@@ -1,9 +1,11 @@
 {
   "name": "libuv",
   "version-semver": "1.46.0",
+  "port-version": 1,
   "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.",
   "homepage": "https://github.com/libuv/libuv",
   "license": "BSD-3-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

package/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch

@@ -1,5 +1,5 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 119d206..41bac75 100644
+index 110f16e..c161d0e 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
 @@ -1038,7 +1038,7 @@ EOF
@@ -85,21 +85,19 @@ index 58bb66b..b4cad6c 100644
                  fi
              fi
 diff --git a/configure b/configure
-index beea650..91ae3c8 100644
+index ae289f7..78f5fc1 100644
 --- a/configure
 +++ b/configure
-@@ -102,16 +102,24 @@ all_platforms="${all_platforms} arm64-darwin-gcc"
- all_platforms="${all_platforms} arm64-darwin20-gcc"
+@@ -103,6 +103,8 @@ all_platforms="${all_platforms} arm64-darwin20-gcc"
  all_platforms="${all_platforms} arm64-darwin21-gcc"
+ all_platforms="${all_platforms} arm64-darwin22-gcc"
  all_platforms="${all_platforms} arm64-linux-gcc"
 +all_platforms="${all_platforms} arm64-uwp-vs16"
 +all_platforms="${all_platforms} arm64-uwp-vs17"
  all_platforms="${all_platforms} arm64-win64-gcc"
  all_platforms="${all_platforms} arm64-win64-vs15"
-+all_platforms="${all_platforms} arm64-win64-vs16"
-+all_platforms="${all_platforms} arm64-win64-vs17"
- all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8
- all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
+ all_platforms="${all_platforms} arm64-win64-vs16"
+@@ -112,6 +114,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
  all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8
  all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8
  all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8
@@ -108,12 +106,7 @@ index beea650..91ae3c8 100644
  all_platforms="${all_platforms} armv7-win32-gcc"
  all_platforms="${all_platforms} armv7-win32-vs14"
  all_platforms="${all_platforms} armv7-win32-vs15"
-+all_platforms="${all_platforms} armv7-win32-vs16"
-+all_platforms="${all_platforms} armv7-win32-vs17"
- all_platforms="${all_platforms} armv7s-darwin-gcc"
- all_platforms="${all_platforms} armv8-linux-gcc"
- all_platforms="${all_platforms} loongarch32-linux-gcc"
-@@ -138,6 +146,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
+@@ -143,6 +147,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
  all_platforms="${all_platforms} x86-linux-icc"
  all_platforms="${all_platforms} x86-os2-gcc"
  all_platforms="${all_platforms} x86-solaris-gcc"
@@ -122,7 +115,7 @@ index beea650..91ae3c8 100644
  all_platforms="${all_platforms} x86-win32-gcc"
  all_platforms="${all_platforms} x86-win32-vs14"
  all_platforms="${all_platforms} x86-win32-vs15"
-@@ -161,6 +171,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
+@@ -167,6 +173,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
  all_platforms="${all_platforms} x86_64-linux-gcc"
  all_platforms="${all_platforms} x86_64-linux-icc"
  all_platforms="${all_platforms} x86_64-solaris-gcc"
@@ -131,7 +124,7 @@ index beea650..91ae3c8 100644
  all_platforms="${all_platforms} x86_64-win64-gcc"
  all_platforms="${all_platforms} x86_64-win64-vs14"
  all_platforms="${all_platforms} x86_64-win64-vs15"
-@@ -485,11 +497,10 @@ process_targets() {
+@@ -491,11 +499,10 @@ process_targets() {
      ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
      ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
      DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
@@ -147,7 +140,7 @@ index beea650..91ae3c8 100644
      if [ -f "${source_path}/build/make/version.sh" ]; then
          ver=`"$source_path/build/make/version.sh" --bare "$source_path"`
          DIST_DIR="${DIST_DIR}-${ver}"
-@@ -578,6 +589,10 @@ process_detect() {
+@@ -584,6 +591,10 @@ process_detect() {
  
              # Specialize windows and POSIX environments.
              case $toolchain in

package/vcpkg/ports/libvpx/0005-fix-arm64-build.patch

@@ -0,0 +1,13 @@
+diff --git a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
+index 33753f7..997775a 100644
+--- a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
++++ b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c
+@@ -220,7 +220,7 @@ int vp9_diamond_search_sad_neon(const MACROBLOCK *x,
+       // Look up the component cost of the residual motion vector
+       {
+         uint32_t cost[4];
+-        int16_t __attribute__((aligned(16))) rowcol[8];
++        DECLARE_ALIGNED(16, int16_t, rowcol[8]);
+         vst1q_s16(rowcol, v_diff_mv_w);
+ 
+         // Note: This is a use case for gather instruction

package/vcpkg/ports/libvpx/portfile.cmake

@@ -1,17 +1,16 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(LIBVPX_VERSION 1.12.0)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO webmproject/libvpx
-    REF v${LIBVPX_VERSION}
-    SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
+    REF "v${VERSION}"
+    SHA512 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
     HEAD_REF master
     PATCHES
         0002-Fix-nasm-debug-format-flag.patch
         0003-add-uwp-v142-and-v143-support.patch
         0004-remove-library-suffixes.patch
+        0005-fix-arm64-build.patch # Upstream commit: https://github.com/webmproject/libvpx/commit/858a8c611f4c965078485860a6820e2135e6611b
 )
 
 vcpkg_find_acquire_program(PERL)
@@ -108,11 +107,11 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     )
 
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
-        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
+        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
     elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
-        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
+        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
     else()
-        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
+        set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx")
     endif()
     file(
         INSTALL
@@ -137,6 +136,7 @@ else()
 
     set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug")
     set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}")
+    set(AS_NASM "--as=nasm")
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
@@ -156,20 +156,58 @@ else()
         set(LIBVPX_TARGET_ARCH "x86")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
         set(LIBVPX_TARGET_ARCH "x86_64")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+        set(LIBVPX_TARGET_ARCH "armv7")
     elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
         set(LIBVPX_TARGET_ARCH "arm64")
     else()
         message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}")
     endif()
 
-	if(VCPKG_TARGET_IS_MINGW)
-		if(LIBVPX_TARGET_ARCH STREQUAL "x86")
-			set(LIBVPX_TARGET "x86-win32-gcc")
-		else()
-			set(LIBVPX_TARGET "x86_64-win64-gcc")
-		endif()
-	elseif(VCPKG_TARGET_IS_LINUX)
+    vcpkg_cmake_get_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+
+    # Set environment variables for configure
+    if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$")
+        message(STATUS "Cross-building for ${TARGET_TRIPLET} with ${CMAKE_MATCH_1}")
+        set(ENV{CROSS} ${CMAKE_MATCH_1})
+        unset(AS_NASM)
+    else()
+        set(ENV{CC} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
+        set(ENV{CXX} ${VCPKG_DETECTED_CMAKE_CXX_COMPILER})
+        set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR})
+        set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER})
+        set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB})
+        set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP})
+    endif()
+
+    if(VCPKG_TARGET_IS_MINGW)
+        if(LIBVPX_TARGET_ARCH STREQUAL "x86")
+            set(LIBVPX_TARGET "x86-win32-gcc")
+        else()
+            set(LIBVPX_TARGET "x86_64-win64-gcc")
+        endif()
+    elseif(VCPKG_TARGET_IS_LINUX)
         set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc")
+    elseif(VCPKG_TARGET_IS_ANDROID)
+        set(LIBVPX_TARGET "generic-gnu")
+        # Settings
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+            set(OPTIONS "${OPTIONS} --disable-sse4_1 --disable-avx --disable-avx2 --disable-avx512")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
+            set(OPTIONS "${OPTIONS} --disable-avx --disable-avx2 --disable-avx512")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+            set(OPTIONS "${OPTIONS} --enable-thumb --disable-neon")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+            set(OPTIONS "${OPTIONS} --enable-thumb")
+        endif()
+        # Set environment variables for configure
+        set(ENV{AS} ${VCPKG_DETECTED_CMAKE_C_COMPILER})
+        set(ENV{LDFLAGS} "${LDFLAGS} --target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET}")
+        # Set clang target
+        set(OPTIONS "${OPTIONS} --extra-cflags=--target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET} --extra-cxxflags=--target=${VCPKG_DETECTED_CMAKE_CXX_COMPILER_TARGET}")
+        # Unset nasm and let AS do its job
+        unset(AS_NASM)
     elseif(VCPKG_TARGET_IS_OSX)
         if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
             set(LIBVPX_TARGET "arm64-darwin20-gcc")
@@ -179,6 +217,14 @@ else()
         else()
             set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS
         endif()
+    elseif(VCPKG_TARGET_IS_IOS)
+        if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+            set(LIBVPX_TARGET "armv7-darwin-gcc")
+        elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
+            set(LIBVPX_TARGET "arm64-darwin-gcc")
+        else()
+            message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE} on iOS")
+        endif()
     else()
         set(LIBVPX_TARGET "generic-gnu") # use default target
     endif()
@@ -196,14 +242,14 @@ else()
             ${OPTIONS}
             ${OPTIONS_RELEASE}
             ${MAC_OSX_MIN_VERSION_CFLAGS}
-            --as=nasm
+            ${AS_NASM}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
         LOGNAME configure-${TARGET_TRIPLET}-rel)
 
         message(STATUS "Building libvpx for Release")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make -j8"
+                ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
             LOGNAME build-${TARGET_TRIPLET}-rel
         )
@@ -230,14 +276,14 @@ else()
             ${OPTIONS}
             ${OPTIONS_DEBUG}
             ${MAC_OSX_MIN_VERSION_CFLAGS}
-            --as=nasm
+            ${AS_NASM}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
         LOGNAME configure-${TARGET_TRIPLET}-dbg)
 
         message(STATUS "Building libvpx for Debug")
         vcpkg_execute_required_process(
             COMMAND
-                ${BASH} --noprofile --norc -c "make -j8"
+                ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
             WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
             LOGNAME build-${TARGET_TRIPLET}-dbg
         )
@@ -265,4 +311,4 @@ endif()
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake" @ONLY)
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/libvpx/vcpkg.json

@@ -1,11 +1,14 @@
 {
   "name": "libvpx",
-  "version": "1.12.0",
-  "port-version": 2,
+  "version": "1.13.1",
   "description": "The reference software implementation for the video coding formats VP8 and VP9.",
   "homepage": "https://github.com/webmproject/libvpx",
   "license": "BSD-3-Clause",
   "dependencies": [
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
+    },
     {
       "name": "vcpkg-msbuild",
       "host": true,

package/vcpkg/ports/libvpx/vpx.pc.in

@@ -1,13 +1,12 @@
-prefix=@LIBVPX_PREFIX@
-# pkg-config file from libvpx v1.10.0
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: vpx
-Description: WebM Project VPx codec implementation
-Version: @LIBVPX_VERSION@
-Requires:
-Conflicts:
-Libs: -L"${libdir}" -lvpx
-Cflags: -I"${includedir}"
+prefix=@LIBVPX_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: vpx
+Description: WebM Project VPx codec implementation
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L"${libdir}" -lvpx
+Cflags: -I"${includedir}"

package/vcpkg/ports/libxml2/portfile.cmake

@@ -3,7 +3,7 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/libxml2
     REF "v${VERSION}"
-    SHA512 527e66f6260a399318cfacc06db3ede4b16178ef17492ed0d515884aa00fce685f9e6932cd117df0d83e2440b5a5392c3d5fbe187b601cf19769b495e0865c87
+    SHA512 27ce97deb8c60742dcaf95992544dc79342435a55f9a74b479b978a06361a41e902bf269c6ef40b18dae63c2a13c31268f2bb5b0673aca8843ad6ad631e68f9d
     HEAD_REF master
     PATCHES
         disable-docs.patch
@@ -19,6 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         "lzma" LIBXML2_WITH_LZMA
         "zlib" LIBXML2_WITH_ZLIB
         "tools" LIBXML2_WITH_PROGRAMS
+        "icu"  LIBXML2_WITH_ICU
 )
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -30,7 +31,6 @@ vcpkg_cmake_configure(
         -DLIBXML2_WITH_CATALOG=ON
         -DLIBXML2_WITH_DEBUG=ON
         -DLIBXML2_WITH_ISO8859X=ON
-        -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR
         -DLIBXML2_WITH_MEM_DEBUG=OFF
         -DLIBXML2_WITH_MODULES=ON
         -DLIBXML2_WITH_OUTPUT=ON

package/vcpkg/ports/libxml2/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "libxml2",
-  "version": "2.11.5",
+  "version": "2.11.6",
   "port-version": 1,
   "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
   "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home",
@@ -35,6 +35,12 @@
         "libiconv"
       ]
     },
+    "icu": {
+      "description": "Add ICU support",
+      "dependencies": [
+        "icu"
+      ]
+    },
     "legacy": {
       "description": "Add deprecated APIs for compatibility"
     },

package/vcpkg/ports/libxslt/vcpkg.json

@@ -1,13 +1,16 @@
 {
   "name": "libxslt",
   "version": "1.1.37",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
   "homepage": "https://github.com/GNOME/libxslt",
   "license": null,
   "supports": "!uwp",
   "dependencies": [
-    "libxml2",
+    {
+      "name": "libxml2",
+      "default-features": false
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

package/vcpkg/ports/libzim/cross-builds.diff

@@ -1,10 +1,13 @@
 diff --git a/meson.build b/meson.build
-index 85d8da7..7f97dbc 100644
+index f3e7a27..d946c49 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -3,7 +3,7 @@ project('libzim', ['c', 'cpp'],
+@@ -1,9 +1,9 @@
+ project('libzim', ['c', 'cpp'],
+   version : '9.0.0',
    license : 'GPL2',
-   default_options : ['c_std=c11', 'cpp_std=c++11'])
+-  default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
++  default_options : ['c_std=c11', 'cpp_std=c++17'])
  
 -if build_machine.system() != 'windows'
 +if host_machine.system() != 'windows' or meson.get_compiler('cpp').get_id() == 'gcc'

package/vcpkg/ports/libzim/dllexport.diff

@@ -1,52 +1,16 @@
 diff --git a/include/zim/zim.h b/include/zim/zim.h
-index 5d1af80..6171f56 100644
+index 80e8596..631cfab 100644
 --- a/include/zim/zim.h
 +++ b/include/zim/zim.h
-@@ -33,14 +33,16 @@
- #define DEPRECATED
- #endif
+@@ -35,8 +35,10 @@
+ 
+ #include <zim/zim_config.h>
  
--#if (defined _WIN32 || defined __CYGWIN__) && defined LIBZIM_EXPORT_DLL
-+#include <zim/zim_config.h>
-+
-+#if defined(LIBZIM_DLL) && defined(LIBZIM_BUILDING_LIBRARY)
+-#if defined(_MSC_VER) && defined(LIBZIM_EXPORT_DLL)
++#if defined(_WIN32) && defined(LIBZIM_EXPORT_DLL)
      #define LIBZIM_API __declspec(dllexport)
-+#elif defined(LIBZIM_DLL)
++#elif defined(_WIN32) && defined(LIBZIM_IMPORT_DLL)
 +    #define LIBZIM_API __declspec(dllimport)
  #else
      #define LIBZIM_API
  #endif
- 
--#include <zim/zim_config.h>
--
- namespace zim
- {
-   // An index of an entry (in a zim file)
-diff --git a/meson.build b/meson.build
-index 7f97dbc..8fd13d7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -14,6 +14,10 @@ sizeof_size_t = cpp.sizeof('size_t')
- private_conf = configuration_data()
- public_conf = configuration_data()
- 
-+if host_machine.system() == 'windows' and get_option('default_library') == 'shared'
-+  public_conf.set('LIBZIM_DLL', true)
-+endif
-+
- private_conf.set('VERSION', '"@0@"'.format(meson.project_version()))
- public_conf.set('LIBZIM_VERSION', '"@0@"'.format(meson.project_version()))
- private_conf.set('DIRENT_CACHE_SIZE', get_option('DIRENT_CACHE_SIZE'))
-diff --git a/src/meson.build b/src/meson.build
-index 4529b7c..956b145 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -75,7 +75,7 @@ libzim = library('zim',
-                  include_directories : inc,
-                  dependencies : deps,
-                  link_args : extra_link_args,
--                 cpp_args : extra_cpp_args,
-+                 cpp_args : extra_cpp_args + '-DLIBZIM_BUILDING_LIBRARY',
-                  version: meson.project_version(),
-                  install : true)
- libzim_dep = declare_dependency(link_with: libzim,

package/vcpkg/ports/libzim/portfile.cmake

@@ -2,12 +2,12 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openzim/libzim
     REF "${VERSION}"
-    SHA512 4554a9237f5167f6f94aad76ef0e847e949c47c6ee2a89bbd6e587da3b3a3e2d0a8b2d03f7a0fbde0e0dc96fb61bf8c115b3ef3cbd7eff5e880f152bee9b29f0
+    SHA512 55d18535d677d3249c8331ceac1acd4afa650de1f61a0aa3ffc1c98ca2a395bc657c774d01780f1a2c2aedd7d9c5d2e7d9f5e717ed879de84dc6d1be6accfe5e
     HEAD_REF main
     PATCHES
         cross-builds.diff
         dllexport.diff
-        disable-gtest.diff
+        subdirs.diff
 )
 
 set(EXTRA_OPTIONS "")
@@ -29,5 +29,9 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zim/zim.h" "defined(LIBZIM_IMPORT_DLL)" "1")
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

package/vcpkg/ports/libzim/subdirs.diff

@@ -0,0 +1,20 @@
+diff --git a/meson.build b/meson.build
+index d946c49..eded01d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,6 +90,7 @@ subdir('include')
+ subdir('scripts')
+ subdir('static')
+ subdir('src')
++if false
+ if get_option('examples')
+   subdir('examples')
+ endif
+@@ -97,6 +98,7 @@ subdir('test')
+ if get_option('doc')
+   subdir('docs')
+ endif
++endif
+ 
+ pkg_mod = import('pkgconfig')
+ pkg_mod.generate(libraries : libzim,

package/vcpkg/ports/libzim/vcpkg.json

@@ -1,11 +1,10 @@
 {
   "name": "libzim",
-  "version": "8.2.0",
-  "port-version": 2,
+  "version": "9.0.0",
   "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.",
   "homepage": "https://github.com/openzim/libzim",
   "license": "GPL-2.0-or-later",
-  "supports": "!android & !xbox",
+  "supports": "!android & !uwp & !xbox",
   "dependencies": [
     "icu",
     "liblzma",