Merge remote-tracking branch 'upstream/master'

FireDaemon · Dec 31, 2023 · 2ef6be0 · 2ef6be0
2 parents 228002a + 8397227
commit 2ef6be0
Show file tree

Hide file tree

Showing 202 changed files with 1,447 additions and 402 deletions.
diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tradias/asio-grpc
     REF "v${VERSION}"
-    SHA512 e41d2cf4098af9921fc8911634baa7b2c283d6afa31dbb6ff371c385ed5f6518eb870672a5c0b0fcc42b5cb767cdd82b077e85afbf0b132b74bd2c80118907b8
+    SHA512 1dfd6254967dc24185cc17770fb18460289b4d1ff0952b8b3bad5d4222ee1fd640ef56ef437589d88b789ca9e374362f1a780b3fbf7d46dbd1ed6628b6b6ceca
     HEAD_REF master
 )
 

diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asio-grpc",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "Asynchronous gRPC with Asio/unified executors",
   "homepage": "https://github.com/Tradias/asio-grpc",
   "license": "Apache-2.0",

diff --git a/ports/backward-cpp/include-dir.diff b/ports/backward-cpp/include-dir.diff
diff --git a/ports/backward-cpp/portfile.cmake b/ports/backward-cpp/portfile.cmake
@@ -1,21 +1,18 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bombela/backward-cpp
-    REF "v${VERSION}"
-    SHA512 db0256a54819952ff1d92e05d6ab81fe979d4826ebb6651b6b08c30e7a0091879dfeff33d81f9599462152ce68e61e2c8c42bf039129bc6b28d1e68b1eab039b
+    REF 51f0700452cf71c57d43c2d028277b24cde32502 # 2023-11-24
+    SHA512 8831be0a1c0a2f2d2625c5e2065202445520e0f7591cdbf998c60f2c892880d1527f304f9361b057c831f84621be636e12fea018297c9a17d858ecc6c36c9ffb
     HEAD_REF master
-    PATCHES
-        include-dir.diff
 )
 
-set(VCPKG_BUILD_TYPE release) # header-only
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME backward CONFIG_PATH lib/backward)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/backward)
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/backward-cpp/usage b/ports/backward-cpp/usage
@@ -0,0 +1,7 @@
+backward-cpp provides CMake targets:
+
+  find_package(Backward CONFIG REQUIRED)
+  # To use the header library
+  target_link_libraries(main PRIVATE Backward::Interface)
+  # To use the prebuilt library
+  target_link_libraries(main PRIVATE Backward::Backward)
diff --git a/ports/backward-cpp/vcpkg.json b/ports/backward-cpp/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "backward-cpp",
-  "version": "1.6",
-  "port-version": 1,
+  "version-date": "2023-11-24",
   "description": "A beautiful stack trace pretty printer for C++",
   "homepage": "https://github.com/bombela/backward-cpp",
   "supports": "!uwp & !(windows & arm)",

diff --git a/ports/bext-sml/portfile.cmake b/ports/bext-sml/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boost-ext/sml
-    REF v1.1.5
-    SHA512 6babee6da2db93912afa2eb932591674a73f43609b7c2b0523e84ba682c09f6d4f67d1c7f6ea48f73f1f09de8df2eaf2ae30b3399c1602189ea08d42689758d7
+    REF v${VERSION}
+    SHA512 7612f301ed3e4edd4171214d85c6b746af19079622aef80c0965536782e4f50635332e7435966b072e1cb415c3a680260211740313d52d1927ab5af78ecdd30e
     HEAD_REF master
 )
 

diff --git a/ports/bext-sml/vcpkg.json b/ports/bext-sml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bext-sml",
-  "version": "1.1.5",
+  "version": "1.1.9",
   "description": "Your scalable C++14 one header only State Machine Library with no dependencies",
   "homepage": "https://github.com/boost-ext/sml",
   "license": "BSL-1.0"

diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bshoshany/thread-pool
     REF "v${VERSION}"
-    SHA512 43200acf989adbabc0478d847931d2e46c4ce13de9d28f2e603e6b86d38a7370c0e50bacd36bff5a1a200f33ae6394764adc64ce9a54df5e418d85fb525b4b3f
+    SHA512 37ebde68a9dc74204fc3df90a8f69cf17be241224eb2176d0841be0d412f8882ecf9abcc7eb61a19874b542988c22a88b4f7087efa86d0f435f996fa438eef5a
     HEAD_REF master
 )
 

diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bshoshany-thread-pool",
-  "version": "3.5.0",
+  "version": "4.0.1",
   "maintainers": "Barak Shoshany <[email protected]>",
   "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library",
   "homepage": "https://github.com/bshoshany/thread-pool",

diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO RealTimeChris/DiscordCoreAPI
     REF "v${VERSION}"
