[pull] master from microsoft:master

ports/capnproto/undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch → ports/capnproto/001-fix-android.patch

@@ -1,14 +1,5 @@
-From 306220e57881064da99f89ad4192b3e19c7953a9 Mon Sep 17 00:00:00 2001
-From: Stig Hornang <shornang@gmail.com>
-Date: Thu, 31 Aug 2023 21:20:09 +0200
-Subject: [PATCH] Undef KJ_USE_EPOLL for ANDROID_PLATFORM < 23
-
----
- c++/src/kj/async-unix.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
 diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h
-index 665305ea..c5f195cf 100644
+index e66ad8e4..fe8d803c 100644
 --- a/c++/src/kj/async-unix.h
 +++ b/c++/src/kj/async-unix.h
 @@ -34,7 +34,10 @@
@@ -23,6 +14,3 @@ index 665305ea..c5f195cf 100644
  // Default to epoll on Linux.
  #define KJ_USE_EPOLL 1
  #elif __APPLE__ || __FreeBSD__ || __NetBSD__ || __DragonFly__
--- 
-2.41.0.windows.3
-

ports/capnproto/002-fix-pkg-config.patch

@@ -0,0 +1,54 @@
+diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
+index afc8ff6a..a311106f 100644
+--- a/c++/CMakeLists.txt
++++ b/c++/CMakeLists.txt
+@@ -218,6 +218,9 @@ if(NOT MSVC)
+   set(PTHREAD_CFLAGS "-pthread")
+ endif()
+ set(STDLIB_FLAG)  # TODO: Unsupported
++if(WIN32)
++  set(ASYNC_LIBS "-lws2_32")
++endif()
+ set(CAPNP_PKG_CONFIG_FILES
+   pkgconfig/kj.pc
+   pkgconfig/capnp.pc
+@@ -233,13 +233,18 @@ if(NOT CAPNP_LITE)
+     pkgconfig/kj-gzip.pc
+     pkgconfig/kj-http.pc
+     pkgconfig/kj-test.pc
+-    pkgconfig/kj-tls.pc
+     pkgconfig/capnp-rpc.pc
+     pkgconfig/capnp-websocket.pc
+     pkgconfig/capnp-json.pc
+   )
+ endif()
+
++if(WITH_OPENSSL)
++  list(APPEND CAPNP_PKG_CONFIG_FILES
++    pkgconfig/kj-tls.pc
++  )
++endif()
++
+ foreach(pcfile ${CAPNP_PKG_CONFIG_FILES})
+   configure_file(${pcfile}.in "${CMAKE_CURRENT_BINARY_DIR}/${pcfile}" @ONLY)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${pcfile}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+diff --git a/c++/pkgconfig/kj-tls.pc.in b/c++/pkgconfig/kj-tls.pc.in
+index 22b8292..a4463cd 100644
+--- a/c++/pkgconfig/kj-tls.pc.in
++++ b/c++/pkgconfig/kj-tls.pc.in
+@@ -8,4 +8,5 @@ Description: Basic utility library called KJ (TLS part)
+ Version: @VERSION@
+ Libs: -L${libdir} -lkj-tls @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @STDLIB_FLAG@
+ Requires: kj-async = @VERSION@
++Requires.private: openssl
+ Cflags: -I${includedir} @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
+diff --git a/c++/pkgconfig/kj-async.pc.in b/c++/pkgconfig/kj-async.pc.in
+index 1a7a55f..4e2c765 100644
+--- a/c++/pkgconfig/kj-async.pc.in
++++ b/c++/pkgconfig/kj-async.pc.in
+@@ -8,4 +8,4 @@ Description: Basic utility library called KJ (async part)
+ Version: @VERSION@
+ Libs: -L${libdir} -lkj-async @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @STDLIB_FLAG@
+ Requires: kj = @VERSION@
+-Cflags: -I${includedir} @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
++Cflags: -I${includedir} @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@

ports/capnproto/portfile.cmake

@@ -4,10 +4,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO capnproto/capnproto
     REF "v${VERSION}"
-    SHA512 6f31294ffe613b28ee891a7e7465d35781697dc7ed51f806b7c707c8fc94ead01099ab356041646e382320ff922f40c393b4b58f3106bbc3fb547386d7c0ed1a
+    SHA512 d3072f590212d40010fa7946e000ac9fe927c9058fcda518c14275c7a217207db644d44a124398873d3875bb5f1f8e52dbeccfbc4b4c003e8e35fd83486fc343
     HEAD_REF master
     PATCHES
-        undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch
+        001-fix-android.patch
+        002-fix-pkg-config.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

ports/capnproto/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "capnproto",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Data interchange format and capability-based RPC system",
   "homepage": "https://capnproto.org/",
   "license": "MIT",

ports/draco/portfile.cmake

