@openziti/ziti-sdk-nodejs 0.15.0 → 0.17.0

package/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch

@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index 3bdcfc6..00b2f13 100644
+index 6d3f31fc95..f5f4a769cc 100644
 --- a/configure
 +++ b/configure
-@@ -6351,7 +6351,8 @@ if enabled libmfx; then
+@@ -6761,7 +6761,8 @@ if enabled libmfx; then
  fi
  
  enabled libmodplug        && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
@@ -12,16 +12,16 @@ index 3bdcfc6..00b2f13 100644
  enabled libmysofa         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
                                 require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
  enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif ||
-@@ -6392,7 +6393,7 @@ if enabled debug_configure; then
+@@ -6805,7 +6806,7 @@ if enabled debug_configure; then
  else
      enabled libsnappy     && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
  fi
 -enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
 +enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr -lm
- enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp_init
+ enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
  enabled libsrt            && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
-@@ -6460,6 +6461,8 @@ enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
+@@ -6888,6 +6889,8 @@ enabled openal            && { check_pkg_config openal "openal >= 1.1" "AL/al.h"
  enabled opencl            && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
                                 check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
                                 check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
@@ -30,7 +30,7 @@ index 3bdcfc6..00b2f13 100644
                                 die "ERROR: opencl not found"; } &&
                               { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
                                 test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
-@@ -6479,6 +6482,7 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
+@@ -6914,6 +6917,7 @@ enabled openssl           && { { check_pkg_config openssl "openssl >= 3.0.0" ope
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
@@ -38,7 +38,7 @@ index 3bdcfc6..00b2f13 100644
                                 die "ERROR: openssl not found"; }
  enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
  enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
-@@ -6707,7 +6711,7 @@ enabled amf &&
+@@ -7215,7 +7219,7 @@ enabled amf &&
  if enabled libc_iconv; then
      check_func_headers iconv.h iconv
  elif enabled iconv; then

package/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch

@@ -1,28 +1,28 @@
 diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S
-index af677afe6..f4b220fb6 100644
---- a/libswscale/aarch64/yuv2rgb_neon.S	
+index 89d69e7f6c..4bc1607a7a 100644
+--- a/libswscale/aarch64/yuv2rgb_neon.S
 +++ b/libswscale/aarch64/yuv2rgb_neon.S
 @@ -169,19 +169,19 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
-     sqdmulh             v26.8H, v26.8H, v0.8H                           // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15
-     sqdmulh             v27.8H, v27.8H, v0.8H                           // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15
+         sqdmulh         v26.8h, v26.8h, v0.8h                           // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15
+         sqdmulh         v27.8h, v27.8h, v0.8h                           // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15
  
 -.ifc \ofmt,argb // 1 2 3 0
 +.ifc \ofmt,argb
-     compute_rgba        v5.8B,v6.8B,v7.8B,v4.8B, v17.8B,v18.8B,v19.8B,v16.8B
+         compute_rgba    v5.8b,v6.8b,v7.8b,v4.8b, v17.8b,v18.8b,v19.8b,v16.8b
  .endif
  
 -.ifc \ofmt,rgba // 0 1 2 3
 +.ifc \ofmt,rgba
-     compute_rgba        v4.8B,v5.8B,v6.8B,v7.8B, v16.8B,v17.8B,v18.8B,v19.8B
+         compute_rgba    v4.8b,v5.8b,v6.8b,v7.8b, v16.8b,v17.8b,v18.8b,v19.8b
  .endif
  
 -.ifc \ofmt,abgr // 3 2 1 0
 +.ifc \ofmt,abgr
-     compute_rgba        v7.8B,v6.8B,v5.8B,v4.8B, v19.8B,v18.8B,v17.8B,v16.8B
+         compute_rgba    v7.8b,v6.8b,v5.8b,v4.8b, v19.8b,v18.8b,v17.8b,v16.8b
  .endif
  
 -.ifc \ofmt,bgra // 2 1 0 3
 +.ifc \ofmt,bgra
-     compute_rgba        v6.8B,v5.8B,v4.8B,v7.8B, v18.8B,v17.8B,v16.8B,v19.8B
+         compute_rgba    v6.8b,v5.8b,v4.8b,v7.8b, v18.8b,v17.8b,v16.8b,v19.8b
  .endif
  

package/vcpkg/ports/ffmpeg/portfile.cmake

@@ -1,9 +1,8 @@
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ffmpeg/ffmpeg
-    REF n${VERSION}
-    SHA512 da1b836c8f51cf69f95db750d5da5191a71d534fa7b0f019d6d6454f8dd6db5598789576b4fe5ad983dcd0197b9a7e8f9d43f10707b6d40ac31425da23da35b2
+    REF "n${VERSION}"
+    SHA512 abb9207364553248278f8e23e3d565da51ecb0ae9b20edda41624b314541bc3f53a8d6aac7fa5455168d2323d5d70d5a8acbe059f33423fbc2563e1a6cd0348b
     HEAD_REF master
     PATCHES
         0001-create-lib-libraries.patch
@@ -20,7 +19,6 @@ vcpkg_from_github(
         0015-Fix-xml2-detection.patch
         0020-fix-aarch64-libswscale.patch
         0022-fix-iconv.patch
-        0024-fix-gcc13-binutils.patch
 )
 
 if(SOURCE_PATH MATCHES " ")
@@ -33,18 +31,9 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
     vcpkg_add_to_path("${NASM_EXE_PATH}")
 endif()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    #We're assuming that if we're building for Windows we're using MSVC
-    set(INCLUDE_VAR "INCLUDE")
-    set(LIB_PATH_VAR "LIB")
-else()
-    set(INCLUDE_VAR "CPATH")
-    set(LIB_PATH_VAR "LIBRARY_PATH")
-endif()
-
 set(OPTIONS "--enable-pic --disable-doc --enable-debug --enable-runtime-cpudetect --disable-autodetect")
 
-if(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_HOST_IS_WINDOWS)
     vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16)
     set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
     vcpkg_add_to_path("${MSYS_ROOT}/usr/share/automake-1.16")
@@ -69,7 +58,8 @@ elseif(VCPKG_TARGET_IS_OSX)
     string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox")
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
     string(APPEND OPTIONS " --target-os=android")
-else()
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "QNX")
+    string(APPEND OPTIONS " --target-os=qnx")
 endif()
 
 if(VCPKG_TARGET_IS_OSX)