-    SHA512 4fcffa23be80bd7cf13ded5b8a78d7b94832d1d80996d315c5ee333b7a4006903f4d9f7ec1046f01658887349e5bf29406fe2eb5c979578b6bdad188798f4173
+    SHA512 02fbb9e62048d2a98eab9f937d689f25a34eceba01e978cd592d11ed558492ebd4d4fdb74581182cb67e1247d0275e12f794cea296fabe00a3cbde9e66ff12dd
     HEAD_REF main
 )
 

diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "discordcoreapi",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
   "homepage": "https://discordcoreapi.com",
   "license": "MIT",

diff --git a/ports/fast-float/portfile.cmake b/ports/fast-float/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fastfloat/fast_float
     REF "v${VERSION}"
-    SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81
+    SHA512 37280efebea7aa33cc25c8d8375b6c9456a8025d29d618abb5aac580c025097a6110ec3a913d1504fd9af1df43e434bc5411e07e38dd66c12491f3edc7374fff
     HEAD_REF master
 )
 

diff --git a/ports/fast-float/vcpkg.json b/ports/fast-float/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fast-float",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod",
   "homepage": "https://github.com/fastfloat/fast_float",
   "license": "Apache-2.0 OR BSL-1.0 OR MIT",

diff --git a/ports/gdal/cmake-project-include.cmake b/ports/gdal/cmake-project-include.cmake
@@ -1,3 +1,10 @@
+if(GDAL_USE_KEA)
+    find_package(Kealib CONFIG REQUIRED)
+    add_library(KEA::KEA ALIAS Kealib::Kealib)
+    set(GDAL_CHECK_PACKAGE_KEA_NAMES Kealib CACHE INTERNAL "vcpkg")
+    set(GDAL_CHECK_PACKAGE_KEA_TARGETS Kealib::Kealib CACHE INTERNAL "vcpkg")
+endif()
+
 if(GDAL_USE_WEBP)
     find_package(WebP CONFIG REQUIRED)
     add_library(WEBP::WebP ALIAS WebP::webp)

diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
         find-link-libraries.patch
         fix-gdal-target-interfaces.patch
         libkml.patch
+        target-is-valid.patch
 )
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
@@ -32,6 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         iconv            GDAL_USE_ICONV
         jpeg             GDAL_USE_JPEG
         core             GDAL_USE_JSONC
+        kea              GDAL_USE_KEA
         lerc             GDAL_USE_LERC
         libkml           GDAL_USE_LIBKML
         lzma             GDAL_USE_LIBLZMA
@@ -86,6 +88,7 @@ vcpkg_cmake_configure(
         -DGDAL_USE_EXTERNAL_LIBS=OFF
         -DGDAL_BUILD_OPTIONAL_DRIVERS=ON
         -DOGR_BUILD_OPTIONAL_DRIVERS=ON
+        -DFIND_PACKAGE2_KEA_ENABLED=OFF
         -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb
         -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb
         -DMYSQL_LIBRARIES=unofficial::libmariadb

diff --git a/ports/gdal/target-is-valid.patch b/ports/gdal/target-is-valid.patch
@@ -0,0 +1,21 @@
+diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
+index f5c920a..53494c9 100644
+--- a/cmake/helpers/CheckDependentLibraries.cmake
++++ b/cmake/helpers/CheckDependentLibraries.cmake
+@@ -41,6 +41,7 @@ endif()
+ # https://github.com/OSGeo/gdal/issues/5324
+ function (gdal_check_target_is_valid target res_var)
+   get_target_property(_interface_include_directories ${target} "INTERFACE_INCLUDE_DIRECTORIES")
++  get_target_property(_type ${target} "TYPE")
+   if(_interface_include_directories)
+     foreach(_dir IN LISTS _interface_include_directories)
+       if(NOT EXISTS "${_dir}")
+@@ -54,7 +55,7 @@ function (gdal_check_target_is_valid target res_var)
+     # property, but a GeoTIFF_INCLUDE_DIRS variable.
+     set_target_properties(${target} PROPERTIES
+                           INTERFACE_INCLUDE_DIRECTORIES "${GeoTIFF_INCLUDE_DIRS}")
+-  else()
++  elseif(NOT _type STREQUAL "INTERFACE" AND _type STREQUAL "ALIAS")
+      message(WARNING "Target ${target} has no INTERFACE_INCLUDE_DIRECTORIES property. Ignoring that target.")
+      set(${res_var} FALSE PARENT_SCOPE)
+      return()
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.8.2",
+  "port-version": 1,
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
@@ -150,6 +151,19 @@
         "libjpeg-turbo"
       ]
     },
