Merge branch 'microsoft:master' into aelnosu-patch-boringssl

microsoft · Feb 25, 2025 · 521790f · 521790f
2 parents bc14cd6 + 9a7a33f
commit 521790f
Show file tree

Hide file tree

Showing 68 changed files with 337 additions and 267 deletions.
diff --git a/ports/asock/portfile.cmake b/ports/asock/portfile.cmake
@@ -0,0 +1,24 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jeremyko/ASockLib
+    REF "${VERSION}"
+    SHA512 61ce6ba52cc83c2a66912bef5662757465ee33ea460d2a2d5364a972f163b3d4771d4a7bc5935a56d2b6566a581998a83ca8c786ea8d79e2907a7238d528ef69
+    HEAD_REF master
+)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DJEREMYKO_ASOCK_BUILD_TESTS=OFF
+        -DJEREMYKO_ASOCK_BUILD_SAMPLES=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/asock")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/share/asock/LICENSE" "${CURRENT_PACKAGES_DIR}/share/asock/README.md")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
diff --git a/ports/asock/vcpkg.json b/ports/asock/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "asock",
+  "version": "1.0.4",
+  "description": "A simple portable socket library",
+  "homepage": "https://github.com/jeremyko/ASockLib",
+  "license": "MIT",
+  "supports": "windows | linux | osx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO h4tr3d/avcpp
     REF "v${VERSION}"
-    SHA512 365ed55e0c2bf2a699899ed6e303fe28fb9d51286579e9d7d1586132c8ab1b09c4b66e94f8061e860d73b60a28fa44769dcfdf030cb0947acfb7cdfd616127d9
+    SHA512 628e11b57c9294864afdc07365cedd3b4973773491de1de31dc063f2491057eecda1abb3a46a6dda4d0746a8d9f264a855b3e546c1e23b38cef3fe0754ee7ff8
     HEAD_REF master
     PATCHES
         0002-av_init_packet_deprecation.patch

diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "avcpp",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.",
   "homepage": "https://github.com/h4tr3d/avcpp",
   "license": "LGPL-2.1-only OR BSD-3-Clause",

diff --git a/ports/avro-c/avro.patch b/ports/avro-c/avro.patch
@@ -1,5 +1,5 @@
 diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt
-index aa923e1..9ee7937 100644
+index 123676b..d5797b4 100644
 --- a/lang/c/CMakeLists.txt
 +++ b/lang/c/CMakeLists.txt
 @@ -22,6 +22,9 @@ enable_testing()
@@ -20,7 +20,7 @@ index aa923e1..9ee7937 100644
 -if (SNAPPY_FOUND AND ZLIB_FOUND)  # Snappy borrows crc32 from zlib
 +find_package(Snappy CONFIG REQUIRED)
 +if (Snappy_FOUND AND ZLIB_FOUND)  # Snappy borrows crc32 from zlib
-     set(SNAPPY_PKG libsnappy)
+     set(SNAPPY_PKG snappy)
      add_definitions(-DSNAPPY_CODEC)
 +    set(SNAPPY_LIBRARIES Snappy::snappy)
 +    if (UNIX)
@@ -45,7 +45,7 @@ index aa923e1..9ee7937 100644
      set(LZMA_PKG liblzma)
      add_definitions(-DLZMA_CODEC)
 @@ -179,20 +187,26 @@ set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES})
- set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@")
+ set(CODEC_PKG "${ZLIB_PKG} ${LZMA_PKG} ${SNAPPY_PKG}")
 
  # Jansson JSON library
 -pkg_check_modules(JANSSON jansson>=2.3)

diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/avro
     REF "release-${VERSION}"
-    SHA512 728609f562460e1115366663ede2c5d4acbdd6950c1ee3e434ffc65d28b72e3a43c3ebce93d0a8459f0c4f6c492ebb9444e2127a0385f38eb7cdf74b28f0c3ed
+    SHA512 8cc6ef3cf1e0a919118c8ba5817a1866dc4f891fa95873c0fe1b4b388858fbadee8ed50406fa0006882cab40807fcf00c5a2dcd500290f3868d9d06b287eacb6
     HEAD_REF master
     PATCHES
         avro.patch          # Private vcpkg build fixes