@@ -94,8 +84,6 @@ string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/inc
 
 ## Setup vcpkg toolchain
 
-set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}")
-
 set(prog_env "")
 
 if(VCPKG_DETECTED_CMAKE_C_COMPILER)
@@ -574,8 +562,12 @@ message(STATUS "Building Options: ${OPTIONS}")
 
 # Release build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    if (VCPKG_DETECTED_MSVC)
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/lib\"")
+    else()
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/lib\"")
+    endif()
     message(STATUS "Building Release Options: ${OPTIONS_RELEASE}")
-    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}")
     set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig")
     message(STATUS "Building ${PORT} for Release")
     file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
@@ -611,8 +603,12 @@ endif()
 
 # Debug build
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    if (VCPKG_DETECTED_MSVC)
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/debug/lib\"")
+    else()
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/debug/lib\"")
+    endif()
     message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}")
-    set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}")
     set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}")
     set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig")
     message(STATUS "Building ${PORT} for Debug")

package/vcpkg/ports/ffmpeg/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ffmpeg",
-  "version": "6.0",
+  "version": "6.1",
   "port-version": 1,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",

package/vcpkg/ports/ffnvcodec/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FFmpeg/nv-codec-headers
-    REF n${VERSION}
-    SHA512 c08b7b3d08ef6e95819268067e09c588e5064d4c2320554f868579e96dc841e1eab217c03ef44e246aabdfa8b5e8e267cd5f0726f9c959f45fb27cb79af7c454
+    REF "n${VERSION}"
+    SHA512 386e4e1e0606a5ebd95c0ca60a2cdbadd1e24ac64df65f707dd00ee1fc822f56535637eaf4a375dd25f2f91fb00ffabb95953a1bab9fc101d1c522e2954f37c0
     HEAD_REF master
 )
 

package/vcpkg/ports/ffnvcodec/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ffnvcodec",
-  "version": "11.1.5.2",
+  "version": "11.1.5.3",
   "description": "FFmpeg version of Nvidia Codec SDK headers.",
   "homepage": "https://github.com/FFmpeg/nv-codec-headers",
   "supports": "linux | (!osx & !uwp & !(arm64 & windows))"