@@ -1,3 +1,9 @@
+vcpkg_download_distfile(ALGORITHM_INCLUDE_PATCH
+    URLS "https://github.com/google/draco/commit/b283ba36eea52dc525ab4c9324ae6de2055d1191.patch?full_index=1"
+    FILENAME "draco-b283ba36eea52dc525ab4c9324ae6de2055d1191.patch"
+    SHA512 8dab3a74ec52b6628955c68e79cca70383ec283f0624c054ec3a29baf6455029b38aeded4ed819978f891a0192472116e7c57d3100e1bc714ec96f7e3d4be778
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/draco
@@ -10,6 +16,7 @@ vcpkg_from_github(
         fix-pkgconfig.patch
         disable-symlinks.patch
         install-linkage.diff
+        "${ALGORITHM_INCLUDE_PATCH}"
 )
 
 if(VCPKG_TARGET_IS_EMSCRIPTEN)

ports/draco/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "draco",
   "version": "1.5.7",
+  "port-version": 1,
   "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.",
   "homepage": "https://github.com/google/draco",
   "license": "Apache-2.0",

ports/ecbuild/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ecmwf/ecbuild
     REF "${VERSION}"
-    SHA512 3092a0d9352670b869e0bc00bddc53eb735851a7cdffe5c04382859bc346e6c18f61f8e4e7ad71a4dc3aa982fb09ff8158f1f44e1f21a1bbb5a6862a3545a8eb
+    SHA512 f6a390660ac8956558ff5df2652d91fab3e800c65c351023844e2b5d81785013b1cb3dadd8a0c85a696ff2e5acd7c36e12e4ff3843e0927f4be19fea87298fd4
     HEAD_REF develop
 )
 

ports/ecbuild/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "ecbuild",
-  "version": "3.14.2",
+  "version": "3.15.0",
   "description": "ECMWF CMake build system and CMake macro collection",
   "homepage": "https://github.com/ecmwf/ecbuild",
   "license": null

ports/gtest/portfile.cmake

@@ -1,3 +1,9 @@
+vcpkg_download_distfile(CHARACTER_CONVERSION_PATCH
+    URLS "https://github.com/google/googletest/commit/fa8438ae6b70c57010177de47a9f13d7041a6328.patch?full_index=1"
+    FILENAME "googletest-fa8438ae6b70c57010177de47a9f13d7041a6328.patch"
+    SHA512 fe436859fc5cafdc18e7fcb6d12903ea7a4aa37a3a913132d717ab9f8d5495ead9e4ddbbb89d70199f498588ff04e7b47ea988cc3032ef46dabe03eb4110dd5f
+)
+
 if (EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
 endif()
@@ -12,6 +18,7 @@ vcpkg_from_github(
         001-fix-UWP-death-test.patch
         clang-tidy-no-lint.patch
         fix-main-lib-path.patch
+        "${CHARACTER_CONVERSION_PATCH}"
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)

ports/gtest/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "gtest",
   "version-semver": "1.17.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Google Testing and Mocking Framework",
   "homepage": "https://github.com/google/googletest",
   "license": "BSD-3-Clause",

ports/libsl3/portfile.cmake

@@ -0,0 +1,29 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO a4z/libsl3
+    REF "v${VERSION}"
+    SHA512 392c73c9387a17286ea48e2cb5b70b8fc4713f5749947235631d5a297f11e69cafb92aed15fe766c071784dccd4e5e2fbb3c3ce715c7ffbc6495ee3913f9b12d
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=17
+        -DCMAKE_CXX_STANDARD_REQUIRED=ON
+        -Dsl3_BUILD_DOCS=OFF
+        -Dsl3_USE_COMMON_COMPILER_WARNINGS=OFF
+        -Dsl3_USE_INTERNAL_SQLITE3=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME sl3 CONFIG_PATH lib/cmake/sl3)
+vcpkg_copy_pdbs()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/README.md")

ports/libsl3/usage

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

ports/libsl3/vcpkg.json

