Merge branch 'master' into mimalloc_301

microsoft · Jan 14, 2025 · 9a12fdb · 9a12fdb
2 parents 350b581 + d320630
commit 9a12fdb
Show file tree

Hide file tree

Showing 1,083 changed files with 12,267 additions and 8,482 deletions.
diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
@@ -179,6 +179,16 @@ target_sources(7zip PRIVATE
     CPP/7zip/Common/UniqBlocks.cpp
     CPP/7zip/Common/VirtThread.cpp
 
+    CPP/Windows/FileDir.cpp
+    CPP/Windows/FileFind.cpp
+    CPP/Windows/FileIO.cpp
+    CPP/Windows/FileName.cpp
+    CPP/Windows/PropVariant.cpp
+    CPP/Windows/PropVariantUtils.cpp
+    CPP/Windows/Synchronization.cpp
+    CPP/Windows/System.cpp
+    CPP/Windows/TimeUtils.cpp
+
     CPP/7zip/Archive/ApmHandler.cpp
     CPP/7zip/Archive/ArHandler.cpp
     CPP/7zip/Archive/ArjHandler.cpp
@@ -300,20 +310,6 @@ target_sources(7zip PRIVATE
     C/Util/LzmaLib/LzmaLib.def
 )
 
-if(WIN32)
-    target_sources(7zip PRIVATE
-        CPP/Windows/FileDir.cpp
-        CPP/Windows/FileFind.cpp
-        CPP/Windows/FileIO.cpp
-        CPP/Windows/FileName.cpp
-        CPP/Windows/PropVariant.cpp
-        CPP/Windows/PropVariantUtils.cpp
-        CPP/Windows/Synchronization.cpp
-        CPP/Windows/System.cpp
-        CPP/Windows/TimeUtils.cpp
-    )
-endif()
-
 # 7zCrcOpt
 if(VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

diff --git a/ports/7zip/fix_timespec_get_broken_on_android.patch b/ports/7zip/fix_timespec_get_broken_on_android.patch
@@ -0,0 +1,13 @@
+diff --git a/CPP/Windows/TimeUtils.cpp b/CPP/Windows/TimeUtils.cpp
+index bbd79ba..8df3ea3 100644
+--- a/CPP/Windows/TimeUtils.cpp
++++ b/CPP/Windows/TimeUtils.cpp
+@@ -259,7 +259,7 @@ bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
+       Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.3,
+       Cygwin 2.9, mingw, MSVC 14, Android 9.0.
+ */
+-#if defined(TIME_UTC)
++#if defined(TIME_UTC) && (!defined(__ANDROID__) || __ANDROID_API__ >= 29)
+ #define ZIP7_USE_timespec_get
+ // #pragma message("ZIP7_USE_timespec_get")
+ #elif defined(CLOCK_REALTIME)
diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF "${VERSION}"
     SHA512 dc0241ed96907965445550912d1171fe32230a52997b089558a4cc73a662fc6a17940db8dcb0794b805268964899d9e5a48ddb444e92b56fd243bbaa17c20a1c
     HEAD_REF main
+    PATCHES
+        fix_timespec_get_broken_on_android.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version-string": "24.09",
+  "port-version": 1,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO alembic/alembic
     REF "${VERSION}"
-    SHA512 510cc85346b685833091cd616ad6d8a3ba602e716747ab8dea6573abbaa1a2d49eed80b2d566b68293df78f3f3b9cf412ff4e3515f0d37951d63b9634b207a08
+    SHA512 02b7bf5782e83efb08a8653f130b02565fa997e857dbd8d0523e1b218ff58d929fbf9690db0980e8101a31f01a67341b6000af8794538890ef7d759fe0289e2f
     HEAD_REF master
 )
 

diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "alembic",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.",
   "homepage": "https://alembic.io/",
   "supports": "!(windows & x86) & !uwp",

diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO liballeg/allegro5
-    REF ${VERSION}
-    SHA512 5466e547a20bf22d606a385eeb9facc57b43c7f64689c724f82a572d4730dc62b2860829435b739a716ebca85fdc01c071f3e630048cdfd4799157e61fe815e9
+    REF "${VERSION}"
+    SHA512 fe9a1c28824b88d34045cf3a296a5671f5b6992f881678bbeb5290ec220138ab9bd3608fa241539d39a2c6eec32ef267d31f2694a4c5b06d13164eead6a13a5b
     HEAD_REF master
     PATCHES
         do-not-copy-pdbs-to-lib.patch

diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "allegro5",
-  "version": "5.2.9.1",
-  "port-version": 1,
+  "version": "5.2.10.0",
   "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.",
   "homepage": "https://liballeg.org/",
   "license": "BSD-3-Clause AND Zlib",

diff --git a/ports/alsa/vcpkg-cmake-wrapper.cmake b/ports/alsa/vcpkg-cmake-wrapper.cmake
@@ -22,10 +22,7 @@ find_library(
 include(SelectLibraryConfigurations)
 select_library_configurations(ALSA)
 unset(ALSA_FOUND)
-
-if(NOT ALSA_INCLUDE_DIR OR NOT ALSA_LIBRARY)
-  message(FATAL_ERROR "Broken installation of the alsa vcpkg port")
-endif()
+set(ALSA_LIBRARY "${ALSA_LIBRARY}" CACHE INTERNAL "")
 
 _find_package(${ARGS})
 

diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "alsa",
   "version": "1.2.13",
+  "port-version": 1,
   "description": "The Advanced Linux Sound Architecture (ALSA) - library",
   "homepage": "https://www.alsa-project.org/",
   "license": "LGPL-2.1-or-later",

diff --git a/ports/angle/cmake-buildsystem/CMakeLists.txt b/ports/angle/cmake-buildsystem/CMakeLists.txt
@@ -414,6 +414,7 @@ set(_possibleTargets EGL GLESv2 ANGLE)
 foreach(_target IN LISTS _possibleTargets)
     if(TARGET ${_target})
         list(APPEND _installableTargets "${_target}")
+        target_include_directories(${_target} INTERFACE $<INSTALL_INTERFACE:include>)
     endif()
 endforeach()
 

diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_5414",
-  "port-version": 9,
+  "port-version": 10,
   "description": [
     "A conformant OpenGL ES implementation for Windows, Mac and Linux.",
     "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."

diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
     URL "https://aomedia.googlesource.com/aom"
-    REF 8ad484f8a18ed1853c094e7d3a4e023b2a92df28 # v3.9.1
+    REF d6f30ae474dd6c358f26de0a0fc26a0d7340a84c
     HEAD_REF main
     PATCHES
         aom-rename-static.diff
@@ -32,7 +32,7 @@ vcpkg_cmake_configure(
         -DENABLE_TESTDATA=OFF
         -DENABLE_TESTS=OFF
         -DENABLE_TOOLS=OFF
-        -DTHREADS_PREFER_PTHREAD_FLAGS=ON
+        -DTHREADS_PREFER_PTHREAD_FLAG=ON
         "-DCMAKE_ASM_NASM_COMPILER=${NASM}"
         "-DPERL_EXECUTABLE=${PERL}"
 )
@@ -42,13 +42,6 @@ vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VPCKG_TARGET_IS_MINGW)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
-    if(NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
-    endif()
-endif()
-
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"

diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "aom",
-  "version-semver": "3.9.1",
+  "version-semver": "3.11.0",
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "license": "BSD-2-Clause",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/apache-datasketches/portfile.cmake b/ports/apache-datasketches/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/datasketches-cpp
     REF "${VERSION}"
-    SHA512 eb307d0e6468fc4784fb4ba2a49b894c59c2669386c5983afd671695dadd4e50711de6a50a2824d14af7c474fdbb0c6bbe2f3352d2481fb74fd16654674cbbfc
+    SHA512 3be2480390bff9ec62d92885174dc5cb7e86c9e5f8215ee57e77626151002d614d41254d532e53c7e1d509b420ee0024edfcea6043caa1b9863d100f492096cd
     HEAD_REF master
 )
 

diff --git a/ports/apache-datasketches/vcpkg.json b/ports/apache-datasketches/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "apache-datasketches",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "description": "Apache DataSketches Core C++ Library Component.",
   "homepage": "https://datasketches.apache.org/",
   "license": "Apache-2.0",

diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arma
     FILENAME "armadillo-${VERSION}.tar.xz"
-    SHA512 55ee45be41ca240783edfd61f647401b0a32826850be82f5e957873c18de0dce87fc39d35e5f6363475ed912c3b1d08ff31151f25378d262d840aa6f15163ac8
+    SHA512 729229d28dbd199503dc15ba11a4f20d2b598993f7da448d40840255ff53ecc9f95bca3b472261d12dda15f2c4e2f8999ea39594c869a31a817be35b256efac5
     PATCHES
         cmake-config.patch
         dependencies.patch

diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "armadillo",
-  "version": "14.0.3",
+  "version": "14.2.2",
   "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
   "homepage": "https://arma.sourceforge.net/",
   "license": "Apache-2.0",

diff --git a/ports/arpack-ng/portfile.cmake b/ports/arpack-ng/portfile.cmake
@@ -23,6 +23,7 @@ vcpkg_cmake_configure(
         -DICBEXMM=OFF
         -DEXAMPLES=OFF
         -DTESTS=OFF
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_cmake_install()

diff --git a/ports/arpack-ng/vcpkg.json b/ports/arpack-ng/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "arpack-ng",
   "version": "3.9.1",
+  "port-version": 1,
   "description": "ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.",
   "homepage": "https://github.com/opencollab/arpack-ng",
   "license": "BSD-3-Clause",

diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tradias/asio-grpc
     REF "v${VERSION}"
-    SHA512 477ce61e4f1f6baed2f95d49f8d67572f1c88fb98e76006ac82ef02c633d8121d01b835b5da1cbac183e3154b3dcd9a3f9307601a108a5e8b7b902dab4a65a10
+    SHA512 d502152a1adc2f7cbd521b0226fbe7ffc15327091efd8f94ab445155bbcf46c1d5773760e106c602deb5d857f9c8fc8784ac50ead564d6e7f27b270137c4c4f1
     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": "3.3.0",
+  "version": "3.4.1",
   "description": "Asynchronous gRPC with Asio/unified executors",
   "homepage": "https://github.com/Tradias/asio-grpc",
   "license": "Apache-2.0",

diff --git a/ports/audiofile/fix-cmakeLists.patch b/ports/audiofile/fix-cmakeLists.patch
diff --git a/ports/audiofile/portfile.cmake b/ports/audiofile/portfile.cmake
@@ -4,10 +4,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO adamstark/AudioFile
     REF "${VERSION}"
-    SHA512 b0612e6d6c440e52a168f27410d6ac14f7fcef2ba183e8a80e03f924e6fc778c01e4f46b40cab10dd73c48f8f10dc4112c58f602728fdeec0bc3e143852fc95e
+    SHA512 ee8af7687fe420634ea8dacef7ecc0c4d3dd1de13c6131202710b3055fdc5ffb27ac1e8ff034690a3ce5d512b6182a788adfa5852a29ac532a08322b14083e8a
     HEAD_REF master
-    PATCHES
-        fix-cmakeLists.patch
 )
 
 vcpkg_cmake_configure(
@@ -19,8 +17,9 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile)
+vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile CONFIG_PATH lib/cmake/AudioFile)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/audiofile/vcpkg.json b/ports/audiofile/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "audiofile",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A simple header-only C++ library for reading and writing audio files.",
   "homepage": "https://github.com/adamstark/AudioFile",
   "license": "MIT",

diff --git a/ports/aurora-au/disable-googletest.patch b/ports/aurora-au/disable-googletest.patch
diff --git a/ports/aurora-au/portfile.cmake b/ports/aurora-au/portfile.cmake
@@ -4,13 +4,16 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aurora-opensource/au
     REF "${VERSION}"
-    SHA512 4aa3282f6b76fbadd04ca572734f72c86b1b0b4e85fc21a03d1ab00b83d3aea319ab2dac3934361b5f6fa7c4a0dccece94fe0a57f3d73d208315b51b1950e374
+    SHA512 85b90924f82a123000ecc3c9a1f44f31d6f1a7f3664968abc27f4fbdc6712b7bc9a8a30428b9422529fed7fe269a13c57e0dad8483658530dcbfa0c6b15daa6c
     HEAD_REF main
-    PATCHES 
-        disable-googletest.patch
 )
 
-vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DAU_EXCLUDE_GTEST_DEPENDENCY=1
+    )
+
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(

diff --git a/ports/aurora-au/vcpkg.json b/ports/aurora-au/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "aurora-au",
-  "version-semver": "0.3.5",
-  "port-version": 1,
+  "version-semver": "0.4.1",
   "description": "A C++14-compatible physical units library with no dependencies and a single-file delivery option. Emphasis on safety, accessibility, performance, and developer experience.",
   "homepage": "https://github.com/aurora-opensource/au",
   "documentation": "https://aurora-opensource.github.io/au/main/",

diff --git a/ports/autodock-vina/CMakeLists.txt b/ports/autodock-vina/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_policy(VERSION 3.11)
 
 project(autodock-vina)
 
-set(GIT_VERSION v1.2.5)
+set(GIT_VERSION v1.2.6)
 set(CMAKE_CXX_STANDARD 11)
 
 find_package(Boost REQUIRED COMPONENTS