Merge branch 'microsoft:master' into master

ports/libdatachannel/portfile.cmake

@@ -20,6 +20,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE  # version.h configuration
     OPTIONS
         ${FEATURE_OPTIONS}
         -DPREFER_SYSTEM_LIB=ON

ports/libdatachannel/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libdatachannel",
   "version-semver": "0.21.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libdatachannel",
   "license": "MPL-2.0",

ports/llfio/portfile.cmake

@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ned14/llfio
-    REF 2af67dad6d87ec37a4dd042c48f5d0edcdeff326
-    SHA512 207cf7b113aa7703a9197254a01bde794a1ec5ab8ab94e690913344b29bb2579e942f12260ce6c208fb919e11731f57d2e5c80ca85ccf1d98f6747a1681be7a9
+    REF 52560148e7e199675a38ab5669d172a3db6a5c94
+    SHA512 a13c8c3340b871f492b1a9eab087ff0ff16d7bee2e3fb3b6539d34efdc3e286920f89283f4df48a79f716803b58abf389ab379bc08838b65d6f5f05455505492
     HEAD_REF develop
 )
 

ports/llfio/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "llfio",
-  "version-date": "2024-09-05",
+  "version-date": "2025-01-13",
   "maintainers": [
     "Niall Douglas <[email protected]>",
     "Henrik Gaßmann <[email protected]>"

ports/miniupnpc/portfile.cmake

@@ -2,8 +2,8 @@ string(REPLACE "." "_" MINIUPNPC_VERSION "${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO miniupnp/miniupnp
-    REF "miniupnpd_${MINIUPNPC_VERSION}"
-    SHA512 f461b57446d9086e8fc2caf6ef202a78d204b2580d6096aca63234fda53302cad03840b14cc0d8b68e9033049b749be46e35c3737cc6cbcd2ad30c59b737a390
+    REF "miniupnpc_${MINIUPNPC_VERSION}"
+    SHA512 8b3e0499507a7da679676c9c086658b0be441845a9649c0e989227d6f7afd9de754f169e7c726e7bb5c450d4b62bb92fabfcfd60696350b6e137a13fb1d3201a
     HEAD_REF master
 )
 

ports/miniupnpc/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "miniupnpc",
-  "version": "2.3.7",
+  "version": "2.3.0",
   "description": "UPnP client library/tool to access Internet Gateway Devices",
   "supports": "!uwp",
   "dependencies": [

ports/onnx/fix-cxx_standard.patch

@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 55869f4..e8b20cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -524,6 +524,7 @@ else()
+   set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
+ endif()
+ target_compile_definitions(onnx_proto PRIVATE ${ONNX_API_DEFINE})
++target_compile_features(onnx_proto PUBLIC cxx_std_${CMAKE_CXX_STANDARD})
+
+ if(ONNX_USE_LITE_PROTO)
+   if(TARGET protobuf::libprotobuf-lite)

ports/onnx/portfile.cmake

@@ -4,10 +4,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onnx/onnx
     REF "v${VERSION}"
-    SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d
+    SHA512 5a18e2b19ec9c18c8b115fb7e12ed98eddaa581c95f15c4dd420cd6c86e7caa04f9a393da589e76b89cf9b3544abd3749a8c77c2446782f37502eb74e9b1f661
     PATCHES
         fix-cmakelists.patch
         fix-dependency-protobuf.patch
+        fix-cxx_standard.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)

ports/onnx/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "onnx",
-  "version-semver": "1.16.2",
-  "port-version": 1,
+  "version-semver": "1.17.0",
   "description": "Open standard for machine learning interoperability",
   "homepage": "https://onnx.ai",
   "license": "Apache-2.0",

ports/openvino/portfile.cmake

@@ -44,7 +44,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openvinotoolkit/openvino
     REF "${VERSION}"
-    SHA512 b003647de3de49e605943488ca9b2e5196b20d95b3152f0c2331c283d4cb253d1bbbb9cde04fa82733d3871d7128c6db6210957660bd89f26462798f782eca47
+    SHA512 5bfe9c0b79b8f8bed7f39b78003424d4b7146d7c6afafc668752a0c8c45558fc8f37cfc26f783beb73c6919cb65313f24fd2e30c81651b34abf74c43c3bb7e32
     HEAD_REF master
     PATCHES
         # vcpkg specific patch, because OV creates a file in source tree, which is prohibited
@@ -84,8 +84,8 @@ if(ENABLE_INTEL_GPU)
     vcpkg_from_github(
         OUT_SOURCE_PATH DEP_SOURCE_PATH
         REPO oneapi-src/oneDNN
-        REF 1722066ad4c0f15495f2d0fcbe9deb2bfd188c36
-        SHA512 0b0461bf42d67f0fe7c6c61289a28e42915f7ac2ea5cc569957b8bb601962bec6135e84a2716911394952dffe2bb557c2d59d42c7f80a8db3c3937ecc6bd8ce8
+        REF 0f269193c7466313888d3338209d0d06a22cc6fa
+        SHA512 892a32b930fbba3364e2ea9ee47bf6faba3b36cb99e836bcc5d57a30a368e5061bb7194219f30dbcede18e3ad5e671c9cfa4192799ac53cfa71706e03556e5bd
     )
     file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
 

ports/openvino/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "openvino",
-  "version": "2024.5.0",
+  "version": "2024.6.0",
   "maintainers": "OpenVINO Developers <[email protected]>",
   "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
   "description": [

ports/qt5-webengine/portfile.cmake

@@ -45,6 +45,19 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
 vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
 vcpkg_add_to_path(PREPEND "${NODEJS_DIR}")
 
+vcpkg_execute_in_download_mode(
+    COMMAND "${NINJA}" --version
+    OUTPUT_VARIABLE ninja_version
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+)
+if(ninja_version VERSION_GREATER_EQUAL "1.12.1")
+    message(WARNING
+        "Found ninja version ${ninja_version} which may fail to build ${PORT}."
+        "You can supply a different filepath using per-port customization of CMake variable NINJA."
+    )
+endif()
+
 set(PATCHES common.pri.patch
             gl.patch
             build_1.patch

ports/qt5-webengine/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qt5-webengine",
   "version": "5.15.16",
+  "port-version": 1,
   "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
   "license": null,
   "supports": "!static",

ports/salome-configuration/portfile.cmake

@@ -1,7 +1,11 @@
-vcpkg_from_git(
+string(REPLACE "." "_" UNDERSCORE_VERSION "${VERSION}")
+
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH_CONFIG
-    URL "https://git.salome-platform.org/gitpub/tools/configuration.git"
-    REF "25f724f7a6c0000330a40c3851dcd8bc2493e1fa"
+    REPO SalomePlatform/configuration
+    REF "V${UNDERSCORE_VERSION}"
+    SHA512 e905a0f1e1105f5a630153036b80942032ccc07fad411d390e4da19d56561e224ac2ac681873b97d811d33ce4b0c9518ce3488b54414a42e011c39628d8e1673
+    HEAD_REF master
 )
 
 file(COPY "${SOURCE_PATH_CONFIG}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/salome-configuration/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "salome-configuration",
   "version": "9.10.0",
+  "port-version": 1,
   "description": "Configuration files and other utilities for SALOME platform",
   "homepage": "https://www.salome-platform.org",
   "license": "LGPL-2.1-or-later",

ports/salome-medcoupling/portfile.cmake

@@ -4,10 +4,14 @@ if(VCPKG_TARGET_IS_WINDOWS)
     # in the EXPORTS macros.
 endif()
 
-vcpkg_from_git(
+string(REPLACE "." "_" UNDERSCORE_VERSION "${VERSION}")
+
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL "https://git.salome-platform.org/gitpub/tools/medcoupling.git"
-    REF "fe2e38d301902c626f644907e00e499552bb2fa5"
+    REPO SalomePlatform/medcoupling
+    REF "V${UNDERSCORE_VERSION}"
+    SHA512 576b10daf58830e934a3f9d06abc63a22be76b995b2c2f2d1ab0bf16a76f3ba90f583eab06be2d665874cb433f8c990b7a7fd6724f69a5a3f9a5c20c775407cd
+    HEAD_REF master
     PATCHES 
         win.patch 
         fix-missing-symbols.patch

ports/salome-medcoupling/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "salome-medcoupling",
   "version": "9.10.0",
+  "port-version": 1,
   "description": "salome-medcoupling is a part of SALOME platform to manipulate meshes and fields in memory, and use salome-med format for files.",
   "homepage": "https://www.salome-platform.org",
   "license": "GPL-2.0-or-later",

ports/tbb/fix-lang.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
+index cf6d8bdb..458ea339 100644
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -48,7 +48,7 @@ endif()
+ # information is written to either stdout or stderr. To not make any
+ # assumptions, both are captured.
+ execute_process(
+-    COMMAND ${CMAKE_COMMAND} -E env "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null
++    COMMAND ${CMAKE_COMMAND} -E env "LC_ALL=C" "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null
+     OUTPUT_VARIABLE ASSEMBLER_VERSION_LINE_OUT
+     ERROR_VARIABLE ASSEMBLER_VERSION_LINE_ERR
+     OUTPUT_STRIP_TRAILING_WHITESPACE

ports/tbb/portfile.cmake

@@ -7,6 +7,8 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3
     HEAD_REF master
+    PATCHES
+        fix-lang.patch # https://github.com/uxlfoundation/oneTBB/pull/1606
 )
 
 vcpkg_check_features(

ports/tbb/vcpkg.json

@@ -2,6 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tbb",
   "version": "2022.0.0",
+  "port-version": 1,
   "description": "Intel's Threading Building Blocks.",
   "homepage": "https://github.com/oneapi-src/oneTBB",
   "license": "Apache-2.0",

ports/vcpkg-make/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-make",
-  "version-date": "2024-12-27",
+  "version-date": "2025-01-13",
   "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
   "license": null,
   "supports": "native",

ports/vcpkg-make/vcpkg_make.cmake

@@ -53,7 +53,7 @@ function(vcpkg_run_shell_as_build)
         "SHELL;COMMAND;NO_PARALLEL_COMMAND;SAVE_LOG_FILES"
     )
     z_vcpkg_unparsed_args(FATAL_ERROR)
-    z_vcpkg_required_args(SHELL WORKINK_DIRECTORY COMMAND LOGNAME)
+    z_vcpkg_required_args(SHELL WORKING_DIRECTORY COMMAND LOGNAME)
 
     set(extra_opts "")
     if(arg_SAVE_LOG_FILES)
@@ -62,9 +62,12 @@ function(vcpkg_run_shell_as_build)
 
     list(JOIN arg_COMMAND " " cmd)
     list(JOIN arg_NO_PARALLEL_COMMAND " " no_par_cmd)
+    if(NOT no_par_cmd STREQUAL "")
+        set(no_par_cmd NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}")
+    endif()
     vcpkg_execute_build_process(
         COMMAND ${arg_SHELL} -c "${cmd}"
-        NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}"
+        ${no_par_cmd}
         WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}"
         LOGNAME "${arg_LOGNAME}"
         ${extra_opts}

ports/vcpkg-make/vcpkg_make_common.cmake

@@ -11,7 +11,7 @@ macro(z_vcpkg_make_set_common_vars)
     endforeach()
     set(buildtypes release)
     if(NOT VCPKG_BUILD_TYPE)
-        list(APPEND buildtypes debug)
+        list(PREPEND buildtypes debug)
     endif()
 endmacro()
 
@@ -557,7 +557,6 @@ function(z_vcpkg_make_prepare_flags)
         ${flags_opts}
     )
     if(NOT DEFINED VCPKG_BUILD_TYPE)
-        list(APPEND all_buildtypes DEBUG)
         z_vcpkg_make_prepare_compile_flags(
             CONFIG DEBUG 
             COMPILER_FRONTEND "${VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT}"

ports/vcpkg-make/vcpkg_make_configure.cmake

@@ -97,7 +97,6 @@ function(vcpkg_make_configure)
         set(opts "")
         if(NOT arg_DISABLE_DEFAULT_OPTIONS)
           z_vcpkg_make_default_path_and_configure_options(opts AUTOMAKE CONFIG "${configup}")
-          vcpkg_list(APPEND arg_OPTIONS ${opts})
         endif()
 
         set(configure_path_from_wd "./${relative_build_path}/configure")
@@ -116,7 +115,8 @@ function(vcpkg_make_configure)
                                     "${configure_path_from_wd}"
                                  OPTIONS 
                                     ${BUILD_TRIPLET}
-                                    ${arg_OPTIONS} 
+                                    ${arg_OPTIONS}
+                                    ${opts}
                                     ${arg_OPTIONS_${configup}}
                                  WORKING_DIRECTORY 
                                     "${target_dir}" 

ports/vcpkg-make/vcpkg_make_install.cmake

@@ -4,8 +4,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake")
 function(vcpkg_make_install)
     cmake_parse_arguments(PARSE_ARGV 0 arg
         "DISABLE_PARALLEL"
-        "LOGFILE_ROOT;MAKEFILE;TARGETS"
-        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE"
+        "LOGFILE_ROOT;MAKEFILE"
+        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;TARGETS"
     )
     z_vcpkg_unparsed_args(FATAL_ERROR)
 
@@ -81,26 +81,27 @@ function(vcpkg_make_install)
         endif()
 
         foreach(target IN LISTS arg_TARGETS)
+            string(REPLACE "/" "_" target_no_slash "${target}")
             vcpkg_list(SET make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j ${VCPKG_CONCURRENCY} ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt})
             vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j 1 ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt})
             message(STATUS "Making target '${target}' for ${TARGET_TRIPLET}-${short_buildtype}")
             if (arg_DISABLE_PARALLEL)
                 vcpkg_run_shell_as_build(
                     WORKING_DIRECTORY "${working_directory}"
-                    LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}"
+                    LOGNAME "${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}"
                     SHELL ${shell_cmd}
-                    NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line}
+                    COMMAND ${configure_env} ${no_parallel_make_cmd_line}
                 )
             else()
                 vcpkg_run_shell_as_build(
                     WORKING_DIRECTORY "${working_directory}"
-                    LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}"
+                    LOGNAME "${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}"
                     SHELL ${shell_cmd}
-                    COMMAND ${configure_env} ${no_parallel_make_cmd_line}
+                    COMMAND ${configure_env} ${make_cmd_line}
                     NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line}
                 )
             endif()
-            file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) 
+            file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) 
             if(logdata MATCHES "Warning: linker path does not have real file for library")
                 message(FATAL_ERROR "libtool could not find a file being linked against!")
             endif()

scripts/ci.baseline.txt

@@ -917,12 +917,13 @@ qt5-canvas3d:x64-windows=skip
 qt5-canvas3d:x64-windows-static=skip
 qt5-canvas3d:x64-windows-static-md=skip
 qt5-canvas3d:x86-windows=skip
+# Skipped to avoid exceeding the 48 hour time limit in CI
+# May also need an older ninja version
+qt5-webengine:x64-windows=skip
+qt5-webengine:x86-windows=skip
 # Missing system libraries
 qt5-x11extras:x64-osx=skip
 qt5-x11extras:arm64-osx=skip
-# Skipped to avoid exceeding the 48 hour time limit in CI
-qt5-webengine:x86-windows=skip
-qt5-webengine:x64-windows=skip
 # Missing system libraries
 qtwayland:x64-osx=skip
 qtwayland:arm64-osx=skip