+    "kea": {
+      "description": "Enable KEA driver",
+      "dependencies": [
+        {
+          "name": "gdal",
+          "default-features": false,
+          "features": [
+            "hdf5"
+          ]
+        },
+        "kealib"
+      ]
+    },
     "lerc": {
       "description": "Enable LERC support",
       "dependencies": [

diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
@@ -23,6 +23,11 @@ if("coretext" IN_LIST FEATURES)
 else()
     list(APPEND FEATURE_OPTIONS -Dcoretext=disabled)
 endif()
+if("directwrite" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Ddirectwrite=enabled) # Enable DirectWrite support on Windows
+else()
+    list(APPEND FEATURE_OPTIONS -Ddirectwrite=disabled)
+endif()
 if("glib" IN_LIST FEATURES)
     list(APPEND FEATURE_OPTIONS -Dglib=enabled) # Enable GLib unicode functions
     list(APPEND FEATURE_OPTIONS -Dgobject=enabled) #Enable GObject bindings
@@ -35,7 +40,11 @@ if("cairo" IN_LIST FEATURES)
 else()
     list(APPEND FEATURE_OPTIONS -Dcairo=disabled)
 endif()
-list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers
+if("freetype" IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers
+else()
+    list(APPEND FEATURE_OPTIONS -Dfreetype=disabled)
+endif()
 #if(VCPKG_TARGET_IS_WINDOWS)
     #link errors in qt5-base. probably requires changes to the pc files generated by meson
     #list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only)

diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
@@ -1,16 +1,12 @@
 {
   "name": "harfbuzz",
   "version": "8.3.0",
-  "port-version": 1,
+  "port-version": 3,
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "license": "MIT-Modern-Variant",
   "supports": "!uwp",
   "dependencies": [
-    {
-      "name": "freetype",
-      "default-features": false
-    },
     {
       "name": "gettext",
       "platform": "osx"
@@ -20,6 +16,9 @@
       "host": true
     }
   ],
+  "default-features": [
+    "freetype"
+  ],
   "features": {
     "cairo": {
       "description": "Enable Cairo graphics library support",
@@ -37,6 +36,19 @@
       "description": "Enable CoreText shaper backend on macOS",
       "supports": "osx"
     },
+    "directwrite": {
+      "description": "Enable DirectWrite support on Windows",
+      "supports": "windows"
+    },
+    "freetype": {
+      "description": "Enable FreeType support",
+      "dependencies": [
+        {
+          "name": "freetype",
+          "default-features": false
+        }
+      ]
+    },
     "glib": {
       "description": "Glib Unicode callbacks support",
       "dependencies": [

diff --git a/ports/hikogui/vcpkg.json b/ports/hikogui/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hikogui",
   "version": "0.8.1",
-  "port-version": 1,
+  "port-version": 2,
   "maintainers": "@takev",
   "description": "A portable, low latency, retained-mode GUI framework written in C++.",
   "homepage": "https://github.com/hikogui/hikogui",
@@ -14,6 +14,7 @@
         "tools"
       ]
     },
+    "shaderc",
     {
       "name": "vcpkg-cmake",
       "host": true

diff --git a/ports/hwinfo/portfile.cmake b/ports/hwinfo/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY) 
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO lfreist/hwinfo
+    REF 5cb31dbdb2c40413a837ce52ffadee23578c9069
+    SHA512 7c431528d5bf2f91843a3f6f8de908f6bc5b1427f85961bb885ab95e7765a875cb0358638e0e1e1f9a9336476ba74dc22819c97189251391fd8459c334c1092a
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DNO_OCL=TRUE # disable OpenCL usage
+    MAYBE_UNUSED_VARIABLES
+        NO_OCL
+)
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/hwinfo/vcpkg.json b/ports/hwinfo/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "hwinfo",
+  "version-date": "2023-12-02",
+  "description": "cross platform C++ library for hardware information (CPU, RAM, GPU, ...)",
+  "homepage": "https://github.com/lfreist/hwinfo",
+  "license": "MIT",
+  "supports": "(windows | linux) & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/imageinfo/portfile.cmake b/ports/imageinfo/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xiaozhuai/imageinfo
-    REF 724301f7ef5e29410e78cd900ae25f9fa2e3080a # committed on 2023-01-31
-    SHA512 b9ba5d2ec5698b9eee4eb07e0dbb50d0f361e730b6d468ac6e4c90b29375f6468f45214573673de5f9388d532794f922a556153d34cba5d6ccec854c20d34506
+    REF eb2f4a0727d425ecfe2debd3475bea1f570b1a8d # committed on 2023-12-25
+    SHA512 1f03ff2dbe49d27e757b66c57c28e8a53ddbe372b20bb3f5891d1644dd885a851f55fb40c42637ca3528023b37e1b980b11cbe64fa5484f12a2c462052ae247a
     HEAD_REF master
 )
 
@@ -16,9 +16,9 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/imageinfo)
+vcpkg_cmake_config_fixup()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/imageinfo/vcpkg.json b/ports/imageinfo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "imageinfo",
-  "version-date": "2023-01-31",
+  "version-date": "2023-12-25",
   "description": "Cross platform super fast single header c++ library to get image size and format without loading/decoding. Support avif, bmp, cur, dds, gif, hdr (pic), heic (heif), icns, ico, jp2, jpeg (jpg), jpx, ktx, png, psd, qoi, tga, tiff (tif), webp ...",
   "homepage": "https://github.com/xiaozhuai/imageinfo",
   "license": "MIT",