package/vcpkg/ports/flagpp/portfile.cmake

@@ -0,0 +1,15 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Curve/flagpp
+    REF "v${VERSION}"
+    SHA512 c0a9c63846075677b89af38aecd0536df430d7a2600115067644af58aefb6941f56a0e5bd13a4006b032cd96804cc0acde9be2725ddd79691c878f7e5ed04b92
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH})
+
+vcpkg_cmake_install()
+
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/flagpp/vcpkg.json

@@ -0,0 +1,12 @@
+{
+  "name": "flagpp",
+  "version": "2.1",
+  "description": "A C++20 library that provides (opt-in) bit-wise operations for arbitrary `enum class`es",
+  "homepage": "https://github.com/Curve/flagpp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}

package/vcpkg/ports/flatbuffers/portfile.cmake

@@ -25,6 +25,8 @@ vcpkg_cmake_configure(
         -DFLATBUFFERS_BUILD_TESTS=OFF
         -DFLATBUFFERS_BUILD_GRPCTEST=OFF
         ${options}
+    OPTIONS_DEBUG
+        -DFLATBUFFERS_BUILD_FLATC=OFF
 )
 
 vcpkg_cmake_install()
@@ -40,8 +42,8 @@ else()
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/flatbuffers/pch")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 
-# Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/flatbuffers/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "flatbuffers",
   "version": "23.5.26",
+  "port-version": 1,
   "description": [
     "Memory Efficient Serialization Library",
     "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."

package/vcpkg/ports/flecs/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO SanderMertens/flecs
     REF "v${VERSION}"
-    SHA512 0931777bf7b43cd86a882bb3172ee8ce6294495eee010edc08afb33d09440280b46b2453395c69ac023f4f6d8a0600097c4b1797666c9094e1ae394659017853
+    SHA512 9573e57432ea6117b59e8dff9470e71ed2283d9ab0a16affbef2c3f73cc8dad3d00243482c9bb34b9ddc936ac2d7941eb35fd68443431fc9feb825d57beae1ba
     HEAD_REF master
 )
 

package/vcpkg/ports/flecs/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "flecs",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "description": "A fast entity component system (ECS) for C & C++",
   "homepage": "https://github.com/SanderMertens/flecs",
   "license": "MIT",

package/vcpkg/ports/freeglut/portfile.cmake

@@ -1,5 +1,3 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO FreeGLUTProject/freeglut
@@ -13,8 +11,10 @@ vcpkg_from_github(
         windows-output-name.patch
 )
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.")
+if(VCPKG_TARGET_IS_OSX)
+    message("Freeglut currently requires Xquartz for macOS.")
+elseif(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID)
+    message("Freeglut currently requires the following libraries from the system package manager:\n    opengl\n    glu\n    libx11\n    xrandr\n    xi\n    xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev")
 endif()
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC)
@@ -33,12 +33,20 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT)
 vcpkg_fixup_pkgconfig()
-file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc")
-if(NOT VCPKG_BUILD_TYPE)
-    if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd")
+
+file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc"  "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
+foreach(file IN LISTS pc_files)
+    vcpkg_replace_string("${file}" ";-D" " -D")
+endforeach()
+
+if(NOT VCPKG_TARGET_IS_ANDROID)
+    file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc")
+    if(NOT VCPKG_BUILD_TYPE)
+        if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd")
+        endif()
+        file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc")
     endif()
-    file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc")
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

package/vcpkg/ports/freeglut/vcpkg.json