@@ -0,0 +1,19 @@
+{
+  "name": "libsl3",
+  "version": "1.2.53003",
+  "description": "A C++ interface for SQLite 3.x.",
+  "homepage": "https://github.com/a4z/libsl3",
+  "documentation": "https://a4z.github.io/libsl3/",
+  "license": "MPL-2.0",
+  "dependencies": [
+    "sqlite3",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}

ports/projectm/portfile.cmake

@@ -1,57 +1,62 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO projectM-visualizer/projectm
-    REF "v${VERSION}"
-    SHA512 "9102e5136653abb81da2f36f4b08446ef553fe2d49879d8e906bd4cd30728f97ca87075e6561605cf05e0f4ecf8cbd3d95f372a99b2af893058f5c522864ea69"
-    HEAD_REF master
-    PATCHES
-        macos-pkgconfig.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        "boost-filesystem" ENABLE_BOOST_FILESYSTEM
-)
-
-if (NOT ENABLE_BOOST_FILESYSTEM)
-    message(STATUS
-        "If your current vcpkg target triplet or toolchain does not support C++17 or lacks std::filesystem support, "
-        "please enable the \"boost-filesystem\" feature.")
-endif ()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        ${FEATURE_OPTIONS}
-
-        # Use projectm-eval and GLM from ports as well
-        -DENABLE_SYSTEM_PROJECTM_EVAL=ON
-        -DENABLE_SYSTEM_GLM=ON
-
-        # Enforce additional build flags
-        -DENABLE_PLAYLIST=ON
-        -DENABLE_SDL_UI=OFF
-        -DBUILD_TESTING=OFF
-        -DBUILD_DOCS=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(
-    PACKAGE_NAME "projectM4"
-    CONFIG_PATH "lib/cmake/projectM4"
-    DO_NOT_DELETE_PARENT_CONFIG_PATH
-)
-
-vcpkg_cmake_config_fixup(
-    PACKAGE_NAME "projectM4Playlist"
-    CONFIG_PATH "lib/cmake/projectM4Playlist"
-)
-
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO projectM-visualizer/projectm
+    REF "v${VERSION}"
+    SHA512 "dbb3088c5a0db9eaabd4d2c3232df2dd939a4b1ce5928916a63e7b10cd4321b749d779a5e39a883a12318c613f91f3b4241973958edf52291d53e1b3dc348c77"
+    HEAD_REF master
+    PATCHES
+        macos-pkgconfig.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "boost-filesystem" ENABLE_BOOST_FILESYSTEM
+)
+
+if (NOT ENABLE_BOOST_FILESYSTEM)
+    message(STATUS
+        "If your current vcpkg target triplet or toolchain does not support C++17 or lacks std::filesystem support, "
+        "please enable the \"boost-filesystem\" feature.")
+endif ()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+
+        # Use projectm-eval and GLM from ports as well
+        -DENABLE_SYSTEM_PROJECTM_EVAL=ON
+        -DENABLE_SYSTEM_GLM=ON
+
+        # Enforce additional build flags
+        -DENABLE_PLAYLIST=ON
+        -DENABLE_SDL_UI=OFF
+        -DBUILD_TESTING=OFF
+        -DBUILD_DOCS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME "projectM4"
+    CONFIG_PATH "lib/cmake/projectM4"
+    DO_NOT_DELETE_PARENT_CONFIG_PATH
+)
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME "projectM4Playlist"
+    CONFIG_PATH "lib/cmake/projectM4Playlist"
+)
+
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(
+    COMMENT "The bundled SOIL2 sources include MIT-0 code, Apache-2.0-licensed ETC1 code, and MIT-licensed PowerVR code, but upstream does not provide their complete license texts as separate files."
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE.txt"
+        "${SOURCE_PATH}/vendor/hlslparser/LICENSE"
+)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/projectm/usage

@@ -1,9 +1,9 @@
-projectm provides CMake targets:
-
-  find_package(projectM4 REQUIRED)
-  target_link_libraries(main PRIVATE libprojectM::projectM)
-
-To use and link the playlist library component:
-
-  find_package(projectM4 REQUIRED COMPONENTS Playlist)
-  target_link_libraries(main PRIVATE libprojectM::playlist)
+projectm provides CMake targets:
+
+  find_package(projectM4 REQUIRED)
+  target_link_libraries(main PRIVATE libprojectM::projectM)
+
+To use and link the playlist library component:
+
+  find_package(projectM4 REQUIRED COMPONENTS Playlist)
+  target_link_libraries(main PRIVATE libprojectM::playlist)

ports/projectm/vcpkg.json

@@ -1,9 +1,9 @@
 {
   "name": "projectm",
-  "version": "4.1.6",
+  "version": "4.1.7",
   "description": "The projectM Music Visualizer. A cross-platform, OpenGL-based reimplementation of Milkdrop as a reusable library.",
   "homepage": "https://github.com/projectM-visualizer/projectm",
-  "license": "LGPL-2.1-only AND MIT AND MIT-0",
+  "license": "LGPL-2.1-only AND MIT AND MIT-0 AND Apache-2.0",
   "dependencies": [
     {
       "name": "glew",

ports/vmaware-vm-detection/001-fix-linkage.patch

@@ -0,0 +1,12 @@
+diff --git a/src/vmaware.hpp b/src/vmaware.hpp
+index 764adc8..6d29f4a 100644
+--- a/src/vmaware.hpp
++++ b/src/vmaware.hpp
+@@ -400,6 +400,7 @@
+     #pragma comment(lib, "powrprof.lib")
+     #pragma comment(lib, "advapi32.lib")
+     #pragma comment(lib, "gdi32.lib")
++    #pragma comment(lib, "user32.lib")
+ #elif (LINUX)
+     #if (x86)
+         #include <cpuid.h>