@@ -39,4 +39,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/lang/c/LICENSE")
diff --git a/ports/avro-c/vcpkg.json b/ports/avro-c/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "avro-c",
-  "version": "1.11.3",
+  "version": "1.12.0",
   "description": "Apache Avro is a data serialization system",
   "homepage": "https://github.com/apache/avro",
   "license": "Apache-2.0",

diff --git a/ports/bde/portfile.cmake b/ports/bde/portfile.cmake
@@ -23,7 +23,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "bloomberg/bde"
     REF "${VERSION}"
-    SHA512 d25a17e213c6f50901c6a0e27366d6331c3b0506ef88fb34fd0496bfb214e04308f8adb6b1dd2f9a3821d230c444b04d8158cee730f540a6cb4984bc16d022d5
+    SHA512 d6d7e453cf22f6e28f3513b818ab3f4b597db3e1d109587e0e0a8957338483c475494f55d953dfe86de507a6c292d1492d9cbb3c8be359044ef368fe80595448
     HEAD_REF main
 )
 

diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "bde",
-  "version": "4.14.0.0",
+  "version": "4.18.0.0",
   "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.",
   "homepage": "https://techatbloomberg.com/",
   "documentation": "https://bloomberg.github.io/bde/",

diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake
@@ -3,7 +3,7 @@ set(VCPKG_BUILD_TYPE release) # header-only
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO dtschump/CImg
     REF "v.${VERSION}"
-    SHA512 54357c177c1e25117778d444e0317a5a5f9dc9dd40ff2c280b6c05f846b2352c523ba6ab9eeea2e05094cc8fbbfe5a544a5f83eeda46394b3d87962b3b1e31d5
+    SHA512 dc079933bf68df7b0ae1a9498de952e4a32608e74da0df360b628056bdd82ab66f0428a5c94457fd6e9567772a544e9584f5d8f1f6debda6c146b45ea9b813fd
     HEAD_REF master
 )
 

diff --git a/ports/cimg/vcpkg.json b/ports/cimg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cimg",
-  "version": "3.4.1",
+  "version": "3.5.2",
   "description": "The CImg Library is a small, open-source, and modern C++ toolkit for image processing",
   "homepage": "https://github.com/dtschump/CImg",
   "license": "CECILL-C AND CECILL-2.0",

diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jeremy-rifkin/cpptrace
     REF "v${VERSION}"
-    SHA512 f65380ed576f6308a3a246c9c117642c20cf42b12852437f22b5a3a9e8f75a417aec4952c13fc1586652d3050f844ddcb7527ff6c63aa3f5691d75d4caed9bb3
+    SHA512 2148b6200ed6e1026858e2239b7cf468e0dbfbbb1ac1ae18c231ec95a12b6a4149a0c00e5475166f0d0c19e3263667c7f4ea7fde3bfbf0c21ba0f4a9ce8dbcbe
     HEAD_REF main
 )
 

diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpptrace",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer",
   "homepage": "https://github.com/jeremy-rifkin/cpptrace",
   "license": "MIT",

diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CrowCpp/crow
     REF "v${VERSION}"
-    SHA512 0fdba3c3697f53ff231cc1637b613f382b5c0230b700745548c1a0ef03c3b25f92ec15f8d1f9bca1a74cffe07053d7a829732475a8a392ee8c682ccfba91539e
+    SHA512 a35344e2b877c8f0ad0afa68a8218bc1ffc7abd9248aa4ef1753562e35f465e31c78d798238f5017c28025c597e51d9cc7019d6bcc31c4a4c27b73dd127fd36b
     HEAD_REF master
 )
 

diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "crow",
-  "version": "1.2.0",
+  "version": "1.2.1.2",
   "description": "Very fast and easy to use C++ micro web framework",
   "homepage": "https://github.com/CrowCpp/crow",
   "license": "BSD-3-Clause",

diff --git a/ports/directx-dxc/portfile.cmake b/ports/directx-dxc/portfile.cmake
@@ -1,7 +1,7 @@
 set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
 