@@ -1,9 +1,11 @@
 {
   "name": "freeglut",
   "version": "3.4.0",
+  "port-version": 1,
   "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
   "homepage": "https://sourceforge.net/projects/freeglut/",
   "license": null,
+  "supports": "!ios",
   "dependencies": [
     "opengl",
     {

package/vcpkg/ports/freerdp/portfile.cmake

@@ -57,6 +57,7 @@ vcpkg_cmake_configure(
         # Can be overriden in custom triplet file
         -DWITH_ALSA=OFF
         -DWITH_CAIRO=OFF
+        -DWITH_LIBSYSTEMD=OFF
     MAYBE_UNUSED_VARIABLES
         MSVC_RUNTIME
 )

package/vcpkg/ports/freerdp/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "freerdp",
   "version": "2.11.2",
+  "port-version": 1,
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",
@@ -46,7 +47,16 @@
     },
     "server": {
       "description": "Build server components",
-      "supports": "!android & !ios & !uwp"
+      "supports": "!android & !ios & !uwp",
+      "dependencies": [
+        {
+          "name": "freerdp",
+          "default-features": false,
+          "features": [
+            "winpr-tools"
+          ]
+        }
+      ]
     },
     "urbdrc": {
       "description": "USB redirection channel support",

package/vcpkg/ports/fribidi/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fribidi/fribidi
-    REF v1.0.12
-    SHA512 a3a63e1dde1cffb097376df0b34522700cff600da61bdafd6f4f50db6937383b9f73a82081cb1a7f2e1946ba07fea13e2880a4250b1508850bffa500046a7fa5
+    REF v${VERSION}
+    SHA512 246c904f8e6cc7eee61c03162b42dd0e0ed2163ef02d9d15b8168f0084ccdd9b625b83092915fa42f301106247e3159ad6aee0af42c37643253f7c47d0a520ef
     HEAD_REF master
     PATCHES meson-crosscompile.patch
 )
@@ -30,13 +30,11 @@ vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 # Define static macro
-file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
+	vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "# elif defined(_WIN32) && ! defined(FRIBIDI_LIB_STATIC)" "# elif defined(_WIN32) && 0")
 else()
-    string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}")
+	vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "# elif defined(_WIN32) && ! defined(FRIBIDI_LIB_STATIC)" "# elif defined(_WIN32) && 1")
 endif()
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}")
 
 if(VCPKG_CROSSCOMPILING)
     file(

package/vcpkg/ports/fribidi/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "fribidi",
-  "version": "1.0.12",
-  "port-version": 1,
+  "version": "1.0.13",
   "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)",
   "license": "LGPL-2.1-or-later",
   "supports": "!uwp",

package/vcpkg/ports/gapp/portfile.cmake

@@ -0,0 +1,29 @@
+if(VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO KRM7/gapp
+  REF "v${VERSION}"
+  SHA512 463d36c3c41d14a9615dc48b43aebfccdf28177db766941607c2bdb2fed9ae5e876ae7b0bca541809503b35e9ce250a5d3b7246342c035f4a079d50539589ac2
+  HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DGAPP_BUILD_TESTS=OFF
+    -DGAPP_USE_LTO=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api")
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

package/vcpkg/ports/gapp/usage

@@ -0,0 +1,4 @@
+gapp provides CMake targets:
+
+    find_package(gapp CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE gapp::gapp)

package/vcpkg/ports/gapp/vcpkg.json

@@ -0,0 +1,18 @@
+{
+  "name": "gapp",
+  "version": "0.2.0",
+  "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.",
+  "homepage": "https://github.com/KRM7/gapp",
+  "license": "MIT",
+  "supports": "(windows | linux) & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}

package/vcpkg/ports/gdal/portfile.cmake

@@ -2,14 +2,12 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/gdal
     REF "v${VERSION}"
-    SHA512 95b0dee07a616c8fb26ded2c538a6933ba070c0567e88af9356daea9b1df6c910edb4fcf55766839c1873829d20948b1714b3e2285e5ac57de8fcf0970ff53ff
+    SHA512 1a5ddc6a53f54e1c2f36cfd9af0ec05abc48c14207afaa89f449f3c7395f724ff92a8a5936608703dcc8b862e1762b1c3840445f440ebf9437816362aceef931
     HEAD_REF master
     PATCHES
         find-link-libraries.patch
         fix-gdal-target-interfaces.patch
         libkml.patch
-        fix-jpeg.patch
-        upstream-b5858ed.diff
 )
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
@@ -117,34 +115,33 @@ list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")"
 if (BUILD_APPS)
     vcpkg_copy_tools(
         TOOL_NAMES
-            gdalinfo
-            gdalbuildvrt
-            gdaladdo
+            gdal_contour
+            gdal_create
+            gdal_footprint
             gdal_grid
-            gdal_translate
             gdal_rasterize
-            gdalsrsinfo
-            gdalenhance
-            gdalmanage
-            gdaltransform
-            gdaltindex
-            gdaldem
-            gdal_create
+            gdal_translate
             gdal_viewshed
-            nearblack
-            ogrlineref
-            ogrtindex
-            gdalwarp
-            gdal_contour
+            gdaladdo
+            gdalbuildvrt
+            gdaldem
+            gdalenhance
+            gdalinfo
             gdallocationinfo
-            ogrinfo
-            ogr2ogr
-            ogrlineref
-            nearblack
+            gdalmanage
             gdalmdiminfo
             gdalmdimtranslate
+            gdalsrsinfo
+            gdaltindex
+            gdaltransform
+            gdalwarp
             gnmanalyse
             gnmmanage
+            nearblack
+            ogr2ogr
+            ogrinfo
+            ogrlineref
+            ogrtindex
             sozip
         AUTO_CLEAN
     )

package/vcpkg/ports/gdal/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "gdal",
-  "version-semver": "3.7.2",
-  "port-version": 1,
+  "version-semver": "3.8.1",
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,

package/vcpkg/ports/geographiclib/portfile.cmake

@@ -4,6 +4,7 @@ vcpkg_from_sourceforge(
     REF distrib-C++
     FILENAME "GeographicLib-2.3.tar.gz"
     SHA512 1a1bd0fc2dc3e1372cf22618af3a4340bbc6497f94c64226c97654dfff92a4bf3acf47d91592741fe0c643d401d9721f680bdb4974b8ee258fb09d525fbaec67
+    PATCHES remove-broken-and-unnecessary-cross-compile-check.patch
     )
 
 vcpkg_check_features(

package/vcpkg/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch

@@ -0,0 +1,14 @@
+diff -Naur a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in
+--- a/cmake/project-config-version.cmake.in	2023-07-25 07:37:40.000000000 -0500
++++ b/cmake/project-config-version.cmake.in	2023-11-10 16:58:52.835325073 -0600
+@@ -48,10 +48,6 @@
+   # Reject if the user asks for an incompatible precsision.
+   set (REASON "GEOGRAPHICLIB_PRECISION = @GEOGRAPHICLIB_PRECISION@")
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+-elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@")
+-  # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}.
+-  set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@")
+-  set (PACKAGE_VERSION_UNSUITABLE TRUE)
+ elseif (CMAKE_CROSSCOMPILING AND
+     NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND
+       CMAKE_SYSTEM_PROCESSOR STREQUAL "@CMAKE_SYSTEM_PROCESSOR@"))

package/vcpkg/ports/geographiclib/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "geographiclib",
   "version": "2.3",
+  "port-version": 1,
   "description": "GeographicLib, a C++ library for performing geographic conversions",
   "homepage": "https://geographiclib.sourceforge.io",
   "license": "MIT",

package/vcpkg/ports/geos/fix-exported-config.patch

@@ -66,11 +66,11 @@ index 6eff1eb14..8827f6ac6 100644
        ;;
      --static-clibs)
 -      echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm
-+      echo -L${libdir} -lgeos_c -lgeos -lstdc++ @EXTRA_LIBS@
++      echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@
        ;;
      --static-cclibs)
 -      echo -L${libdir} -lgeos -lstdc++ -lm
-+      echo -L${libdir} -lgeos -lstdc++ @EXTRA_LIBS@
++      echo -L${libdir} -lgeos @EXTRA_LIBS@
        ;;
      --cflags)
        echo -I${includedir}

package/vcpkg/ports/geos/portfile.cmake

@@ -1,17 +1,14 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"
     FILENAME "geos-${VERSION}.tar.bz2"
-    SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
+    SHA512 bbca43c1eb9c4001d2e3c29d054b597bfb2c1d4860784246dd20fec21882b54bc2a8a8f0f09b8816aec7a85b621d3d1645adca15318838d2b4f4b5c4c4a58a94
 )
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE "v${VERSION}"
     PATCHES
-        disable-warning-4996.patch
+        win32.patch
         fix-exported-config.patch
-        fix-dll-builds.patch
-        gcc-13-fix-backport.patch
 )
 
 vcpkg_cmake_configure(

package/vcpkg/ports/geos/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "geos",
-  "version": "3.11.2",
+  "version": "3.11.3",
+  "port-version": 1,
   "description": "Geometry Engine Open Source",
   "homepage": "https://libgeos.org/",
   "license": "LGPL-2.1-only",