-set(DIRECTX_DXC_TAG v1.8.2407)
-set(DIRECTX_DXC_VERSION 2024_07_31)
+set(DIRECTX_DXC_TAG v1.8.2502)
+set(DIRECTX_DXC_VERSION 2025_02_20)
 
 if (NOT VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    message(STATUS "Note: ${PORT} always requires dynamic library linkage at runtime.")
@@ -11,13 +11,13 @@ if (VCPKG_TARGET_IS_LINUX)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/${DIRECTX_DXC_TAG}/linux_dxc_${DIRECTX_DXC_VERSION}.x86_64.tar.gz"
         FILENAME "linux_dxc_${DIRECTX_DXC_VERSION}.tar.gz"
-        SHA512 79962025089052d130795d2bb0371eb6f1d0ca395a3343ef50b4793c9a9da65615e53280f158535d1396f6c293ab672c5e5e85dd11399573fdb1cc930fc6ffec
+        SHA512 48d246349a7b8c998d80969a3d0a383c9fd287c7130c0ea3b214a2e8630d36ac38b78c1263a954777d89760910092f7a9812d421784706efa182cefeb017c3c6
     )
 else()
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/${DIRECTX_DXC_TAG}/dxc_${DIRECTX_DXC_VERSION}.zip"
         FILENAME "dxc_${DIRECTX_DXC_VERSION}.zip"
-        SHA512 82ce347a400fb2d7c9fe298a79b3da64bfb1ab8dabdf1394b1f93a0b1f02bded35cbea67b8541da5568d06682808271fbcba0e7dfc17ce5cead3172e19cb5f7e
+        SHA512 2381852e0d57be65ab919df00d79cda3564cd3695c6415065680738b66de1fc106106baae322973c6a48337b97e603294ee5118f71559298b7097181e73e4b31
     )
 endif()
 

diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "directx-dxc",
-  "version-date": "2024-07-31",
-  "port-version": 2,
+  "version-date": "2025-02-20",
   "description": "DirectX Shader Compiler (LLVM/Clang)",
   "homepage": "https://github.com/microsoft/DirectXShaderCompiler",
   "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki",

diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eProsima/Fast-CDR
     REF "v${VERSION}"
-    SHA512 cf664c036e673f6eb2f11fb949b89f85cef830bae46116df1826f14d1985a856a46f0c5986657ea4d90feb488c94032038e294f368b9e5a31b0ed0d2043c2071
+    SHA512 93044a36bbef10fc5c52e9c1f86a73da022af1e10652db6e52ead0eea457d45cae5c456b276e034cfa8c2ff6bce41e52ca24031910a816d9871bf3e3c9d3a112
     HEAD_REF master
     PATCHES
         pdb-file.patch

diff --git a/ports/fastcdr/vcpkg.json b/ports/fastcdr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fastcdr",
-  "version-semver": "2.2.4",
+  "version-semver": "2.2.6",
   "description": "eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.",
   "homepage": "https://github.com/eProsima/Fast-CDR",
   "license": "Apache-2.0",

diff --git a/ports/fltk/fix-build-executable.patch b/ports/fltk/fix-build-executable.patch
diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake
@@ -5,14 +5,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fltk/fltk
     REF "release-${VERSION}"
-    SHA512 2dfeeed9fdc6db62a6620e7c846dbe0bf97dacce3077832e314a35bf16ba6a45803373188a7b3954eada5829385b9914241270b71f12aaf3e9e3df45eb2b1b95
+    SHA512 b18ff6322349af4416a37d28c4f42ebe355260786ed42bdd54dcc20dc92db1a38a8db74e6d637fdff8f320bdd51e2515c0fa939d30679c5f22ea99fb32c97204
     PATCHES
         dependencies.patch
         config-path.patch
         include.patch
         fix-system-link.patch
         math-h-polyfill.patch
-        fix-build-executable.patch #https://github.com/fltk/fltk/commit/63d7c71e1a926f487f22aa26042a2582624b3b17
 )
 file(REMOVE_RECURSE
     "${SOURCE_PATH}/jpeg"

diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fltk",
-  "version": "1.3.9",
-  "port-version": 2,
+  "version": "1.3.11",
   "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
   "homepage": "https://www.fltk.org/",
   "license": null,

diff --git a/ports/gegl/disable_tests.patch b/ports/gegl/disable_tests.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+--- a/meson.build
++++ b/meson.build
+@@ -600,9 +600,8 @@
+ subdir('bin')
+ subdir('tools')
+ subdir('operations')
+ subdir('examples')
+-subdir('tests')
+ subdir('perf')
+ subdir('po')
+ subdir('docs')
+