From a38a88988750fa83b55d66b34bd89e3527cb51f4 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 18 Nov 2024 17:07:38 -0800 Subject: [PATCH 01/58] Deindex several ports that were =skip. Removes several ports from the registry that conflict with others and/or are effectively untested in vcpkg's build lab. [cppmicroservices] This port was added 5 years ago, appears relatively unused, only exists in repology due to vcpkg, and is full of vendored dependencies. It's also broken for most official triplets. Replaces https://github.com/microsoft/vcpkg/pull/34552 [ijg-libjpeg, mozjpeg] Leaf ports that we can't test and conflict with libjpeg-turbo, the curated registry's canonical jpeg implementation. [optional-bare] Conflicted with optional-lite. [qt5-canvas3d] Removed by qt5 upstream. [range-v3-vs2015] No longer maintained by upstream, no longer necessary in 2024. [rbdl-orb] File conflicts with its own dependency. [sciter] Left support by upstream 2 years ago and has conflicts with other ports. [signalrclient] "Obsolete" and conflicts with microsoft-signalr [spdk-*] Several conflicts with other ports. [c-dbg-macro] Conflicts with [dbg-macro] [casadi] https://github.com/microsoft/vcpkg/pull/41649 appears to have been merged in error, https://github.com/casadi/casadi/issues/3896 needs to land before this can be in the curated registry. Moreover, problems in the portfile were skipped in ci.baseline.txt rather than a supports expression. We are happy to bring this port back as soon as that issue is fixed :) [chromium-base] Not tested anywhere for years. [libmesh] Conflicts with other ports. [libpng-apng] Doesn't even exist in the first place. [libqcow] Release distribution file contains configured sources, while the source code in the repository does not. [libvmdk] Upstream is gone. [mecab] Upstream has not been edited in 10 years, combination of =skip and supports clause means not tested. [shogun] Not tested. Not deindexed: [bde] Conflicts with other ports. Warning was given more than a year ago: https://github.com/microsoft/vcpkg/pull/32645 . However, https://github.com/microsoft/vcpkg/pull/41335 appears to indicate that it works now, so the =skips were removed. [stxxl] Appears to work on my machine? [chartdir] Unstable download URLs are now mitigated by asset caching. [buck-yeh-bux] Looks like these are intended to be in the supports clause. [boringssl, fluidlite, libressl, libmariadb, libmysql] Appears to have a dedicated userbase despite being untestable in CI. [libxaw] Needed supports expression for ONLY_DYNAMIC_LIBRARY, should have always been a fail not a skip. Related: https://github.com/microsoft/vcpkg/pull/42165 --- ports/c-dbg-macro/portfile.cmake | 14 - ports/c-dbg-macro/vcpkg.json | 6 - ports/casadi/portfile.cmake | 41 --- ports/casadi/usage | 5 - ports/casadi/vcpkg.json | 17 -- ports/catch-classic/portfile.cmake | 16 -- ports/catch-classic/vcpkg.json | 11 - .../chromium-baseConfig.cmake.in | 81 ------ ports/chromium-base/portfile.cmake | 152 ----------- ports/chromium-base/res/.gn | 1 - ports/chromium-base/res/0001-base.patch | 101 -------- ports/chromium-base/res/0002-build.patch | 144 ----------- ports/chromium-base/res/BUILD.gn | 5 - ports/chromium-base/res/LASTCHANGE.committime | 1 - .../res/build_overrides/build.gni | 16 -- ports/chromium-base/res/fontconfig/BUILD.gn | 1 - ports/chromium-base/res/gclient_args.gni | 7 - ports/chromium-base/res/icu/BUILD.gn | 2 - ports/chromium-base/res/icu/config.gni | 3 - ports/chromium-base/res/libxml/BUILD.gn | 2 - .../res/protobuf/proto_library.gni | 0 ports/chromium-base/res/test_fonts/BUILD.gn | 1 - .../chromium-base/res/testing/gmock/BUILD.gn | 1 - .../chromium-base/res/testing/gtest/BUILD.gn | 1 - .../res/testing/libfuzzer/fuzzer_test.gni | 1 - ports/chromium-base/res/testing/test.gni | 20 -- .../res/tools/win/DebugVisualizers/BUILD.gn | 1 - .../tools/win/DebugVisualizers/chrome.natvis | 0 ports/chromium-base/vcpkg.json | 19 -- ports/cppmicroservices/fix_strnicmp.patch | 13 - ports/cppmicroservices/portfile.cmake | 47 ---- ports/cppmicroservices/remove-wx.patch | 13 - ports/cppmicroservices/vcpkg.json | 19 -- ports/cppmicroservices/werror.patch | 13 - ports/ijg-libjpeg/CMakeLists.txt | 65 ----- ports/ijg-libjpeg/portfile.cmake | 50 ---- ports/ijg-libjpeg/vcpkg.json | 19 -- ports/libmesh/copyright | 169 ------------- ports/libmesh/portfile.cmake | 47 ---- ports/libmesh/vcpkg.json | 9 - ports/libqcow/CMakeLists.txt | 83 ------ ports/libqcow/Config.cmake.in | 4 - ports/libqcow/macos_fixes.patch | 38 --- ports/libqcow/portfile.cmake | 35 --- ports/libqcow/vcpkg.json | 22 -- ports/libvmdk/CMakeLists.txt | 83 ------ ports/libvmdk/Config.cmake.in | 4 - ports/libvmdk/android.patch | 14 - ports/libvmdk/portfile.cmake | 32 --- ports/libvmdk/vcpkg.json | 20 -- ports/libxaw/vcpkg.json | 2 + ports/mecab/CMakeLists.txt | 67 ----- ports/mecab/Config.cmake.in | 4 - ports/mecab/fix-missing-functional.patch | 12 - ports/mecab/fix_wpath_unsigned.patch | 40 --- ports/mecab/portfile.cmake | 31 --- ports/mecab/vcpkg.json | 17 -- ports/mozjpeg/fix-install-error.patch | 13 - ports/mozjpeg/portfile.cmake | 63 ----- ports/mozjpeg/vcpkg.json | 19 -- ports/optional-bare/portfile.cmake | 28 -- ports/optional-bare/vcpkg.json | 16 -- ports/qt5-canvas3d/portfile.cmake | 4 - ports/qt5-canvas3d/vcpkg.json | 12 - ports/range-v3-vs2015/portfile.cmake | 15 -- ports/range-v3-vs2015/vcpkg.json | 7 - ports/rbdl-orb/portfile.cmake | 1 - ports/rbdl-orb/vcpkg.json | 10 - ports/sciter/portfile.cmake | 12 - ports/sciter/vcpkg.json | 7 - ports/shogun/cmake.patch | 93 ------- ports/shogun/eigen-3.4.patch | 89 ------- ports/shogun/fix-ASSERT-not-found.patch | 12 - ports/shogun/fix-build-error-with-fmt11.patch | 24 -- ports/shogun/fmt.patch | 216 ---------------- ports/shogun/portfile.cmake | 79 ------ ports/shogun/remove-bitsery.patch | 51 ---- ports/shogun/syntax.patch | 24 -- ports/shogun/vcpkg.json | 41 --- ports/signalrclient/0001_cmake.patch | 75 ------ .../0002_fix-compile-error.patch | 39 --- ports/signalrclient/portfile.cmake | 31 --- ports/signalrclient/vcpkg.json | 20 -- ports/spdk-dpdk/CMakeLists.txt | 63 ----- ports/spdk-dpdk/FindNuma.cmake | 26 -- ports/spdk-dpdk/portfile.cmake | 44 ---- ports/spdk-dpdk/spdk-dpdkConfig.cmake | 31 --- ports/spdk-dpdk/usage | 1 - ports/spdk-dpdk/vcpkg.json | 13 - ports/spdk-ipsec/CMakeLists.txt | 57 ----- ports/spdk-ipsec/portfile.cmake | 57 ----- ports/spdk-ipsec/spdk-ipsecConfig.cmake | 17 -- ports/spdk-ipsec/usage | 1 - ports/spdk-ipsec/vcpkg.json | 13 - ports/spdk-isal/portfile.cmake | 29 --- ports/spdk-isal/spdk-isalConfig.cmake | 17 -- ports/spdk-isal/usage | 1 - ports/spdk-isal/vcpkg.json | 9 - ports/spdk/CMakeLists.txt | 45 ---- ports/spdk/FindNuma.cmake | 26 -- ports/spdk/FindRDMA.cmake | 32 --- ports/spdk/Findibverbs.cmake | 34 --- ports/spdk/Finduuid.cmake | 49 ---- ports/spdk/portfile.cmake | 37 --- ports/spdk/spdkConfig.cmake | 29 --- ports/spdk/usage | 44 ---- ports/spdk/vcpkg.json | 15 -- ports/usd/vcpkg.json | 3 +- scripts/ci.baseline.txt | 239 +----------------- versions/baseline.json | 92 +------ versions/l-/libxaw.json | 5 + versions/u-/usd.json | 5 + 112 files changed, 17 insertions(+), 3660 deletions(-) delete mode 100644 ports/c-dbg-macro/portfile.cmake delete mode 100644 ports/c-dbg-macro/vcpkg.json delete mode 100644 ports/casadi/portfile.cmake delete mode 100644 ports/casadi/usage delete mode 100644 ports/casadi/vcpkg.json delete mode 100644 ports/catch-classic/portfile.cmake delete mode 100644 ports/catch-classic/vcpkg.json delete mode 100644 ports/chromium-base/chromium-baseConfig.cmake.in delete mode 100644 ports/chromium-base/portfile.cmake delete mode 100644 ports/chromium-base/res/.gn delete mode 100644 ports/chromium-base/res/0001-base.patch delete mode 100644 ports/chromium-base/res/0002-build.patch delete mode 100644 ports/chromium-base/res/BUILD.gn delete mode 100644 ports/chromium-base/res/LASTCHANGE.committime delete mode 100644 ports/chromium-base/res/build_overrides/build.gni delete mode 100644 ports/chromium-base/res/fontconfig/BUILD.gn delete mode 100644 ports/chromium-base/res/gclient_args.gni delete mode 100644 ports/chromium-base/res/icu/BUILD.gn delete mode 100644 ports/chromium-base/res/icu/config.gni delete mode 100644 ports/chromium-base/res/libxml/BUILD.gn delete mode 100644 ports/chromium-base/res/protobuf/proto_library.gni delete mode 100644 ports/chromium-base/res/test_fonts/BUILD.gn delete mode 100644 ports/chromium-base/res/testing/gmock/BUILD.gn delete mode 100644 ports/chromium-base/res/testing/gtest/BUILD.gn delete mode 100644 ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni delete mode 100644 ports/chromium-base/res/testing/test.gni delete mode 100644 ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn delete mode 100644 ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis delete mode 100644 ports/chromium-base/vcpkg.json delete mode 100644 ports/cppmicroservices/fix_strnicmp.patch delete mode 100644 ports/cppmicroservices/portfile.cmake delete mode 100644 ports/cppmicroservices/remove-wx.patch delete mode 100644 ports/cppmicroservices/vcpkg.json delete mode 100644 ports/cppmicroservices/werror.patch delete mode 100644 ports/ijg-libjpeg/CMakeLists.txt delete mode 100644 ports/ijg-libjpeg/portfile.cmake delete mode 100644 ports/ijg-libjpeg/vcpkg.json delete mode 100644 ports/libmesh/copyright delete mode 100644 ports/libmesh/portfile.cmake delete mode 100644 ports/libmesh/vcpkg.json delete mode 100644 ports/libqcow/CMakeLists.txt delete mode 100644 ports/libqcow/Config.cmake.in delete mode 100644 ports/libqcow/macos_fixes.patch delete mode 100644 ports/libqcow/portfile.cmake delete mode 100644 ports/libqcow/vcpkg.json delete mode 100644 ports/libvmdk/CMakeLists.txt delete mode 100644 ports/libvmdk/Config.cmake.in delete mode 100644 ports/libvmdk/android.patch delete mode 100644 ports/libvmdk/portfile.cmake delete mode 100644 ports/libvmdk/vcpkg.json delete mode 100644 ports/mecab/CMakeLists.txt delete mode 100644 ports/mecab/Config.cmake.in delete mode 100644 ports/mecab/fix-missing-functional.patch delete mode 100644 ports/mecab/fix_wpath_unsigned.patch delete mode 100644 ports/mecab/portfile.cmake delete mode 100644 ports/mecab/vcpkg.json delete mode 100644 ports/mozjpeg/fix-install-error.patch delete mode 100644 ports/mozjpeg/portfile.cmake delete mode 100644 ports/mozjpeg/vcpkg.json delete mode 100644 ports/optional-bare/portfile.cmake delete mode 100644 ports/optional-bare/vcpkg.json delete mode 100644 ports/qt5-canvas3d/portfile.cmake delete mode 100644 ports/qt5-canvas3d/vcpkg.json delete mode 100644 ports/range-v3-vs2015/portfile.cmake delete mode 100644 ports/range-v3-vs2015/vcpkg.json delete mode 100644 ports/rbdl-orb/portfile.cmake delete mode 100644 ports/rbdl-orb/vcpkg.json delete mode 100644 ports/sciter/portfile.cmake delete mode 100644 ports/sciter/vcpkg.json delete mode 100644 ports/shogun/cmake.patch delete mode 100644 ports/shogun/eigen-3.4.patch delete mode 100644 ports/shogun/fix-ASSERT-not-found.patch delete mode 100644 ports/shogun/fix-build-error-with-fmt11.patch delete mode 100644 ports/shogun/fmt.patch delete mode 100644 ports/shogun/portfile.cmake delete mode 100644 ports/shogun/remove-bitsery.patch delete mode 100644 ports/shogun/syntax.patch delete mode 100644 ports/shogun/vcpkg.json delete mode 100644 ports/signalrclient/0001_cmake.patch delete mode 100644 ports/signalrclient/0002_fix-compile-error.patch delete mode 100644 ports/signalrclient/portfile.cmake delete mode 100644 ports/signalrclient/vcpkg.json delete mode 100644 ports/spdk-dpdk/CMakeLists.txt delete mode 100644 ports/spdk-dpdk/FindNuma.cmake delete mode 100644 ports/spdk-dpdk/portfile.cmake delete mode 100644 ports/spdk-dpdk/spdk-dpdkConfig.cmake delete mode 100644 ports/spdk-dpdk/usage delete mode 100644 ports/spdk-dpdk/vcpkg.json delete mode 100644 ports/spdk-ipsec/CMakeLists.txt delete mode 100644 ports/spdk-ipsec/portfile.cmake delete mode 100644 ports/spdk-ipsec/spdk-ipsecConfig.cmake delete mode 100644 ports/spdk-ipsec/usage delete mode 100644 ports/spdk-ipsec/vcpkg.json delete mode 100644 ports/spdk-isal/portfile.cmake delete mode 100644 ports/spdk-isal/spdk-isalConfig.cmake delete mode 100644 ports/spdk-isal/usage delete mode 100644 ports/spdk-isal/vcpkg.json delete mode 100644 ports/spdk/CMakeLists.txt delete mode 100644 ports/spdk/FindNuma.cmake delete mode 100644 ports/spdk/FindRDMA.cmake delete mode 100644 ports/spdk/Findibverbs.cmake delete mode 100644 ports/spdk/Finduuid.cmake delete mode 100644 ports/spdk/portfile.cmake delete mode 100644 ports/spdk/spdkConfig.cmake delete mode 100644 ports/spdk/usage delete mode 100644 ports/spdk/vcpkg.json diff --git a/ports/c-dbg-macro/portfile.cmake b/ports/c-dbg-macro/portfile.cmake deleted file mode 100644 index 95dd96ceb679d7..00000000000000 --- a/ports/c-dbg-macro/portfile.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# single header file library - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO eerimoq/dbg-macro - REF 78b7655bd0cfc2389fe96a3b6584d2930eb7ebd7 - SHA512 f755c8cf17b422f43f09dcd4f8232b6130a5933d0ce537ce4874ecb886ad2fd5dee26fe12c10cb1554a3720a1263d0ce07252c0893de395b8c9042c9330e60be - HEAD_REF master -) - -file(COPY ${SOURCE_PATH}/include/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/c-dbg-macro/vcpkg.json b/ports/c-dbg-macro/vcpkg.json deleted file mode 100644 index 0891d40d9e2f7c..00000000000000 --- a/ports/c-dbg-macro/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "c-dbg-macro", - "version-date": "2020-02-29", - "description": "A dbg(...) macro for C", - "homepage": "https://github.com/eerimoq/dbg-macro" -} diff --git a/ports/casadi/portfile.cmake b/ports/casadi/portfile.cmake deleted file mode 100644 index 70a497e318ae9c..00000000000000 --- a/ports/casadi/portfile.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Currently no upstream support for static libraries -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO casadi/casadi - REF "${VERSION}" - SHA512 2c95368281f0bda385c6c451e361c168589f13aa66af6bc6fadf01f899bcd6c785ea7da3dee0fb5835559e58982e499182a4d244af3ea208ac05f672ea99cfd1 - HEAD_REF main -) - -# Pending upstream fix https://github.com/casadi/casadi/issues/3896 -set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DWITH_SELFCONTAINED=OFF - -DWITH_TINYXML=OFF - -DWITH_BUILD_TINYXML=OFF - -DWITH_QPOASES=OFF - -DWITH_SUNDIALS=OFF - -DWITH_CSPARSE=OFF - -DLIB_PREFIX:PATH=lib - -DBIN_PREFIX:PATH=bin - -DINCLUDE_PREFIX:PATH=include - -DCMAKE_PREFIX:PATH=share/${PORT} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") - -vcpkg_fixup_pkgconfig() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_tools(TOOL_NAMES casadi-cli AUTO_CLEAN) diff --git a/ports/casadi/usage b/ports/casadi/usage deleted file mode 100644 index cbec5b01f539ea..00000000000000 --- a/ports/casadi/usage +++ /dev/null @@ -1,5 +0,0 @@ -casadi provides CMake targets: - - find_package(casadi CONFIG REQUIRED) - target_link_libraries(main PRIVATE $) - \ No newline at end of file diff --git a/ports/casadi/vcpkg.json b/ports/casadi/vcpkg.json deleted file mode 100644 index 683ce0fe949683..00000000000000 --- a/ports/casadi/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "casadi", - "version": "3.6.7", - "description": "CasADi is a symbolic framework for numeric optimization implementing automatic differentiation in forward and reverse modes on sparse matrix-valued computational graphs. It supports self-contained C-code generation and interfaces state-of-the-art codes such as SUNDIALS, IPOPT etc. It can be used from C++, Python or Matlab/Octave.", - "homepage": "http://casadi.org", - "license": "LGPL-3.0-only", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/catch-classic/portfile.cmake b/ports/catch-classic/portfile.cmake deleted file mode 100644 index 097ba07daee0c0..00000000000000 --- a/ports/catch-classic/portfile.cmake +++ /dev/null @@ -1,16 +0,0 @@ -set(CATCH_VERSION v1.12.2) - -vcpkg_download_distfile(HEADER - URLS "https://github.com/catchorg/Catch2/releases/download/${CATCH_VERSION}/catch.hpp" - FILENAME "catch-classic-${CATCH_VERSION}.hpp" - SHA512 d2cf8b2fe95aae061a7771a0e1b7135583595d1f36dfc8d5e4d10e101ab58f6fac9d260f77c5760906c24aa402d7433aa82b5d6a0ca6b3ad91092dc5cc2d9c22 -) - -vcpkg_download_distfile(LICENSE - URLS "https://raw.githubusercontent.com/catchorg/Catch2/${CATCH_VERSION}/LICENSE.txt" - FILENAME "catch-classic-LICENSE-${CATCH_VERSION}.txt" - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 -) - -file(INSTALL ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME catch.hpp) -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/catch-classic RENAME copyright) diff --git a/ports/catch-classic/vcpkg.json b/ports/catch-classic/vcpkg.json deleted file mode 100644 index 75d76b103e1c4c..00000000000000 --- a/ports/catch-classic/vcpkg.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "catch-classic", - "version": "1.12.2", - "port-version": 2, - "description": [ - "A modern, header-only test framework for unit tests", - "This is specifically the legacy 1.x branch provided for compatibility", - "with older compilers." - ], - "homepage": "https://github.com/catchorg/Catch2" -} diff --git a/ports/chromium-base/chromium-baseConfig.cmake.in b/ports/chromium-base/chromium-baseConfig.cmake.in deleted file mode 100644 index 95ce316c655f04..00000000000000 --- a/ports/chromium-base/chromium-baseConfig.cmake.in +++ /dev/null @@ -1,81 +0,0 @@ -if(TARGET chromium-base) - return() -endif() - -set(DEFINITIONS_DBG @DEFINITIONS_DBG@) -set(DEFINITIONS_REL @DEFINITIONS_DBG@) - -# Compute the installation prefix relative to this file. -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -if(_IMPORT_PREFIX STREQUAL "/") - set(_IMPORT_PREFIX "") -endif() - -add_library(chromium-base INTERFACE IMPORTED GLOBAL) -add_library(chromium-base::chromium-base ALIAS chromium-base) - -set(LIBRARIES_ chromium_base chromium_base_static dynamic_annotations double_conversion) - -if(WIN32) - list(APPEND LIBRARIES_ - cfgmgr32 - powrprof - propsys - setupapi - userenv - wbemuuid - winmm - advapi32 - comdlg32 - dbghelp - dnsapi - gdi32 - msimg32 - odbc32 - odbccp32 - oleaut32 - shell32 - shlwapi - user32 - usp10 - uuid - version - wininet - winspool - ws2_32 - delayimp - kernel32 - ole32) -elseif(APPLE) - list(APPEND LIBRARIES_ - ApplicationServices - AppKit - CoreFoundation - IOKit - OpenDirectory - Security - bsm - pmenergy - pmsample) -endif() - -foreach(LIB_NAME ${LIBRARIES_}) - find_library(_LIB NAMES ${LIB_NAME} ${LIB_NAME}.dll) - target_link_libraries(chromium-base INTERFACE ${_LIB}) - unset(_LIB CACHE) -endforeach() - -if(UNIX AND NOT APPLE) - target_link_libraries(chromium-base INTERFACE -ldl -latomic -lpthread) -endif() - -target_include_directories(chromium-base - INTERFACE ${_IMPORT_PREFIX}/include/chromium-base) - -target_compile_definitions(chromium-base INTERFACE - $<$:${DEFINITIONS_DBG}> - $<$:${DEFINITIONS_REL}>) - -target_compile_features(chromium-base INTERFACE cxx_std_14) diff --git a/ports/chromium-base/portfile.cmake b/ports/chromium-base/portfile.cmake deleted file mode 100644 index d9e6e8e6a4f531..00000000000000 --- a/ports/chromium-base/portfile.cmake +++ /dev/null @@ -1,152 +0,0 @@ -# Patches may be provided at the end -function(checkout_in_path PATH URL REF) - if(EXISTS "${PATH}") - file(GLOB FILES "${PATH}") - list(LENGTH FILES COUNT) - if(COUNT GREATER 0) - return() - endif() - file(REMOVE_RECURSE "${PATH}") - endif() - - vcpkg_from_git( - OUT_SOURCE_PATH DEP_SOURCE_PATH - URL "${URL}" - REF "${REF}" - PATCHES "${ARGN}" - ) - file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") - file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") -endfunction() - -# Commits are based on https://chromium.googlesource.com/chromium/src/+/refs/tags/86.0.4199.1 -set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/25ce732") -file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") - -set(CHROMIUM_GIT "https://chromium.googlesource.com/chromium/src") -checkout_in_path( - "${SOURCE_PATH}/base" - "${CHROMIUM_GIT}/base" - "25ce73258703a5ac018da0e203fb3d4a98c2136e" - res/0001-base.patch) -checkout_in_path( - "${SOURCE_PATH}/build" - "${CHROMIUM_GIT}/build" - "312532ee66abdacbe58afb5df7ddf05e3a6399f9" - res/0002-build.patch) -checkout_in_path( - "${SOURCE_PATH}/third_party/apple_apsl" - "${CHROMIUM_GIT}/third_party/apple_apsl" - "4cc25bbf65194f6726f7f10da0a885818e35d53e") -checkout_in_path( - "${SOURCE_PATH}/third_party/ced" - "${CHROMIUM_GIT}/third_party/ced" - "4cd87a44674edd9fe1f01c4cb5f1b73907ce4236") -checkout_in_path( - "${SOURCE_PATH}/third_party/modp_b64" - "${CHROMIUM_GIT}/third_party/modp_b64" - "509f005fa65e652dc4a6f636da6fa1002b6dce16") - -set(RES "${CMAKE_CURRENT_LIST_DIR}/res") -file(COPY "${RES}/.gn" DESTINATION "${SOURCE_PATH}") -file(COPY "${RES}/BUILD.gn" DESTINATION "${SOURCE_PATH}") -file(COPY "${RES}/build_overrides" DESTINATION "${SOURCE_PATH}") -file(COPY "${RES}/testing" DESTINATION "${SOURCE_PATH}") -file(COPY "${RES}/tools" DESTINATION "${SOURCE_PATH}") -file(COPY "${RES}/gclient_args.gni" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${RES}/LASTCHANGE.committime" DESTINATION "${SOURCE_PATH}/build/util") -file(COPY "${RES}/icu" DESTINATION "${SOURCE_PATH}/third_party") -file(COPY "${RES}/libxml" DESTINATION "${SOURCE_PATH}/third_party") -file(COPY "${RES}/protobuf" DESTINATION "${SOURCE_PATH}/third_party") -file(COPY "${RES}/fontconfig" DESTINATION "${SOURCE_PATH}/third_party") -file(COPY "${RES}/test_fonts" DESTINATION "${SOURCE_PATH}/third_party") - -set(OPTIONS "\ - use_custom_libcxx=false \ - clang_use_chrome_plugins=false \ - forbid_non_component_debug_builds=false \ - treat_warnings_as_errors=false") -set(DEFINITIONS "") - -if(VCPKG_TARGET_IS_WINDOWS) - # Windows 10 SDK >= (10.0.19041.0) is required - # https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk - SET(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) - set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0) - set(OPTIONS "${OPTIONS} use_lld=false") -endif() - -if(VCPKG_TARGET_IS_LINUX) - set(OPTIONS "${OPTIONS} use_allocator=\"none\" use_sysroot=false use_glib=false") -endif() - -# Find the directory that contains "bin/clang" -# Note: Only clang-cl is supported on Windows, see https://crbug.com/988071 -vcpkg_find_acquire_program(CLANG) -if(CLANG MATCHES "-NOTFOUND") - message(FATAL_ERROR "Clang is required.") -endif() -get_filename_component(CLANG "${CLANG}" DIRECTORY) -get_filename_component(CLANG "${CLANG}" DIRECTORY) -if((VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR - (VCPKG_TARGET_IS_OSX AND NOT EXISTS "${CLANG}/bin/clang")) - message(FATAL_ERROR "Clang needs to be inside a bin directory.") -endif() -set(OPTIONS "${OPTIONS} clang_base_path=\"${CLANG}\"") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS "${OPTIONS} is_component_build=true") - list(APPEND DEFINITIONS COMPONENT_BUILD) -else() - set(OPTIONS "${OPTIONS} is_component_build=false") -endif() - -if(VCPKG_TARGET_IS_OSX) - set(OPTIONS "${OPTIONS} enable_dsyms=true") -endif() - -set(OPTIONS_DBG "${OPTIONS} is_debug=true symbol_level=2") -set(OPTIONS_REL "${OPTIONS} is_debug=false symbol_level=0") -set(DEFINITIONS_DBG ${DEFINITIONS}) -set(DEFINITIONS_REL ${DEFINITIONS}) - -vcpkg_gn_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG "${OPTIONS_DBG}" - OPTIONS_RELEASE "${OPTIONS_REL}" -) - -# Prevent a ninja re-config loop -set(NINJA_REBUILD "build build.ninja: gn\n generator = 1\n depfile = build.ninja.d") -vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja" "${NINJA_REBUILD}" "") -vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja" "${NINJA_REBUILD}" "") - -set(TARGETS - base base:base_static - base/third_party/dynamic_annotations - base/third_party/double_conversion) - -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND TARGETS base/win:pe_image) -endif() - -vcpkg_gn_install( - SOURCE_PATH "${SOURCE_PATH}" - TARGETS ${TARGETS} -) - -# Install includes -set(PACKAGES_INCLUDE_DIR "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(GLOB_RECURSE INCLUDE_FILES LIST_DIRECTORIES false RELATIVE "${SOURCE_PATH}" "${SOURCE_PATH}/*.h") -foreach(file_ ${INCLUDE_FILES}) - configure_file("${SOURCE_PATH}/${file_}" "${PACKAGES_INCLUDE_DIR}/${file_}" COPYONLY) -endforeach() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/chromium-baseConfig.cmake.in" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/chromium-baseConfig.cmake" @ONLY) - -vcpkg_copy_pdbs() - -file(INSTALL "${SOURCE_PATH}/third_party/ced/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) diff --git a/ports/chromium-base/res/.gn b/ports/chromium-base/res/.gn deleted file mode 100644 index 4fcb7c405ff334..00000000000000 --- a/ports/chromium-base/res/.gn +++ /dev/null @@ -1 +0,0 @@ -buildconfig = "//build/config/BUILDCONFIG.gn" \ No newline at end of file diff --git a/ports/chromium-base/res/0001-base.patch b/ports/chromium-base/res/0001-base.patch deleted file mode 100644 index ca8c059756d80f..00000000000000 --- a/ports/chromium-base/res/0001-base.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/BUILD.gn b/BUILD.gn -index 7b7cd51..2961688 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -155,6 +155,7 @@ if (is_android) { - # test code (test support and anything in the test directory) which should use - # source_set as is recommended for GN targets). - jumbo_component("base") { -+ output_name = "chromium_base" - if (is_nacl || is_ios) { - # Link errors related to malloc functions if libbase for nacl is - # compiled with jumbo: https://crbug.com/775959. -@@ -162,6 +163,11 @@ jumbo_component("base") { - never_build_jumbo = true - } - -+ if (!is_component_build) { -+ complete_static_lib = true -+ configs -= [ "//build/config/compiler:thin_archive" ] -+ } -+ - sources = [ - "allocator/allocator_check.cc", - "allocator/allocator_check.h", -@@ -1638,7 +1644,7 @@ jumbo_component("base") { - "hash/md5_constexpr_internal.h", - "hash/sha1.h", - ] -- if (is_nacl) { -+ if (true) { - sources += [ - "hash/md5_nacl.cc", - "hash/md5_nacl.h", -@@ -2298,6 +2304,7 @@ buildflag_header("tracing_buildflags") { - # library. Note that this library cannot depend on base because base depends on - # base_static. - static_library("base_static") { -+ output_name = "chromium_base_static" - sources = [ - "base_switches.cc", - "base_switches.h", -@@ -2325,7 +2332,7 @@ static_library("base_static") { - } - - component("i18n") { -- output_name = "base_i18n" -+ output_name = "chromium_base_i18n" - sources = [ - "i18n/base_i18n_export.h", - "i18n/base_i18n_switches.cc", -diff --git a/gtest_prod_util.h b/gtest_prod_util.h -index 2ca267e..0a0b6df 100644 ---- a/gtest_prod_util.h -+++ b/gtest_prod_util.h -@@ -5,7 +5,8 @@ - #ifndef BASE_GTEST_PROD_UTIL_H_ - #define BASE_GTEST_PROD_UTIL_H_ - --#include "testing/gtest/include/gtest/gtest_prod.h" // nogncheck -+#define FRIEND_TEST(test_case_name, test_name)\ -+friend class test_case_name##_##test_name##_Test - - // This is a wrapper for gtest's FRIEND_TEST macro that friends - // test with all possible prefixes. This is very helpful when changing the test -diff --git a/hash/md5.h b/hash/md5.h -index 8a49f08..24acdab 100644 ---- a/hash/md5.h -+++ b/hash/md5.h -@@ -11,7 +11,7 @@ - #include "base/strings/string_piece.h" - #include "build/build_config.h" - --#if defined(OS_NACL) -+#if true - #include "base/hash/md5_nacl.h" - #else - #include "base/hash/md5_boringssl.h" -diff --git a/hash/md5_nacl.cc b/hash/md5_nacl.cc -index 827bbbd..4b22c59 100644 ---- a/hash/md5_nacl.cc -+++ b/hash/md5_nacl.cc -@@ -22,6 +22,7 @@ - */ - - #include -+#include - - #include "base/hash/md5.h" - -diff --git a/profiler/stack_copier_signal.cc b/profiler/stack_copier_signal.cc -index 5a7d8b9..f959f2f 100644 ---- a/profiler/stack_copier_signal.cc -+++ b/profiler/stack_copier_signal.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/ports/chromium-base/res/0002-build.patch b/ports/chromium-base/res/0002-build.patch deleted file mode 100644 index 94568d1690e317..00000000000000 --- a/ports/chromium-base/res/0002-build.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn -index 4cc6bfc..9ea83a9 100644 ---- a/config/BUILDCONFIG.gn -+++ b/config/BUILDCONFIG.gn -@@ -657,6 +657,7 @@ template("component") { - # See http://crbug.com/594610 - forward_variables_from(invoker, [ "visibility" ]) - forward_variables_from(invoker, "*", [ "visibility" ]) -+ not_needed("*") - } - } - -diff --git a/config/clang/BUILD.gn b/config/clang/BUILD.gn -index 960726e..87886dc 100644 ---- a/config/clang/BUILD.gn -+++ b/config/clang/BUILD.gn -@@ -38,5 +38,7 @@ config("extra_warnings") { - "-Wstring-conversion", - - "-Wtautological-overlap-compare", -+ "-Wno-unknown-warning-option", -+ "-Wno-unknown-pragmas" - ] - } -diff --git a/config/mac/sdk_info.py b/config/mac/sdk_info.py -index 1ad11d3..99b21f9 100644 ---- a/config/mac/sdk_info.py -+++ b/config/mac/sdk_info.py -@@ -61,10 +61,15 @@ def FillXcodeVersion(settings, developer_dir): - settings['xcode_build'] = version_plist['ProductBuildVersion'] - return - -- lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() -- settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) -- settings['xcode_version_int'] = int(settings['xcode_version'], 10) -- settings['xcode_build'] = lines[-1].split()[-1] -+ try: -+ lines = subprocess.check_output(['xcodebuild', '-version']).splitlines() -+ settings['xcode_version'] = FormatVersion(lines[0].split()[-1]) -+ settings['xcode_version_int'] = int(settings['xcode_version'], 10) -+ settings['xcode_build'] = lines[-1].split()[-1] -+ except: -+ settings['xcode_version'] = "" -+ settings['xcode_version_int'] = 0 -+ settings['xcode_build'] = "" - - - def FillMachineOSBuild(settings): -diff --git a/mac/find_sdk.py b/mac/find_sdk.py -index 58362bf..a6069b6 100755 ---- a/mac/find_sdk.py -+++ b/mac/find_sdk.py -@@ -68,6 +68,8 @@ def main(): - dev_dir = out.rstrip() - sdk_dir = os.path.join( - dev_dir, 'Platforms/MacOSX.platform/Developer/SDKs') -+ if not os.path.isdir(sdk_dir): -+ sdk_dir = os.path.join(dev_dir, 'SDKs') - - if not os.path.isdir(sdk_dir): - raise SdkError('Install Xcode, launch it, accept the license ' + -@@ -87,7 +89,10 @@ def main(): - - if options.print_bin_path: - bin_path = 'Toolchains/XcodeDefault.xctoolchain/usr/bin/' -- print(os.path.join(dev_dir, bin_path)) -+ if os.path.isdir(os.path.join(dev_dir, bin_path)): -+ print(os.path.join(dev_dir, bin_path)) -+ else: -+ print(os.path.join(dev_dir, 'usr/bin/')) - - return best_sdk - -diff --git a/toolchain/mac/BUILD.gn b/toolchain/mac/BUILD.gn -index 8fdada0..8d5e6b7 100644 ---- a/toolchain/mac/BUILD.gn -+++ b/toolchain/mac/BUILD.gn -@@ -184,9 +184,9 @@ template("mac_toolchain") { - # If dSYMs are enabled, this flag will be added to the link tools. - if (_enable_dsyms) { - dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " -- dsym_switch += "-Wcrl,dsymutilpath," + -- rebase_path("//tools/clang/dsymutil/bin/dsymutil", -- root_build_dir) + " " -+ # dsym_switch += "-Wcrl,dsymutilpath," + -+ # rebase_path("//tools/clang/dsymutil/bin/dsymutil", -+ # root_build_dir) + " " - - dsym_output_dir = - "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM" -diff --git a/toolchain/win/BUILD.gn b/toolchain/win/BUILD.gn -index be08930..04fb374 100644 ---- a/toolchain/win/BUILD.gn -+++ b/toolchain/win/BUILD.gn -@@ -98,7 +98,7 @@ template("msvc_toolchain") { - } else { - lld_link = "lld-link" - } -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ prefix = "$clang_base_path/bin" - - # lld-link includes a replacement for lib.exe that can produce thin - # archives and understands bitcode (for lto builds). -@@ -190,7 +190,7 @@ template("msvc_toolchain") { - # amount of data to parse and store in .ninja_deps. We do this on non-Windows too, - # and already make sure rebuilds after win sdk / libc++ / clang header updates happen via - # changing commandline flags. -- show_includes = "/showIncludes:user" -+ show_includes = "" - } else { - show_includes = "/showIncludes" - } -@@ -235,7 +235,7 @@ template("msvc_toolchain") { - - if (toolchain_args.current_cpu == "arm64") { - if (is_clang) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ prefix = "$clang_base_path/bin" - ml = "${clang_prefix}${prefix}/${clang_cl} --target=arm64-windows" - if (host_os == "win") { - # Flip the slashes so that copy/paste of the command works. -@@ -444,11 +444,9 @@ template("win_toolchains") { - - msvc_toolchain("win_clang_" + target_name) { - environment = "environment." + toolchain_arch -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ prefix = "$clang_base_path/bin" - cl = "${clang_prefix}$prefix/${clang_cl}" -- _clang_lib_dir = -- rebase_path("$clang_base_path/lib/clang/$clang_version/lib/windows", -- root_build_dir) -+ _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib/windows" - if (host_os == "win") { - # Flip the slashes so that copy/paste of the command works. - cl = string_replace(cl, "/", "\\") -@@ -459,7 +457,7 @@ template("win_toolchains") { - - sys_include_flags = "${win_toolchain_data.include_flags_imsvc}" - sys_lib_flags = -- "-libpath:$_clang_lib_dir ${win_toolchain_data.libpath_flags}" -+ "-libpath:\"$_clang_lib_dir\" ${win_toolchain_data.libpath_flags}" - - toolchain_args = { - if (defined(invoker.toolchain_args)) { diff --git a/ports/chromium-base/res/BUILD.gn b/ports/chromium-base/res/BUILD.gn deleted file mode 100644 index 01d935ba02527f..00000000000000 --- a/ports/chromium-base/res/BUILD.gn +++ /dev/null @@ -1,5 +0,0 @@ -static_library("chromium-base") { - deps = [ - "//base", - ] -} diff --git a/ports/chromium-base/res/LASTCHANGE.committime b/ports/chromium-base/res/LASTCHANGE.committime deleted file mode 100644 index 6acbbf6910963e..00000000000000 --- a/ports/chromium-base/res/LASTCHANGE.committime +++ /dev/null @@ -1 +0,0 @@ -1594430814 \ No newline at end of file diff --git a/ports/chromium-base/res/build_overrides/build.gni b/ports/chromium-base/res/build_overrides/build.gni deleted file mode 100644 index 47ac036443fb64..00000000000000 --- a/ports/chromium-base/res/build_overrides/build.gni +++ /dev/null @@ -1,16 +0,0 @@ -import("//build/config/gclient_args.gni") - -# Some non-Chromium builds don't support building java targets. -enable_java_templates = true - -# Don't use Chromium's third_party/binutils. -linux_use_bundled_binutils_override = false - -# Tracing requires //third_party/perfetto. -enable_base_tracing = false - -# Skip assertions about 4GiB file size limit. See https://crbug.com/648948. -ignore_elf32_limitations = false - -# Use the system install of Xcode for tools like ibtool, libtool, etc. -use_system_xcode = true diff --git a/ports/chromium-base/res/fontconfig/BUILD.gn b/ports/chromium-base/res/fontconfig/BUILD.gn deleted file mode 100644 index 5c26eaf19c3ed9..00000000000000 --- a/ports/chromium-base/res/fontconfig/BUILD.gn +++ /dev/null @@ -1 +0,0 @@ -component("fontconfig") {} \ No newline at end of file diff --git a/ports/chromium-base/res/gclient_args.gni b/ports/chromium-base/res/gclient_args.gni deleted file mode 100644 index bd1145a79d5413..00000000000000 --- a/ports/chromium-base/res/gclient_args.gni +++ /dev/null @@ -1,7 +0,0 @@ -build_with_chromium = true -checkout_android = false -checkout_android_native_support = false -checkout_ios_webkit = false -checkout_nacl = false -checkout_oculus_sdk = false -checkout_openxr = false \ No newline at end of file diff --git a/ports/chromium-base/res/icu/BUILD.gn b/ports/chromium-base/res/icu/BUILD.gn deleted file mode 100644 index 22356981f3b55b..00000000000000 --- a/ports/chromium-base/res/icu/BUILD.gn +++ /dev/null @@ -1,2 +0,0 @@ -component("icuuc") {} -component("icu") {} \ No newline at end of file diff --git a/ports/chromium-base/res/icu/config.gni b/ports/chromium-base/res/icu/config.gni deleted file mode 100644 index 4e9ad6a5ee9f93..00000000000000 --- a/ports/chromium-base/res/icu/config.gni +++ /dev/null @@ -1,3 +0,0 @@ -declare_args() { - icu_use_data_file = false -} \ No newline at end of file diff --git a/ports/chromium-base/res/libxml/BUILD.gn b/ports/chromium-base/res/libxml/BUILD.gn deleted file mode 100644 index b48056ab882c4f..00000000000000 --- a/ports/chromium-base/res/libxml/BUILD.gn +++ /dev/null @@ -1,2 +0,0 @@ -component("libxml_utils") {} -component("xml_reader") {} \ No newline at end of file diff --git a/ports/chromium-base/res/protobuf/proto_library.gni b/ports/chromium-base/res/protobuf/proto_library.gni deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/ports/chromium-base/res/test_fonts/BUILD.gn b/ports/chromium-base/res/test_fonts/BUILD.gn deleted file mode 100644 index b95c104e1f372a..00000000000000 --- a/ports/chromium-base/res/test_fonts/BUILD.gn +++ /dev/null @@ -1 +0,0 @@ -component("test_fonts") {} \ No newline at end of file diff --git a/ports/chromium-base/res/testing/gmock/BUILD.gn b/ports/chromium-base/res/testing/gmock/BUILD.gn deleted file mode 100644 index acd0ec30c0963d..00000000000000 --- a/ports/chromium-base/res/testing/gmock/BUILD.gn +++ /dev/null @@ -1 +0,0 @@ -component("gmock") {} \ No newline at end of file diff --git a/ports/chromium-base/res/testing/gtest/BUILD.gn b/ports/chromium-base/res/testing/gtest/BUILD.gn deleted file mode 100644 index 2463cc7c0d82d3..00000000000000 --- a/ports/chromium-base/res/testing/gtest/BUILD.gn +++ /dev/null @@ -1 +0,0 @@ -component("gtest") {} \ No newline at end of file diff --git a/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni b/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni deleted file mode 100644 index 6e2a4c20fea4e1..00000000000000 --- a/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni +++ /dev/null @@ -1 +0,0 @@ -import("//testing/test.gni") \ No newline at end of file diff --git a/ports/chromium-base/res/testing/test.gni b/ports/chromium-base/res/testing/test.gni deleted file mode 100644 index 2d6f8c10352558..00000000000000 --- a/ports/chromium-base/res/testing/test.gni +++ /dev/null @@ -1,20 +0,0 @@ -template("test") { - not_needed(invoker, "*") - not_needed("*") -} - -set_defaults("test") { - configs = [ - "//build/config/compiler:chromium_code" - ] -} - -template("fuzzer_test") { - not_needed(invoker, "*") - not_needed("*") -} - -template("protoc_convert") { - not_needed(invoker, "*") - not_needed("*") -} \ No newline at end of file diff --git a/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn b/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn deleted file mode 100644 index 5c2c1f68e14e66..00000000000000 --- a/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn +++ /dev/null @@ -1 +0,0 @@ -config("chrome") {} \ No newline at end of file diff --git a/ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis b/ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/ports/chromium-base/vcpkg.json b/ports/chromium-base/vcpkg.json deleted file mode 100644 index 5fa9c7d57a4c29..00000000000000 --- a/ports/chromium-base/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "chromium-base", - "version": "86.0.4199.1", - "port-version": 6, - "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", - "homepage": "https://chromium.googlesource.com/chromium/src", - "license": "BSD-3-Clause", - "supports": "x64 & (osx | windows | linux) & !uwp", - "dependencies": [ - { - "name": "vcpkg-gn", - "host": true - }, - { - "name": "vcpkg-tool-gn", - "host": true - } - ] -} diff --git a/ports/cppmicroservices/fix_strnicmp.patch b/ports/cppmicroservices/fix_strnicmp.patch deleted file mode 100644 index 1a9245f6a4331b..00000000000000 --- a/ports/cppmicroservices/fix_strnicmp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/framework/src/util/PropsCheck.h b/framework/src/util/PropsCheck.h -index 26acd33..930a328 100644 ---- a/framework/src/util/PropsCheck.h -+++ b/framework/src/util/PropsCheck.h -@@ -47,7 +47,7 @@ - - #ifdef US_PLATFORM_WINDOWS - # include --# define ci_compare strnicmp -+# define ci_compare _strnicmp - #else - # include - # define ci_compare strncasecmp diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake deleted file mode 100644 index ad7b3cc77aad5c..00000000000000 --- a/ports/cppmicroservices/portfile.cmake +++ /dev/null @@ -1,47 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO CppMicroServices/CppMicroservices - REF "v${VERSION}" - SHA512 4743846a8ba45e6bd320c93bb3bd443b5dac16ea0bbf55bda6212e9200a40ee29031fd74c6141de4c6b5ef9ad3e70789d13fda25b40638547782d386a12dd7e2 - HEAD_REF development - PATCHES - werror.patch - fix_strnicmp.patch - remove-wx.patch -) - -#nowide download -vcpkg_from_github( - OUT_SOURCE_PATH NOWIDE_SOURCE_PATH - REPO boostorg/nowide - REF 02f40f0b5f5686627fcddae93ff88ca399db4766 - SHA512 e68e0704896726c7a94b8ace0e03c5206b4c7acd23a6b05f6fb2660abe30611ac6913cf5fab7b57eaff1990a7c28aeee8c9f526b60f7094c0c201f90b715d6c6 - HEAD_REF develop -) - -file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/boost/nowide") -file(RENAME "${NOWIDE_SOURCE_PATH}" "${SOURCE_PATH}/third_party/boost/nowide") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices - -DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices - -DUS_USE_SYSTEM_GTEST=TRUE -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_cmake_config_fixup() - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") - -# CppMicroServices uses a custom resource compiler to compile resources -# the zipped resources are then appended to the target which cause the linker to crash -# when compiling a static library -if(NOT BUILD_SHARED_LIBS) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() \ No newline at end of file diff --git a/ports/cppmicroservices/remove-wx.patch b/ports/cppmicroservices/remove-wx.patch deleted file mode 100644 index dadae53f59804a..00000000000000 --- a/ports/cppmicroservices/remove-wx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2bec34f..801d049 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -511,7 +511,7 @@ if(MSVC) - set(US_ENABLE_ASAN OFF) - endif() - -- set(US_CXX_FLAGS "/MP /WX /D${msvc_version_define} ${US_CXX_FLAGS}") -+ set(US_CXX_FLAGS "/MP /D${msvc_version_define} ${US_CXX_FLAGS}") - else() - - # If not cross-compiling, turn on Stack Smashing Protection. diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json deleted file mode 100644 index 4a7a4be789cdcb..00000000000000 --- a/ports/cppmicroservices/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "cppmicroservices", - "version": "3.7.6", - "port-version": 1, - "description": "An OSGi-like C++ dynamic module system and service registry", - "homepage": "https://github.com/CppMicroServices/CppMicroServices", - "license": "Apache-2.0", - "dependencies": [ - "gtest", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/cppmicroservices/werror.patch b/ports/cppmicroservices/werror.patch deleted file mode 100644 index b06f43a72c7077..00000000000000 --- a/ports/cppmicroservices/werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24fd87e..974064c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -382,7 +382,7 @@ else() - usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS) - endif() - -- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align -+ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align - -Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast - -Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option ) - usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS) diff --git a/ports/ijg-libjpeg/CMakeLists.txt b/ports/ijg-libjpeg/CMakeLists.txt deleted file mode 100644 index b65477d9c4089b..00000000000000 --- a/ports/ijg-libjpeg/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -cmake_minimum_required(VERSION 3.13) -project(libjpeg LANGUAGES C) - -option(BUILD_EXECUTABLES OFF) - -# -# jconfig.h is a public header, so it must be genrated. Please reference the install.txt in jpegsr9d.zip -# -# jconfig.txt should contain #cmakedefine which is modified by porfile.cmake of ijg-libjpeg port in VcPkg -# By doing this we can skip 'configure' step. Visit https://github.com/LuaDist/libjpeg -# -include(CheckIncludeFile) -check_include_file(stddef.h HAVE_STDDEF_H) -check_include_file(stdlib.h HAVE_STDLIB_H) -configure_file(jconfig.txt ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) - -list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) - -add_library(jpeg - ${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h - transupp.h jidctflt.c jidctfst.c jidctint.c jquant1.c jquant2.c jutils.c jmemnobs.c jaricom.c jerror.c jdatadst.c jdatasrc.c - jmemsys.h - jmemmgr.c - cdjpeg.h cderror.h - jcmaster.c jcmarker.c jcmainct.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcsample.c jctrans.c jcinit.c jcomapi.c jcparam.c jcprepct.c - jdmaster.c jdmarker.c jdmainct.c jdapimin.c jdapistd.c jdarith.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdsample.c jdtrans.c jdinput.c jdmerge.c jdpostct.c - jdct.h - jfdctflt.c jfdctfst.c jfdctint.c -) - -if(WIN32) - target_compile_definitions(jpeg - PRIVATE - _CRT_SECURE_NO_WARNINGS - ) -endif() - -target_include_directories(jpeg PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) - -install(FILES ${PUBLIC_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include -) -install(TARGETS jpeg - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) - -if(BUILD_EXECUTABLES) - add_executable(cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c) - target_link_libraries(cjpeg PRIVATE jpeg) - - add_executable(djpeg cdjpeg.c djpeg.c wrbmp.c wrgif.c wrppm.c wrrle.c wrtarga.c rdcolmap.c) - target_link_libraries(djpeg PRIVATE jpeg) - - add_executable(jpegtran jpegtran.c cdjpeg.c rdswitch.c transupp.c) - target_link_libraries(jpegtran PRIVATE jpeg) - - add_executable(rdjpgcom rdjpgcom.c) - add_executable(wrjpgcom wrjpgcom.c) - - install(TARGETS cjpeg djpeg jpegtran rdjpgcom wrjpgcom - DESTINATION ${CMAKE_INSTALL_PREFIX}/tools - ) -endif() diff --git a/ports/ijg-libjpeg/portfile.cmake b/ports/ijg-libjpeg/portfile.cmake deleted file mode 100644 index bd3c3cf23a0e09..00000000000000 --- a/ports/ijg-libjpeg/portfile.cmake +++ /dev/null @@ -1,50 +0,0 @@ -if(EXISTS ${CURRENT_INSTALLED_DIR}/share/libjpeg-turbo/copyright) - message(FATAL_ERROR "'${PORT}' conflicts with 'libturbo-jpeg'. Please remove libturbo-jpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() -if(EXISTS ${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright) - message(FATAL_ERROR "'${PORT}' conflicts with 'mozjpeg'. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_download_distfile(ARCHIVE - URLS "http://www.ijg.org/files/jpegsr9e.zip" - FILENAME "jpegsr9e.zip" - SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64 -) -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE ${ARCHIVE} -) - -# Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command. -# See https://github.com/LuaDist/libjpeg -vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" - "#define HAVE_STDDEF_H" - "#cmakedefine HAVE_STDDEF_H" -) -vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" - "#define HAVE_STDLIB_H" - "#cmakedefine HAVE_STDLIB_H" -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option? -) -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -# There is no LICENSE file, but README containes some legal text. -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/README") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ijg-libjpeg/vcpkg.json b/ports/ijg-libjpeg/vcpkg.json deleted file mode 100644 index 7e9cffae669980..00000000000000 --- a/ports/ijg-libjpeg/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ijg-libjpeg", - "version-string": "9e", - "port-version": 2, - "description": "Independent JPEG Group's JPEG software", - "homepage": "http://www.ijg.org/", - "license": null, - "supports": "!emscripten & !wasm32", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/libmesh/copyright b/ports/libmesh/copyright deleted file mode 100644 index a9121567759efa..00000000000000 --- a/ports/libmesh/copyright +++ /dev/null @@ -1,169 +0,0 @@ -GNU LESSER GENERAL PUBLIC LICENSE -Version 2.1, February 1999 - -Copyright (C) 1991, 1999 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] -Preamble -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - -This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. - -When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. - -To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. - -For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - -We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - -To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - -Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. - -Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. - -When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. - -We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. - -For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. - -In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. - -Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. - -The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". - -A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. - -The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) - -"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - -a) The modified work must itself be a software library. -b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. -c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. -d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. -(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - -Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. - -This option is useful when you wish to copy part of the code of the Library into a program that is not a library. - -4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. - -If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. - -5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. - -However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. - -When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. - -If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. - -You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: - -a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) -b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. -c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. -d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. -e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. -For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - -7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: - -a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. -b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. -8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - -11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS -How to Apply These Terms to Your New Libraries -If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). - -To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - -one line to give the library's name and an idea of what it does. -Copyright (C) year name of author - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: - -Yoyodyne, Inc., hereby disclaims all copyright interest in -the library `Frob' (a library for tweaking knobs) written -by James Random Hacker. - -signature of Ty Coon, 1 April 1990 -Ty Coon, President of Vice -That's all there is to it! \ No newline at end of file diff --git a/ports/libmesh/portfile.cmake b/ports/libmesh/portfile.cmake deleted file mode 100644 index b0cf639b42e598..00000000000000 --- a/ports/libmesh/portfile.cmake +++ /dev/null @@ -1,47 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libMesh/libmesh - REF 21f623c837b3865ed65ec9608b357bdb1935d428 #1.5.0 - SHA512 53ad41ed0cd99cb5096ff338a3ff5d8a8ecbfb17dc1d7ee0d2b0cbffecbede7f7c11b7c3c2233cec9dde0988c8828ba0199247effd3442befc72230e641a185e - HEAD_REF master -) - -if(VCPKG_TARGET_IS_WINDOWS) - set(OPTIONS --disable-qhull ) -endif() -# There a lot of configure options in this port which are not yet correctly handled by VCPKG -# To only mention two: -# --enable-vtk-required Error if VTK is not detected by configure -# --enable-capnp-required Error if Cap'n Proto support is not detected by -# but there are a lot more which need to be checked/fixed -# So this port can only be considered a Work In Progress -vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${OPTIONS} - OPTIONS_DEBUG --with-methods=dbg - OPTIONS_RELEASE --with-methods=opt -) - -vcpkg_install_make() - -file(RENAME "${CURRENT_PACKAGES_DIR}/examples" "${CURRENT_PACKAGES_DIR}/share/${PORT}/examples") - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -# Remove tools and debug include directories -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/contrib" "${CURRENT_PACKAGES_DIR}/debug/contrib" - "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc" - "${CURRENT_PACKAGES_DIR}/debug/examples" "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/tools/libmesh/debug" - "${CURRENT_PACKAGES_DIR}/Make.common" "${CURRENT_PACKAGES_DIR}/debug/Make.common") - -file(GLOB config_files "${CURRENT_PACKAGES_DIR}/bin/*-config" "${CURRENT_PACKAGES_DIR}/debug/bin/*-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/*-config") -file(REMOVE_RECURSE ${config_files}) - -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libmesh/libmesh_config.h" "${CURRENT_INSTALLED_DIR}" "") - -vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright") diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json deleted file mode 100644 index 3127369e02d6eb..00000000000000 --- a/ports/libmesh/vcpkg.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "libmesh", - "version": "1.5.0", - "port-version": 6, - "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", - "homepage": "https://github.com/libMesh/libmesh", - "license": "LGPL-2.1-only", - "supports": "linux" -} diff --git a/ports/libqcow/CMakeLists.txt b/ports/libqcow/CMakeLists.txt deleted file mode 100644 index ac199f48fe9ccf..00000000000000 --- a/ports/libqcow/CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ -cmake_minimum_required(VERSION 3.12) - -project(libqcow C) - -find_package(OpenSSL) -find_package(ZLIB REQUIRED) - -if(MSVC) - add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) - add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) -endif() - -add_compile_definitions(HAVE_LOCAL_LIBCAES) -add_compile_definitions(HAVE_LOCAL_LIBCERROR) -add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) -add_compile_definitions(HAVE_LOCAL_LIBCDATA) -add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) -add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) -add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) -add_compile_definitions(HAVE_LOCAL_LIBCFILE) -add_compile_definitions(HAVE_LOCAL_LIBCPATH) -add_compile_definitions(HAVE_LOCAL_LIBUNA) -add_compile_definitions(HAVE_LOCAL_LIBBFIO) -add_compile_definitions(HAVE_LOCAL_LIBFCACHE) -add_compile_definitions(HAVE_LOCAL_LIBFDATA) -add_compile_definitions(ZLIB_DLL) - -if(UNIX) - configure_file(common/config.h.in common/config.h) - add_compile_definitions(HAVE_CONFIG_H) - add_compile_definitions(LOCALEDIR="/usr/share/locale") -endif() - -if(MSVC) - add_compile_definitions(LIBQCOW_DLL_EXPORT) - set(LIB_RC libqcow/libqcow.rc) -endif() - - -include(GNUInstallDirs) -include(CMakePackageConfigHelpers) - -# Add CMake find_package() integration -set(PROJECT_TARGET_NAME "${PROJECT_NAME}") -set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") -set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") -set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") -set(NAMESPACE "libqcow::") - -# Source files -file(GLOB LIB_SRC lib*/*.c) - -# Headers -file(GLOB LIB_INST_HEADERS include/libqcow/*.h) - -add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) - -target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) -target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcaes ./libcdata ./libcerror ./libcfile ./libclocale) -target_include_directories(${PROJECT_NAME} PRIVATE ./libcnotify ./libcpath ./libcsplit ./libcthreads) -target_include_directories(${PROJECT_NAME} PRIVATE ./libfcache ./libfdata ./libuna) - -target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB OpenSSL::Crypto) - -install(TARGETS ${PROJECT_NAME} - EXPORT ${TARGETS_EXPORT_NAME} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - INCLUDES DESTINATION include) - -install(FILES ${LIB_INST_HEADERS} DESTINATION include/libqcow) -install(FILES include/libqcow.h DESTINATION include) - - -# Generate and install libqcowConfig.cmake -configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") -install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") - -# Generate and install libqcowTargets*.cmake -install(EXPORT ${TARGETS_EXPORT_NAME} - NAMESPACE ${NAMESPACE} - DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/ports/libqcow/Config.cmake.in b/ports/libqcow/Config.cmake.in deleted file mode 100644 index bd6bd4532b6282..00000000000000 --- a/ports/libqcow/Config.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") -check_required_components("@PROJECT_NAME@") diff --git a/ports/libqcow/macos_fixes.patch b/ports/libqcow/macos_fixes.patch deleted file mode 100644 index 4e3061c22050de..00000000000000 --- a/ports/libqcow/macos_fixes.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c -index a618083..5299c77 100644 ---- a/libcfile/libcfile_file.c -+++ b/libcfile/libcfile_file.c -@@ -56,7 +56,7 @@ - #elif defined( HAVE_CYGWIN_FS_H ) - #include - --#elif defined( HAVE_LINUX_FS_H ) -+#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H ) - /* Required for Linux platforms that use a sizeof( u64 ) - * in linux/fs.h but have no typedef of it - */ -@@ -4128,6 +4128,11 @@ ssize_t libcfile_internal_file_io_control_read_with_error_code( - #error Missing file IO control with data function - #endif - -+// Force disable on Darwin, it can be erroneously defined -+#if defined ( __APPLE__ ) -+#undef HAVE_POSIX_FADVISE -+#endif -+ - /* Read data from a device file using IO control - * Returns the number of bytes read if successful or -1 on error - */ -diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c -index 96d1a31..621e748 100644 ---- a/libqcow/libqcow_i18n.c -+++ b/libqcow/libqcow_i18n.c -@@ -40,7 +40,7 @@ int libqcow_i18n_initialize( - - if( libqcow_i18n_initialized == 0 ) - { --#if defined( HAVE_BINDTEXTDOMAIN ) -+#if !defined( __APPLE__ ) && defined( HAVE_BINDTEXTDOMAIN ) - if( bindtextdomain( - "libqcow", - LOCALEDIR ) == NULL ) diff --git a/ports/libqcow/portfile.cmake b/ports/libqcow/portfile.cmake deleted file mode 100644 index 35bb881d66cb15..00000000000000 --- a/ports/libqcow/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -set(LIB_VERSION 20221124) -set(LIB_FILENAME libqcow-alpha-${LIB_VERSION}.tar.gz) - -# Release distribution file contains configured sources, while the source code in the repository does not. -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/libyal/libqcow/releases/download/${LIB_VERSION}/${LIB_FILENAME}" - FILENAME "${LIB_FILENAME}" - SHA512 5e48491ec8951473b8791fd6058d35b2d3c00b0206d4ca4fc69b6d42c26ba0a775efe41974989a3965a6a17f4361dd01f874aadef08fe5d80be75d9e6aea6450 -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE ${ARCHIVE} - SOURCE_BASE ${LIB_VERSION} - PATCHES macos_fixes.patch -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libqcow") - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# License and man -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libqcow/vcpkg.json b/ports/libqcow/vcpkg.json deleted file mode 100644 index 007db5163b6df8..00000000000000 --- a/ports/libqcow/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "libqcow", - "version": "20221124", - "port-version": 1, - "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", - "homepage": "https://github.com/libyal/libqcow", - "license": "LGPL-3.0-or-later", - "supports": "!uwp & !xbox", - "dependencies": [ - "gettext", - "openssl", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ] -} diff --git a/ports/libvmdk/CMakeLists.txt b/ports/libvmdk/CMakeLists.txt deleted file mode 100644 index d04b627bbe3c06..00000000000000 --- a/ports/libvmdk/CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ -cmake_minimum_required(VERSION 3.12) - -project(libvmdk C) - -find_package(ZLIB REQUIRED) - -if(MSVC) - add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) - add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) -endif() - -add_compile_definitions(HAVE_LOCAL_LIBCERROR) -add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) -add_compile_definitions(HAVE_LOCAL_LIBCDATA) -add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) -add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) -add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) -add_compile_definitions(HAVE_LOCAL_LIBCFILE) -add_compile_definitions(HAVE_LOCAL_LIBCPATH) -add_compile_definitions(HAVE_LOCAL_LIBUNA) -add_compile_definitions(HAVE_LOCAL_LIBBFIO) -add_compile_definitions(HAVE_LOCAL_LIBFCACHE) -add_compile_definitions(HAVE_LOCAL_LIBFDATA) -add_compile_definitions(HAVE_LOCAL_LIBFVALUE) -add_compile_definitions(ZLIB_DLL) - -if(UNIX) - configure_file(common/config.h.in common/config.h) - add_compile_definitions(HAVE_CONFIG_H) - add_compile_definitions(LOCALEDIR="/usr/share/locale") -endif() - -if(MSVC) - add_compile_definitions(LIBVMDK_DLL_EXPORT) - set(LIB_RC libvmdk/libvmdk.rc) -endif() - - -include(GNUInstallDirs) -include(CMakePackageConfigHelpers) - -# Add CMake find_package() integration -set(PROJECT_TARGET_NAME "${PROJECT_NAME}") -set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") -set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") -set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") -set(NAMESPACE "libvmdk::") - -# Source files -file(GLOB LIB_SRC lib*/*.c) - -# Headers -file(GLOB LIB_INST_HEADERS include/libvmdk/*.h) - -add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) - -target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) -target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcdata ./libcerror ./libcfile ./libclocale) -target_include_directories(${PROJECT_NAME} PRIVATE ./libcnotify ./libcpath ./libcsplit ./libcthreads) -target_include_directories(${PROJECT_NAME} PRIVATE ./libfcache ./libfdata ./libfvalue ./libuna) - -target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB) - -install(TARGETS ${PROJECT_NAME} - EXPORT ${TARGETS_EXPORT_NAME} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - INCLUDES DESTINATION include) - -install(FILES ${LIB_INST_HEADERS} DESTINATION include/libvmdk) -install(FILES include/libvmdk.h DESTINATION include) - - -# Generate and install libvmdkConfig.cmake -configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") -install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") - -# Generate and install libvmdkTargets*.cmake -install(EXPORT ${TARGETS_EXPORT_NAME} - NAMESPACE ${NAMESPACE} - DESTINATION "${CONFIG_INSTALL_DIR}") - diff --git a/ports/libvmdk/Config.cmake.in b/ports/libvmdk/Config.cmake.in deleted file mode 100644 index bd6bd4532b6282..00000000000000 --- a/ports/libvmdk/Config.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") -check_required_components("@PROJECT_NAME@") diff --git a/ports/libvmdk/android.patch b/ports/libvmdk/android.patch deleted file mode 100644 index fed62c3aba9f09..00000000000000 --- a/ports/libvmdk/android.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/common/config.h b/common/config.h -index 04eda99..3565329 100644 ---- a/common/config.h -+++ b/common/config.h -@@ -128,7 +128,9 @@ - #define HAVE_IOCTL 1 - - /* Define if nl_langinfo has CODESET support. */ -+#if !(defined(__ANDROID__) && __ANDROID_API__ < 28) - #define HAVE_LANGINFO_CODESET 1 -+#endif - - /* Define to 1 if you have the header file. */ - #define HAVE_LANGINFO_H 1 diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake deleted file mode 100644 index 715d8b2071740e..00000000000000 --- a/ports/libvmdk/portfile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -set(LIB_FILENAME libvmdk-alpha-${VERSION}.tar.gz) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/libyal/libvmdk/releases/download/${VERSION}/${LIB_FILENAME}" - FILENAME "${LIB_FILENAME}" - SHA512 7d7ea415d7c2cb1077d591d53ab3c37a7ab6e01dc9525159a70588e6f55e56bbef4d3f49f6e1c01ff0b1ddcede5ec2beb05aca7f12e5212843761e14f6459bcb -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" - SOURCE_BASE "${VERSION}" - PATCHES - android.patch -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libvmdk) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json deleted file mode 100644 index eb0029f99b9685..00000000000000 --- a/ports/libvmdk/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "libvmdk", - "version": "20221124", - "port-version": 1, - "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", - "homepage": "https://github.com/libyal/libvmdk", - "supports": "!uwp", - "dependencies": [ - "gettext", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ] -} diff --git a/ports/libxaw/vcpkg.json b/ports/libxaw/vcpkg.json index e70f375621a552..2d52f48c9032a5 100644 --- a/ports/libxaw/vcpkg.json +++ b/ports/libxaw/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libxaw", "version": "1.0.13", + "port-version": 1, "description": "X Athena Widget Set, based on the X Toolkit Intrinsics (Xt) Library", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxaw", "license": null, + "supports": "!windows | !staticcrt", "dependencies": [ "bzip2", "libx11", diff --git a/ports/mecab/CMakeLists.txt b/ports/mecab/CMakeLists.txt deleted file mode 100644 index 9ebf42ee121f3a..00000000000000 --- a/ports/mecab/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -cmake_minimum_required(VERSION 3.12 FATAL_ERROR) - -PROJECT(mecab VERSION 1.0) - -file(GLOB SOURCE_FILE - "*.cpp" - "*.c" -) -file(GLOB HEADERS_FILE - "*.h" -) - -message(STATUS "current cmake path: ${CMAKE_CURRENT_SOURCE_DIR}") -list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-cost-train.cpp) -list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-dict-gen.cpp) -list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-dict-index.cpp) -list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-system-eval.cpp) -list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-test-gen.cpp) -#list(REMOVE_ITEM SOURCE_FILE "mecab-cost-train.cpp" "mecab-dict-gen.cpp" "mecab-dict-index.cpp" "mecab-system-eval.cpp" "mecab-test-gen.cpp") - -add_library (mecab ${SOURCE_FILE}) -target_include_directories(mecab PUBLIC - $ - $) - -if(UNIX) - target_compile_definitions(mecab PUBLIC -DHAVE_UNISTD_H -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H -DHAVE_SYS_STAT_H -DHAVE_DIRENT_H -DDIC_VERSION=102 -DVERSION="@VERSION@" -DPACKAGE="mecab" -DMECAB_DEFAULT_RC="./mecabrc") -endif(UNIX) -if(WIN32) - target_compile_definitions(mecab PUBLIC -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 -DVERSION="@VERSION@" -DPACKAGE="mecab" -DUNICODE -D_UNICODE -DMECAB_DEFAULT_RC="mecabrc") -endif(WIN32) - - -include (GNUInstallDirs) -include(CMakePackageConfigHelpers) - -set (mecab_CMAKE_DIR share/mecab CACHE STRING "Installation dir") -set (targets_export_name mecabTargets CACHE INTERNAL "") - -install(TARGETS mecab - EXPORT ${targets_export_name} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -) - -install(FILES ${HEADERS_FILE} DESTINATION include/mecab CONFIGURATIONS Release) - -install(EXPORT ${targets_export_name} - NAMESPACE mecab:: - DESTINATION ${mecab_CMAKE_DIR}) - -configure_package_config_file( - "${PROJECT_SOURCE_DIR}/Config.cmake.in" - "${PROJECT_BINARY_DIR}/mecabConfig.cmake" - INSTALL_DESTINATION ${mecab_CMAKE_DIR}) - - -write_basic_package_version_file( - ${PROJECT_BINARY_DIR}/mecabConfigVersion.cmake - VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion ) - -install(FILES - ${PROJECT_BINARY_DIR}/mecabConfig.cmake - ${PROJECT_BINARY_DIR}/mecabConfigVersion.cmake - DESTINATION ${mecab_CMAKE_DIR}) diff --git a/ports/mecab/Config.cmake.in b/ports/mecab/Config.cmake.in deleted file mode 100644 index 927b3637b5a1f4..00000000000000 --- a/ports/mecab/Config.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") -check_required_components(mecab) \ No newline at end of file diff --git a/ports/mecab/fix-missing-functional.patch b/ports/mecab/fix-missing-functional.patch deleted file mode 100644 index 773429ccc68208..00000000000000 --- a/ports/mecab/fix-missing-functional.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mecab/src/dictionary.h b/mecab/src/dictionary.h -index 7046023..32ad358 100644 ---- a/mecab/src/dictionary.h -+++ b/mecab/src/dictionary.h -@@ -10,6 +10,7 @@ - #include "mmap.h" - #include "darts.h" - #include "char_property.h" -+#include - - namespace MeCab { - diff --git a/ports/mecab/fix_wpath_unsigned.patch b/ports/mecab/fix_wpath_unsigned.patch deleted file mode 100644 index d8dcf15099d228..00000000000000 --- a/ports/mecab/fix_wpath_unsigned.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/mecab/src/common.h b/mecab/src/common.h -index d1fc459..2951d5a 100644 ---- a/mecab/src/common.h -+++ b/mecab/src/common.h -@@ -86,7 +86,8 @@ - #define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) - #define WPATH(path) (path) - #else --#define WPATH(path) WPATH_FORCE(path) -+#define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) -+#define WPATH(path) (path) - #endif - #else - #define WPATH_FORCE(path) (path) -diff --git a/mecab/src/feature_index.cpp b/mecab/src/feature_index.cpp -index 051bdf8..fdd0145 100644 ---- a/mecab/src/feature_index.cpp -+++ b/mecab/src/feature_index.cpp -@@ -353,7 +353,7 @@ bool FeatureIndex::buildUnigramFeature(LearnerPath *path, - if (!r) goto NEXT; - os_ << r; - } break; -- case 't': os_ << (size_t)path->rnode->char_type; break; -+ case 't': os_ << (int)(size_t)path->rnode->char_type; break; - case 'u': os_ << ufeature; break; - case 'w': - if (path->rnode->stat == MECAB_NOR_NODE) { -diff --git a/mecab/src/writer.cpp b/mecab/src/writer.cpp -index 0ef6975..f068fa3 100644 ---- a/mecab/src/writer.cpp -+++ b/mecab/src/writer.cpp -@@ -257,7 +257,7 @@ bool Writer::writeNode(Lattice *lattice, - // input sentence - case 'S': os->write(lattice->sentence(), lattice->size()); break; - // sentence length -- case 'L': *os << lattice->size(); break; -+ case 'L': *os << (int)lattice->size(); break; - // morph - case 'm': os->write(node->surface, node->length); break; - case 'M': os->write(reinterpret_cast diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake deleted file mode 100644 index 83dc2cd8925025..00000000000000 --- a/ports/mecab/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "arm64-windows" OR VCPKG_TARGET_TRIPLET STREQUAL "arm-uwp") - message(FATAL_ERROR "mecab does not support on this platform") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO taku910/mecab - REF 3a07c4eefaffb4e7a0690a7f4e5e0263d3ddb8a3 - SHA512 d3288cca7207daf66df4349819b64fc9cc069c775512cf0607ca855e9e5512509c36b0e2bb0e955478acae13ff0c35df7442f18a8458fab0ed664d62854c0b25 - HEAD_REF master - PATCHES - fix_wpath_unsigned.patch - fix-missing-functional.patch -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/mecab/src") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}/mecab/src") -file(COPY "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${SOURCE_PATH}/mecab/src") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/mecab/src" - WINDOWS_USE_MSBUILD - OPTIONS - -DCMAKE_CXX_STANDARD=11 # 17 does not allow 'register' -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup() -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/mecab/COPYING") diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json deleted file mode 100644 index ff532e5d69b687..00000000000000 --- a/ports/mecab/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "mecab", - "version-date": "2019-09-25", - "port-version": 6, - "description": "A morphological analysis engine based on CRF", - "supports": "!uwp & !(arm & windows)", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/mozjpeg/fix-install-error.patch b/ports/mozjpeg/fix-install-error.patch deleted file mode 100644 index da8ecce9fcecf4..00000000000000 --- a/ports/mozjpeg/fix-install-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae07280..54dc4f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1487,7 +1487,7 @@ if(ENABLE_STATIC) - endif() - endif() - --install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+#install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg - ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake deleted file mode 100644 index 308a41acd6f2e9..00000000000000 --- a/ports/mozjpeg/portfile.cmake +++ /dev/null @@ -1,63 +0,0 @@ -if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libjpeg-turbo/copyright") - message(FATAL_ERROR "Can't build ${PORT} if libjpeg-turbo is installed. Please remove libjpeg-turbo:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() -if(EXISTS "${CURRENT_INSTALLED_DIR}/share/ijg-libjpeg/copyright") - message(FATAL_ERROR "Can't build ${PORT} if ijg-libjpeg is installed. Please remove ijg-libjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mozilla/mozjpeg - REF "v${VERSION}" - SHA512 90e1b0067740b161398d908e90b976eccc2ee7174496ce9693ba3cdf4727559ecff39744611657d847dd83164b80993152739692a5233aca577ebd052efaf501 - HEAD_REF master - PATCHES - fix-install-error.patch -) - -vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -vcpkg_add_to_path(${NASM_EXE_PATH}) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DENABLE_SHARED=${ENABLE_SHARED} - -DENABLE_STATIC=${ENABLE_STATIC} - -DWITH_CRT_DLL=${WITH_CRT_DLL} -) - -vcpkg_cmake_install() - -# Rename libraries for static builds -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") - endif() -endif() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mozjpeg) -# Remove extra debug files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_tools(TOOL_NAMES cjpeg djpeg jpegtran tjbench AUTO_CLEAN) -vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() - -# Remove empty folders after static build -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/mozjpeg/vcpkg.json b/ports/mozjpeg/vcpkg.json deleted file mode 100644 index 7723afa5ed8f84..00000000000000 --- a/ports/mozjpeg/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "mozjpeg", - "version": "4.1.5", - "port-version": 1, - "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.", - "homepage": "https://github.com/mozilla/mozjpeg", - "license": "IJG AND BSD-3-Clause AND Zlib", - "dependencies": [ - "libpng", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/optional-bare/portfile.cmake b/ports/optional-bare/portfile.cmake deleted file mode 100644 index f0f05668b3afce..00000000000000 --- a/ports/optional-bare/portfile.cmake +++ /dev/null @@ -1,28 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO martinmoene/optional-bare - REF v1.1.0 - SHA512 0eed103c4e909991b596c0cd23d6206662e3ca71cd8148e27c19d8e071c2a16e18cc940a6cd4f8571510f5e64577157f94c561fb889330bb7a868af64c2f3aa0 -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DOPTIONAL_BARE_OPT_BUILD_TESTS=OFF - -DOPTIONAL_BARE_OPT_BUILD_EXAMPLES=OFF -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup( - CONFIG_PATH lib/cmake/${PORT} -) - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug" - "${CURRENT_PACKAGES_DIR}/lib" -) - -file(INSTALL - "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright -) diff --git a/ports/optional-bare/vcpkg.json b/ports/optional-bare/vcpkg.json deleted file mode 100644 index a358a79d846161..00000000000000 --- a/ports/optional-bare/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "optional-bare", - "version": "1.1.0", - "port-version": 3, - "description": "A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/qt5-canvas3d/portfile.cmake b/ports/qt5-canvas3d/portfile.cmake deleted file mode 100644 index 14a8cbdb2192d0..00000000000000 --- a/ports/qt5-canvas3d/portfile.cmake +++ /dev/null @@ -1,4 +0,0 @@ -message(FATAL_ERROR "${PORT} has been deprecated and will be removed in the future from VCPKG") -#set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -#include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -#qt_submodule_installation() \ No newline at end of file diff --git a/ports/qt5-canvas3d/vcpkg.json b/ports/qt5-canvas3d/vcpkg.json deleted file mode 100644 index 3a01931f25358c..00000000000000 --- a/ports/qt5-canvas3d/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "qt5-canvas3d", - "version": "0", - "port-version": 3, - "description": "Qt Canvas3D offers a low level OpenGL-like API that enables you to execute 3D drawing commands from JavaScript.", - "dependencies": [ - { - "name": "qt5-base", - "default-features": false - } - ] -} diff --git a/ports/range-v3-vs2015/portfile.cmake b/ports/range-v3-vs2015/portfile.cmake deleted file mode 100644 index 2630bf805912c3..00000000000000 --- a/ports/range-v3-vs2015/portfile.cmake +++ /dev/null @@ -1,15 +0,0 @@ -if(EXISTS ${CURRENT_INSTALLED_DIR}/share/range-v3/copyright) - message(FATAL_ERROR "'${PORT}' conflicts with 'range-v3'. Please remove range-v3:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Microsoft/Range-V3-VS2015 - REF 423bcae5cf18948591361329784d3b12ef41711b - SHA512 c6756bc6b5131c4c0ffb96550fb40decf734fc8c30e3d51c5c2bf03aae4d7426de36e896a1abf0a200a49a3906d4b60c1cf52f43504554b64d89c91de3e92746 - HEAD_REF master -) - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") -file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/copyright) -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") -vcpkg_copy_pdbs() diff --git a/ports/range-v3-vs2015/vcpkg.json b/ports/range-v3-vs2015/vcpkg.json deleted file mode 100644 index 4b9c4ab80f1909..00000000000000 --- a/ports/range-v3-vs2015/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "range-v3-vs2015", - "version": "20151130-vcpkg5", - "port-version": 3, - "description": "Range library for C++11/14/17.", - "homepage": "https://github.com/Microsoft/Range-V3-VS2015" -} diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake deleted file mode 100644 index 9aefc82414d125..00000000000000 --- a/ports/rbdl-orb/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json deleted file mode 100644 index acbe19c1df15ba..00000000000000 --- a/ports/rbdl-orb/vcpkg.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "rbdl-orb", - "version": "3.2.0", - "port-version": 2, - "description": "Rigid Body Dynamics Library - ORB", - "homepage": "https://github.com/orb-hd/rbdl-orb", - "dependencies": [ - "rbdl" - ] -} diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake deleted file mode 100644 index 781259cb643138..00000000000000 --- a/ports/sciter/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -message(FATAL_ERROR "The sciter port is deprecated by upstream and conflicts with upstream's replacement. - -Upstream has stopped active development of sciter and instead encourage users to move to a new library Sciter.JS that uses javascript as the internal scripting language (sciter-js in vcpkg). - -Options for existing users are: -1. Depend upon `sciter-js` and change your code to work with the new library -2. Use `\"overrides\"` in manifest mode to pin to `\"version-string\": \"4.4.8.3#1\"` -3. Copy the last available `sciter` version into an overlay port (commit 756f1845537a916ba706f6af544b2f490c30fbb1 at subpath `ports/sciter`) -4. Use the community registry `https://github.com/VuYeK/vcpkg-registry` which may have newer versions of `sciter` available (not affiliated with Microsoft) -") diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json deleted file mode 100644 index fb5784988b9998..00000000000000 --- a/ports/sciter/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "sciter", - "version": "0", - "port-version": 1, - "description": "Sciter is an embeddable HTML/CSS/scripting engine.", - "homepage": "https://github.com/c-smile/sciter-sdk" -} diff --git a/ports/shogun/cmake.patch b/ports/shogun/cmake.patch deleted file mode 100644 index 77eb04c954c5fd..00000000000000 --- a/ports/shogun/cmake.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb06e0cd3..e207fd5ef 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,8 +113,6 @@ SET(SYSTEM_C_FLAGS "${CMAKE_C_FLAGS}") - SET(SYSTEM_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UC) - IF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION")) -- SET(CMAKE_C_FLAGS "") -- SET(CMAKE_CXX_FLAGS "") - ENDIF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION")) - - # compilation cache -@@ -250,12 +248,6 @@ ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - SET(RELEASE_COMPILER_FLAGS "-funroll-loops") - ENDIF() - IF(MSVC) -- SET(CMAKE_C_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}") -- SET(CMAKE_CXX_FLAGS_RELEASE "/O2 ${RELEASE_COMPILER_FLAGS}") -- SET(CMAKE_C_FLAGS_DISTRIBUTION "/Ot") -- SET(CMAKE_CXX_FLAGS_DISTRIBUTION "/Ot") -- SET(CMAKE_C_FLAGS_DEBUG "/DEBUG /Od /Zi") -- SET(CMAKE_CXX_FLAGS_DEBUG "/DEBUG /Od /Zi") - add_compile_options("/bigobj") - SET(SWIG_CXX_COMPILER_FLAGS "/DEBUG /Od /Zi") - ELSE() -diff --git a/cmake/version.cmake b/cmake/version.cmake -index f588caef3..204bc0c27 100644 ---- a/cmake/version.cmake -+++ b/cmake/version.cmake -@@ -5,7 +5,7 @@ SET(MAINVERSION ${VERSION}) - - SET(EXTRA "") - --IF(EXISTS "${ROOT_DIR}/.git/") -+IF(0) - FIND_PACKAGE(Git QUIET) - IF (NOT GIT_FOUND) - MESSAGE(FATAL_ERROR "The source is checked out from a git repository, but cannot find git executable!") -diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt -index 20c4b4fa6..8fcbd87ed 100644 ---- a/src/shogun/CMakeLists.txt -+++ b/src/shogun/CMakeLists.txt -@@ -42,7 +42,6 @@ ELSE() - ENDIF() - set(INCLUDE_INSTALL_DIR include) - set(THIRD_PARTY_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/third_party) --set(SHOGUN_CLING_LIBRARY_DIR "\"${CMAKE_INSTALL_PREFIX}/${SHOGUN_LIB_INSTALL}\"") - - if (MSVC OR BUILD_BENCHMARKS) - SET(LIBSHOGUN_BUILD_STATIC ON -@@ -159,7 +158,7 @@ ENDIF() - # add target for static library if enabled - if (LIBSHOGUN_BUILD_STATIC) - add_library(shogun-static STATIC $ ${CMAKE_CURRENT_BINARY_DIR}/lib/config.h) -- set_property(TARGET shogun-static PROPERTY OUTPUT_NAME shogun) -+ set_property(TARGET shogun-static PROPERTY OUTPUT_NAME libshogun) - target_include_directories(shogun-static PUBLIC - $ - $ -@@ -441,7 +440,7 @@ if (NOT RapidJSON_FOUND) - endif() - SHOGUN_INCLUDE_DIRS(SCOPE PRIVATE ${RAPIDJSON_INCLUDE_DIRS}) - --include(external/bitsery) -+find_package(bitsery) - SHOGUN_INCLUDE_DIRS(SCOPE PRIVATE ${BITSERY_INCLUDE_DIR}) - - if (NOT WIN32) -@@ -631,10 +630,6 @@ INSTALL( - PATTERN ".settings" EXCLUDE) - - # set the desidered targets to be installed --set(INSTALL_TARGETS shogun) --if (LIBSHOGUN_BUILD_STATIC) -- LIST(APPEND INSTALL_TARGETS shogun-static) --endif() - - INSTALL( - TARGETS ${INSTALL_TARGETS} -@@ -645,10 +640,10 @@ INSTALL( - INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} - ) - --file(TO_CMAKE_PATH ${SHOGUN_LIB_INSTALL}/cmake/shogun CONFIG_PACKAGE_DIR) -+file(TO_CMAKE_PATH share/shogun CONFIG_PACKAGE_DIR) - configure_package_config_file( - ${CMAKE_SOURCE_DIR}/cmake/ShogunConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/ShogunConfig.cmake -- INSTALL_DESTINATION ${SHOGUN_LIB_INSTALL}/cmake/shogun -+ INSTALL_DESTINATION share/shogun - PATH_VARS INCLUDE_INSTALL_DIR CONFIG_PACKAGE_DIR) - - write_basic_package_version_file( diff --git a/ports/shogun/eigen-3.4.patch b/ports/shogun/eigen-3.4.patch deleted file mode 100644 index 727cbe44b5217c..00000000000000 --- a/ports/shogun/eigen-3.4.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt -index 31a0d2c7b..e700bd7c7 100644 ---- a/src/shogun/CMakeLists.txt -+++ b/src/shogun/CMakeLists.txt -@@ -307,7 +307,7 @@ IF(NOT EIGEN3_FOUND) - ) - ELSE() - # https://github.com/shogun-toolbox/shogun/issues/4870 -- IF(${EIGEN3_VERSION_STRING} VERSION_GREATER 3.3.9) -+ IF(0) - MESSAGE(FATAL_ERROR "The system Eigen3 version ${EIGEN3_VERSION_STRING} isn't supported!") - ENDIF() - SHOGUN_INCLUDE_DIRS(SCOPE PUBLIC SYSTEM ${EIGEN3_INCLUDE_DIR}) -diff --git a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp -index a1677177e..0c9ca8f78 100644 ---- a/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp -+++ b/src/shogun/machine/gp/MultiLaplaceInferenceMethod.cpp -@@ -87,10 +87,10 @@ public: - float64_t result=0; - for(index_t bl=0; blblock(bl * n, 0, n, 1) * std::exp(log_scale * 2.0); -- result+=alpha->block(bl*n,0,n,1).dot(eigen_f.block(bl*n,0,n,1))/2.0; -- eigen_f.block(bl*n,0,n,1)+=eigen_m; -+ eigen_f.segment(bl * n, n) = -+ K * alpha->segment(bl * n, n) * std::exp(log_scale * 2.0); -+ result+=alpha->segment(bl*n,n).dot(eigen_f.segment(bl*n,n))/2.0; -+ eigen_f.segment(bl*n,n)+=eigen_m; - } - - // get first and second derivatives of log likelihood -@@ -278,9 +278,9 @@ void MultiLaplaceInferenceMethod::update_alpha() - { - Map alpha(m_alpha.vector, m_alpha.vlen); - for(index_t bl=0; bl chol_tmp( - (eigen_sD * eigen_sD.transpose()) - .cwiseProduct(eigen_ktrtr * std::exp(m_log_scale * 2.0)) + -@@ -351,14 +351,14 @@ void MultiLaplaceInferenceMethod::update_alpha() - VectorXd tmp2=m_tmp.array().rowwise().sum(); - - for(index_t bl=0; bl &eigen_c=eigen_W; - for(index_t bl=0; bl c_tmp(eigen_c.data(),n,C); - -@@ -422,7 +422,7 @@ float64_t MultiLaplaceInferenceMethod::get_derivative_helper(SGMatrix - { - result+=((eigen_E.block(0,bl*n,n,n)-eigen_U.block(0,bl*n,n,n).transpose()*eigen_U.block(0,bl*n,n,n)).array() - *eigen_dK.array()).sum(); -- result-=(eigen_dK*eigen_alpha.block(bl*n,0,n,1)).dot(eigen_alpha.block(bl*n,0,n,1)); -+ result-=(eigen_dK*eigen_alpha.segment(bl*n,n)).dot(eigen_alpha.segment(bl*n,n)); - } - - return result/2.0; -@@ -504,7 +504,7 @@ SGVector MultiLaplaceInferenceMethod::get_derivative_wrt_mean( - result[i]=0; - //currently only compute the explicit term - for(index_t bl=0; bl - #include - #include -+#include - - #include - diff --git a/ports/shogun/fix-build-error-with-fmt11.patch b/ports/shogun/fix-build-error-with-fmt11.patch deleted file mode 100644 index 2cf7e09807c10d..00000000000000 --- a/ports/shogun/fix-build-error-with-fmt11.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/shogun/labels/BinaryLabelEncoder.h b/src/shogun/labels/BinaryLabelEncoder.h -index 5bcd57e..69ed63e 100644 ---- a/src/shogun/labels/BinaryLabelEncoder.h -+++ b/src/shogun/labels/BinaryLabelEncoder.h -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - namespace shogun - { - /** @brief Implements a reversible mapping from -diff --git a/src/shogun/labels/MulticlassLabelsEncoder.h b/src/shogun/labels/MulticlassLabelsEncoder.h -index 41e9855..04151e4 100644 ---- a/src/shogun/labels/MulticlassLabelsEncoder.h -+++ b/src/shogun/labels/MulticlassLabelsEncoder.h -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - namespace shogun - { diff --git a/ports/shogun/fmt.patch b/ports/shogun/fmt.patch deleted file mode 100644 index 281b1bacaa4da6..00000000000000 --- a/ports/shogun/fmt.patch +++ /dev/null @@ -1,216 +0,0 @@ -diff --git a/src/shogun/classifier/mkl/MKL.cpp b/src/shogun/classifier/mkl/MKL.cpp -index 2622df919..1a36aa513 100644 ---- a/src/shogun/classifier/mkl/MKL.cpp -+++ b/src/shogun/classifier/mkl/MKL.cpp -@@ -369,7 +369,7 @@ bool MKL::train_machine(std::shared_ptr data) - io::info("mkl_epsilon = %1.1e", mkl_epsilon); - io::info("C_mkl = %1.1e", C_mkl); - io::info("mkl_norm = %1.3e", mkl_norm); -- io::info("solver = {}", get_solver_type()); -+ io::info("solver = {}", (int)get_solver_type()); - io::info("ent_lambda = {}", ent_lambda); - io::info("mkl_block_norm = {}", mkl_block_norm); - -diff --git a/src/shogun/classifier/mkl/MKLMulticlass.cpp b/src/shogun/classifier/mkl/MKLMulticlass.cpp -index b50876f14..dc0f80e8a 100644 ---- a/src/shogun/classifier/mkl/MKLMulticlass.cpp -+++ b/src/shogun/classifier/mkl/MKLMulticlass.cpp -@@ -104,7 +104,7 @@ void MKLMulticlass::initlpsolver() - { - error("MKLMulticlass::initlpsolver(): given kernel is not of type" - " K_COMBINED {} required by Multiclass Mkl \n", -- m_kernel->get_kernel_type()); -+ (int)m_kernel->get_kernel_type()); - } - - int numker=std::dynamic_pointer_cast(m_kernel)->get_num_subkernels(); -diff --git a/src/shogun/evaluation/ROCEvaluation.cpp b/src/shogun/evaluation/ROCEvaluation.cpp -index 482f06528..58595c844 100644 ---- a/src/shogun/evaluation/ROCEvaluation.cpp -+++ b/src/shogun/evaluation/ROCEvaluation.cpp -@@ -30,11 +30,11 @@ float64_t ROCEvaluation::evaluate(std::shared_ptr predicted, std::shared - require( - predicted->get_label_type() == LT_BINARY, - "Given predicted labels ({}) must be binary ({}).", -- predicted->get_label_type(), LT_BINARY); -+ (int)predicted->get_label_type(), (int)LT_BINARY); - require( - ground_truth->get_label_type() == LT_BINARY, - "Given ground truth labels ({}) must be binary ({}).", -- ground_truth->get_label_type(), LT_BINARY); -+ (int)ground_truth->get_label_type(), (int)LT_BINARY); - - return evaluate_roc(binary_labels(predicted),binary_labels(ground_truth)); - } -diff --git a/src/shogun/io/SGIO.h b/src/shogun/io/SGIO.h -index 336e35b03..0ba7b2c0b 100644 ---- a/src/shogun/io/SGIO.h -+++ b/src/shogun/io/SGIO.h -@@ -307,7 +307,7 @@ namespace shogun - if (should_log(prio)) - { - fmt::memory_buffer msg; -- fmt::format_to(msg, format, std::forward(args)...); -+ fmt::format_to(std::back_inserter(msg), format, std::forward(args)...); - message_(prio, loc, fmt::string_view(msg.data(), msg.size())); - } - } -@@ -357,7 +357,7 @@ namespace shogun - "ExceptionType must be nothrow copy constructible"); - - fmt::memory_buffer msg; -- fmt::format_to(msg, format, std::forward(args)...); -+ fmt::format_to(std::back_inserter(msg), format, std::forward(args)...); - msg.push_back('\0'); - env()->io()->message(io::MSG_ERROR, loc, msg.data()); - throw ExceptionType(msg.data()); -diff --git a/src/shogun/io/serialization/JsonDeserializer.cpp b/src/shogun/io/serialization/JsonDeserializer.cpp -index 24fd30edd..7667e34d3 100644 ---- a/src/shogun/io/serialization/JsonDeserializer.cpp -+++ b/src/shogun/io/serialization/JsonDeserializer.cpp -@@ -49,7 +49,7 @@ public: - void on(std::vector::reference* v) override - { - *v = next_element(&ValueType::GetBool); -- SG_DEBUG("read bool with value {}", *v); -+ SG_DEBUG("read bool with value {}", (bool)*v); - } - void on(char* v) override - { -diff --git a/src/shogun/io/serialization/JsonSerializer.cpp b/src/shogun/io/serialization/JsonSerializer.cpp -index 22c99ec5c..530a14525 100644 ---- a/src/shogun/io/serialization/JsonSerializer.cpp -+++ b/src/shogun/io/serialization/JsonSerializer.cpp -@@ -62,7 +62,7 @@ public: - } - void on(std::vector::reference* v) override - { -- SG_DEBUG("writing bool with value {}", *v); -+ SG_DEBUG("writing bool with value {}", (bool)*v); - m_json_writer.Bool(*v); - close_container(); - } -diff --git a/src/shogun/kernel/CustomKernel.cpp b/src/shogun/kernel/CustomKernel.cpp -index 06a7e7abd..78be0ef6f 100644 ---- a/src/shogun/kernel/CustomKernel.cpp -+++ b/src/shogun/kernel/CustomKernel.cpp -@@ -112,10 +112,10 @@ bool CustomKernel::init(std::shared_ptr l, std::shared_ptr r - /* Make sure l and r have the same type of CFeatures */ - require(l->get_feature_class()==r->get_feature_class(), - "Different FeatureClass: l is {}, r is {}", -- l->get_feature_class(),r->get_feature_class()); -+ (int)l->get_feature_class(),(int)r->get_feature_class()); - require(l->get_feature_type()==r->get_feature_type(), - "Different FeatureType: l is {}, r is {}", -- l->get_feature_type(),r->get_feature_type()); -+ (int)l->get_feature_type(),(int)r->get_feature_type()); - - /* If l and r are the type of IndexFeatures, - * the init function adds a subset to kernel matrix. -diff --git a/src/shogun/preprocessor/DensePreprocessor.cpp b/src/shogun/preprocessor/DensePreprocessor.cpp -index 56de8a9e6..05cd9a32e 100644 ---- a/src/shogun/preprocessor/DensePreprocessor.cpp -+++ b/src/shogun/preprocessor/DensePreprocessor.cpp -@@ -90,7 +90,7 @@ std::shared_ptr DensePreprocessor::transform(std::shared_ptrget_feature_class()==C_DENSE, "Provided features ({}) " - "has to be of C_DENSE ({}) class!", -- features->get_feature_class(), C_DENSE); -+ (int)features->get_feature_class(), (int)C_DENSE); - - auto matrix = features->as>()->get_feature_matrix(); - if (!inplace) -@@ -107,7 +107,7 @@ DensePreprocessor::inverse_transform(std::shared_ptr features, boo - features->get_feature_class() == C_DENSE, - "Provided features ({}) " - "has to be of C_DENSE ({}) class!", -- features->get_feature_class(), C_DENSE); -+ (int)features->get_feature_class(), (int)C_DENSE); - - auto matrix = features->as>()->get_feature_matrix(); - if (!inplace) -diff --git a/src/shogun/preprocessor/KernelPCA.cpp b/src/shogun/preprocessor/KernelPCA.cpp -index 6709f67cd..0707f3db9 100644 ---- a/src/shogun/preprocessor/KernelPCA.cpp -+++ b/src/shogun/preprocessor/KernelPCA.cpp -@@ -125,7 +125,7 @@ std::shared_ptr KernelPCA::transform(std::shared_ptr feature - return apply_to_string_features(features); - } - -- error("Feature type {} not supported", features->get_feature_type()); -+ error("Feature type {} not supported", (int)features->get_feature_type()); - return NULL; - } - -diff --git a/src/shogun/preprocessor/StringPreprocessor.cpp b/src/shogun/preprocessor/StringPreprocessor.cpp -index c0c342b82..87629b5cb 100644 ---- a/src/shogun/preprocessor/StringPreprocessor.cpp -+++ b/src/shogun/preprocessor/StringPreprocessor.cpp -@@ -95,7 +95,7 @@ namespace shogun - features->get_feature_class() == C_STRING, - "Provided features ({}) " - "has to be of C_STRING ({}) class!", -- features->get_feature_class(), C_STRING); -+ (int)features->get_feature_class(), (int)C_STRING); - - - -diff --git a/src/shogun/structure/BeliefPropagation.cpp b/src/shogun/structure/BeliefPropagation.cpp -index e54228917..96b90c458 100644 ---- a/src/shogun/structure/BeliefPropagation.cpp -+++ b/src/shogun/structure/BeliefPropagation.cpp -@@ -248,7 +248,7 @@ void TreeMaxProduct::bottom_up_pass() - for (uint32_t mi = 0; mi < m_msg_order.size(); ++mi) - { - SG_DEBUG("mi = {}, mtype: {} {} -> {}", mi, -- m_msg_order[mi]->mtype, m_msg_order[mi]->child, m_msg_order[mi]->parent); -+ (int)m_msg_order[mi]->mtype, m_msg_order[mi]->child, m_msg_order[mi]->parent); - - if (m_msg_order[mi]->mtype == VAR_TO_FAC) // var -> factor - { -@@ -392,7 +392,7 @@ void TreeMaxProduct::top_down_pass() - for (int32_t mi = (int32_t)(m_msg_order.size()-1); mi >= 0; --mi) - { - SG_DEBUG("mi = {}, mtype: {} {} <- {}", mi, -- m_msg_order[mi]->mtype, m_msg_order[mi]->child, m_msg_order[mi]->parent); -+ (int)m_msg_order[mi]->mtype, m_msg_order[mi]->child, m_msg_order[mi]->parent); - - if (m_msg_order[mi]->mtype == FAC_TO_VAR) // factor <- var - { -diff --git a/src/shogun/structure/CCSOSVM.cpp b/src/shogun/structure/CCSOSVM.cpp -index 8dd920ad8..8267a402c 100644 ---- a/src/shogun/structure/CCSOSVM.cpp -+++ b/src/shogun/structure/CCSOSVM.cpp -@@ -321,7 +321,7 @@ bool CCSOSVM::train_machine(std::shared_ptr data) - proximal_rhs[i] = (1+rho)*delta[i] - rho*gammaG0[i]; - break; - default: -- error("Invalid QPType: {}", m_qp_type); -+ error("Invalid QPType: {}", (int)m_qp_type); - } - } - -@@ -351,7 +351,7 @@ bool CCSOSVM::train_machine(std::shared_ptr data) - */ - break; - default: -- error("Invalid QPType: {}", m_qp_type); -+ error("Invalid QPType: {}", (int)m_qp_type); - } - - /* DEBUG */ -@@ -697,12 +697,12 @@ void CCSOSVM::init() - - /* check return code */ - if (r != MSK_RES_OK) -- error("Error while creating mosek env: {}", r); -+ error("Error while creating mosek env: {}", (int)r); - - /* initialize the environment */ - r = MSK_initenv(m_msk_env); - if (r != MSK_RES_OK) -- error("Error while initializing mosek env: {}", r); -+ error("Error while initializing mosek env: {}", (int)r); - #endif - - SG_ADD(&m_C, "m_C", "C"); diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake deleted file mode 100644 index 52cdca2fa4b2c3..00000000000000 --- a/ports/shogun/portfile.cmake +++ /dev/null @@ -1,79 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO shogun-toolbox/shogun - REF 8f01b2b9e4de46a38bf70cdb603db75ebfd4b58b - SHA512 24bd0e3e2a599e81432f59bd6ebc514729453cfe808541f6842dc57e2eff329e52a3e3575580bf84b2d4768209fa2624295e4e9cdcdc656dd48a8ab66bc6dbc6 - HEAD_REF master - PATCHES - cmake.patch - eigen-3.4.patch - fix-ASSERT-not-found.patch - fmt.patch - syntax.patch - remove-bitsery.patch - fix-build-error-with-fmt11.patch -) - -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path("${PYTHON3_DIR}") - -# Shogun only checks libraries for symbols and assumes everything is fine. -# However openblas requires extra includes and mkl would require extra defines -# So get the needed flags via the pkg-config files. - -x_vcpkg_pkgconfig_get_modules(PREFIX PC_BLAS_LAPACK MODULES lapack blas CFLAGS) - -string(APPEND VCPKG_C_FLAGS_RELEASE " ${PC_BLAS_LAPACK_CFLAGS_RELEASE}") -string(APPEND VCPKG_CXX_FLAGS_RELEASE " ${PC_BLAS_LAPACK_CFLAGS_RELEASE}") - -string(APPEND VCPKG_C_FLAGS_DEBUG " ${PC_BLAS_LAPACK_CFLAGS_DEBUG}") -string(APPEND VCPKG_CXX_FLAGS_DEBUG " ${PC_BLAS_LAPACK_CFLAGS_DEBUG}") - -if(VCPKG_TARGET_IS_OSX) - # Eigen3 and accelerate disagree on prototypes for lapack generating compiler errors - set(extra_opts -DENABLE_EIGEN_LAPACK=OFF) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_META_EXAMPLES=OFF - -DBUILD_EXAMPLES=OFF - -DUSE_SVMLIGHT=OFF - -DENABLE_TESTING=OFF - -DLICENSE_GPL_SHOGUN=OFF - -DLIBSHOGUN_BUILD_STATIC=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_GLPK=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_Mosek=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_LpSolve=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_ColPack=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_CCache=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_OpenMP=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_bitsery=TRUE - -DINSTALL_TARGETS=shogun-static - ${extra_opts} - -DCMAKE_CXX_STANDARD=14 # protobuf -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup() - -file(REMOVE_RECURSE - # This directory is empty given the settings above - "${CURRENT_PACKAGES_DIR}/include/shogun/mathematics/linalg/backend" - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" -) - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/shogun/remove-bitsery.patch b/ports/shogun/remove-bitsery.patch deleted file mode 100644 index 9bcb92d24db812..00000000000000 --- a/ports/shogun/remove-bitsery.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/interfaces/swig/SGBase.i b/src/interfaces/swig/SGBase.i -index 543a8ff00..4b4df8604 100644 ---- a/src/interfaces/swig/SGBase.i -+++ b/src/interfaces/swig/SGBase.i -@@ -504,10 +504,7 @@ namespace shogun - PyObject* __getstate__() - { - std::shared_ptr serializer = nullptr; -- if (pickle_ascii) - serializer = std::make_shared(); -- else -- serializer = std::make_shared(); - auto byte_stream = std::make_shared(); - serializer->attach(byte_stream); - serializer->write(std::shared_ptr($self)); -@@ -537,10 +534,7 @@ namespace shogun - PyString_AsStringAndSize(py_str, &str, &len); - #endif - std::shared_ptr deser = nullptr; -- if (pickle_ascii) - deser = std::make_shared(); -- else -- deser = std::make_shared(); - - auto byte_input_stream = std::make_shared(str, len); - deser->attach(byte_input_stream); -diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt -index 20c4b4fa6..fa4be96f6 100644 ---- a/src/shogun/CMakeLists.txt -+++ b/src/shogun/CMakeLists.txt -@@ -12,6 +12,7 @@ include(CheckCXXSourceCompiles) - include(CMakePackageConfigHelpers) - - FILE(GLOB_RECURSE LIBSHOGUN_SRC *.${EXT_SRC_CPP} *.${EXT_SRC_C}) -+list(FILTER LIBSHOGUN_SRC EXCLUDE REGEX ".*(BitserySerializer\.cpp|BitseryDeserializer\.cpp)$") - FILE(GLOB_RECURSE LIBSHOGUN_HEADERS *.${EXT_SRC_HEADER}) - FILE(GLOB_RECURSE LIBSHOGUN_SRC_TMP *.${EXT_CPP_TMP}) - -diff --git a/src/shogun/base/class_list.cpp.py b/src/shogun/base/class_list.cpp.py -index 854d5dd1e..92c4379c1 100644 ---- a/src/shogun/base/class_list.cpp.py -+++ b/src/shogun/base/class_list.cpp.py -@@ -69,7 +69,7 @@ class_blacklist = ["SGVector", "SGMatrix", "SGSparseVector", "SGSparseMatrix", - "NumericalVGLikelihood", "SingleFITCInference", "VariationalGaussianLikelihood", - "RationalApproximation", "FirstOrderStochasticMinimizer", "IndependenceTest", - "TwoDistributionTest", "TwoSampleTest", "RealDistance", "BinaryClassEvaluation", -- "MomentumCorrection", "OneDistributionTest", "DependenceMaximization"] -+ "MomentumCorrection", "OneDistributionTest", "DependenceMaximization", "BitserySerializer", "BitseryDeserializer"] - - SHOGUN_TEMPLATE_CLASS = "SHOGUN_TEMPLATE_CLASS" - SHOGUN_BASIC_CLASS = "SHOGUN_BASIC_CLASS" diff --git a/ports/shogun/syntax.patch b/ports/shogun/syntax.patch deleted file mode 100644 index fc3d22aa2d7df8..00000000000000 --- a/ports/shogun/syntax.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/shogun/io/ShogunErrc.h b/src/shogun/io/ShogunErrc.h -index 6cb5619c5..98b08b494 100644 ---- a/src/shogun/io/ShogunErrc.h -+++ b/src/shogun/io/ShogunErrc.h -@@ -8,6 +8,7 @@ - #define SHOGUN_ERRORS_H__ - - #include -+#include - - #include - -diff --git a/src/shogun/mathematics/linalg/LinalgNamespace.h b/src/shogun/mathematics/linalg/LinalgNamespace.h -index 40888e00c..c4293e378 100644 ---- a/src/shogun/mathematics/linalg/LinalgNamespace.h -+++ b/src/shogun/mathematics/linalg/LinalgNamespace.h -@@ -1825,7 +1825,6 @@ namespace shogun - auto max_it = std::max_element(a_copy.begin(), a_copy.begin() + n); - result = (a_copy[n] + *max_it) / 2; - } -- } - - return result; - } diff --git a/ports/shogun/vcpkg.json b/ports/shogun/vcpkg.json deleted file mode 100644 index 7dfd5dfed82a05..00000000000000 --- a/ports/shogun/vcpkg.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "shogun", - "version-date": "2023-12-19", - "port-version": 1, - "description": "Unified and efficient Machine Learning", - "homepage": "https://github.com/shogun-toolbox/shogun", - "dependencies": [ - "blas", - "bzip2", - "curl", - "eigen3", - { - "name": "hdf5", - "default-features": false, - "platform": "!windows" - }, - "lapack", - "liblzma", - "libxml2", - "lzo", - "nlopt", - "protobuf", - "rapidjson", - "rxcpp", - "snappy", - "spdlog", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - { - "name": "vcpkg-pkgconfig-get-modules", - "host": true - }, - "zlib" - ] -} diff --git a/ports/signalrclient/0001_cmake.patch b/ports/signalrclient/0001_cmake.patch deleted file mode 100644 index 8002aeab736f91..00000000000000 --- a/ports/signalrclient/0001_cmake.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c73730..4cd9074 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,9 @@ - cmake_minimum_required (VERSION 2.8.11) - project (signalrclient) - -+if(NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -L -lcpprest") -+endif() - - set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir") - -@@ -16,4 +18,32 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) - - add_subdirectory(src/signalrclient) --add_subdirectory(test) -+if(NOT DISABLE_TESTS) -+ add_subdirectory(test) -+endif() -+ -+if(BUILD_SHARED_LIBS) -+ install(FILES include/signalrclient/_exports.h DESTINATION include/signalrclient) -+else() -+ file(READ include/signalrclient/_exports.h EXPORTS_H) -+ string(REPLACE "#ifdef NO_SIGNALRCLIENT_EXPORTS" "#if 1" EXPORTS_H_2 ${EXPORTS_H}) -+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/_exports.h "${EXPORTS_H_2}") -+ -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_exports.h DESTINATION include/signalrclient) -+endif() -+ -+set(HEADERS -+ include/signalrclient/connection.h -+ include/signalrclient/connection_state.h -+ include/signalrclient/hub_connection.h -+ include/signalrclient/hub_exception.h -+ include/signalrclient/hub_proxy.h -+ include/signalrclient/log_writer.h -+ include/signalrclient/trace_level.h -+ include/signalrclient/transport_type.h -+ include/signalrclient/web_exception.h) -+ -+install( -+ FILES ${HEADERS} -+ DESTINATION "include/signalrclient" -+) -diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt -index 76a5e1b..db141eb 100644 ---- a/src/signalrclient/CMakeLists.txt -+++ b/src/signalrclient/CMakeLists.txt -@@ -22,6 +22,21 @@ set (SOURCES - websocket_transport.cpp - ) - --add_library (signalrclient SHARED ${SOURCES}) -+if(BUILD_SHARED_LIBS) -+ add_definitions(-DSIGNALRCLIENT_EXPORTS) -+else() -+ add_definitions(-DNO_SIGNALRCLIENT_EXPORTS) -+endif() -+ -+add_definitions(-DUNICODE -D_UNICODE) -+ -+add_library (signalrclient ${SOURCES}) - - target_link_libraries(signalrclient ${CPPREST_SO}) -+ -+install( -+ TARGETS signalrclient -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION bin -+) diff --git a/ports/signalrclient/0002_fix-compile-error.patch b/ports/signalrclient/0002_fix-compile-error.patch deleted file mode 100644 index e3631379bcf89f..00000000000000 --- a/ports/signalrclient/0002_fix-compile-error.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 91c2300..2439fec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ if(NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -L -lcpprest") - endif() - -+find_package(OpenSSL REQUIRED) -+ - set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir") - - include_directories ( -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 506680d04..d8bd404a6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,7 +13,7 @@ include_directories ( - include - "${CPPREST_INCLUDE_DIR}") - --find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED) -+find_package(cpprestsdk REQUIRED) - - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) -diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt -index db141eb..c4306d8 100644 ---- a/src/signalrclient/CMakeLists.txt -+++ b/src/signalrclient/CMakeLists.txt -@@ -32,7 +32,7 @@ add_definitions(-DUNICODE -D_UNICODE) - - add_library (signalrclient ${SOURCES}) - --target_link_libraries(signalrclient ${CPPREST_SO}) -+target_link_libraries(signalrclient cpprestsdk::cpprest OpenSSL::SSL OpenSSL::Crypto) - - install( - TARGETS signalrclient diff --git a/ports/signalrclient/portfile.cmake b/ports/signalrclient/portfile.cmake deleted file mode 100644 index 57123270ba9a8d..00000000000000 --- a/ports/signalrclient/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -if(EXISTS ${CURRENT_INSTALLED_DIR}/share/microsoft-signalr/copyright) - message(FATAL_ERROR "'${PORT}' conflicts with 'microsoft-signalr'. Please remove microsoft-signalr:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO SignalR/SignalR-Client-Cpp - REF 1.0.0-beta1 - SHA512 b38f6f946f1499080071949cbcf574405118f9acfb469441e5b5b0df3e5f0d277a83b30e0d613dc5e54732b9071e3273dac1ee65129f994d5a60eef0e45bdf6c - HEAD_REF master - PATCHES - 0001_cmake.patch - 0002_fix-compile-error.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - "-DCPPREST_SO=${CURRENT_INSTALLED_DIR}/debug/lib/cpprest_2_10d.lib" - OPTIONS_RELEASE - "-DCPPREST_SO=${CURRENT_INSTALLED_DIR}/lib/cpprest_2_10.lib" - OPTIONS - "-DCPPREST_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include" - -DDISABLE_TESTS=ON -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# copy license -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/signalrclient/vcpkg.json b/ports/signalrclient/vcpkg.json deleted file mode 100644 index fdc21fb87986f4..00000000000000 --- a/ports/signalrclient/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "signalrclient", - "version": "1.0.0-beta1-9", - "port-version": 6, - "description": "C++ client for SignalR.", - "homepage": "https://github.com/SignalR/SignalR-Client-Cpp", - "dependencies": [ - { - "name": "cpprestsdk", - "features": [ - "websockets" - ] - }, - "openssl", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/spdk-dpdk/CMakeLists.txt b/ports/spdk-dpdk/CMakeLists.txt deleted file mode 100644 index 1952227ae0d65e..00000000000000 --- a/ports/spdk-dpdk/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(dpdk C) - -LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") -LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -#ARCH can be: i686, x86_64, ppc_64, arm64 -#MACHINE can be: native, power8, armv8a -#EXECENV can be: linuxapp, bsdapp -#TOOLCHAIN can be: gcc, icc - -SET(ARCH x86_64) -SET(MACHINE native) -SET(EXECENV linuxapp) -SET(TOOLCHAIN gcc) - -IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") - SET(ARCH "i686") -ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - SET(MACHINE arm8a) -ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - SET(MACHINE power8) - SET(ARCH ppc_64) -ENDIF () - -IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - SET(EXECENV bsdapp) -ENDIF () - -FIND_PACKAGE(Numa REQUIRED) -FIND_PROGRAM(MAKE make) - -SET(DPDK_CFLAGS "-fPIC") -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") -ENDIF () - -SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) -#SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) -SET(DPDK_CONFIG "T=${DPDK_TARGET}") - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -ADD_CUSTOM_TARGET(dpdk-configure - COMMAND ${MAKE} config ${DPDK_CONFIG} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - VERBATIM - ) - -ADD_CUSTOM_TARGET(dpdk ALL - COMMAND ${MAKE} EXTRA_CFLAGS=\"${DPDK_CFLAGS}\" MAKEFLAGS=\"${DPDK_CONFIG} -j ${PROCS}\" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - ) - -ADD_DEPENDENCIES(dpdk dpdk-configure) - -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/ports/spdk-dpdk/FindNuma.cmake b/ports/spdk-dpdk/FindNuma.cmake deleted file mode 100644 index d5bb6143559541..00000000000000 --- a/ports/spdk-dpdk/FindNuma.cmake +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PATH(NUMA_ROOT_DIR - NAMES include/numa.h - PATHS ENV NUMA_ROOT - DOC "NUMA library root directory") - -FIND_PATH(NUMA_INCLUDE_DIR - NAMES numa.h - HINTS ${NUMA_ROOT_DIR} - PATH_SUFFIXES include - DOC "NUMA include directory") - -FIND_LIBRARY(NUMA_LIBRARY - NAMES numa - HINTS ${NUMA_ROOT_DIR} - DOC "NUMA library file") - -IF (NUMA_LIBRARY) - GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) - MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) -ELSE () - SET(NUMA_FOUND FALSE) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () diff --git a/ports/spdk-dpdk/portfile.cmake b/ports/spdk-dpdk/portfile.cmake deleted file mode 100644 index 45ce0626d6d2d4..00000000000000 --- a/ports/spdk-dpdk/portfile.cmake +++ /dev/null @@ -1,44 +0,0 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO spdk/dpdk - REF spdk-18.11 - SHA512 9c069bb0e445f8287ee056452fa32263746f78e27377e8fd75809b9ebf7f25c2395ee13ae4804d8c464e5bc7db7335692759ab3202748dd0c82243aad35e5e7c - HEAD_REF master -) - -FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS "$ENV{HOME}/local/include" /opt/local/include /usr/local/include /usr/include -) -IF (NOT NUMA_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () - -vcpkg_cmake_configure( - SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" - OPTIONS - "-DSOURCE_PATH=${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -# Headers are symbolic links here, gather all, resolve and copy real files -FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") -SET(REAL_FILES "") -FOREACH (HEADER ${HEADERS}) - GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) - LIST(APPEND REAL_FILES "${REAL_FILE}") -ENDFOREACH () - -FILE(INSTALL "${SOURCE_PATH}/Release/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/spdk") -if(NOT VCPKG_BUILD_TYPE) - FILE(INSTALL "${SOURCE_PATH}/Debug/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/spdk") -endif() -FILE(INSTALL ${REAL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-dpdkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk-dpdk/spdk-dpdkConfig.cmake b/ports/spdk-dpdk/spdk-dpdkConfig.cmake deleted file mode 100644 index 85b850812fd200..00000000000000 --- a/ports/spdk-dpdk/spdk-dpdkConfig.cmake +++ /dev/null @@ -1,31 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(DPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) -GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) - -SET_LIBRARY_TARGET("SPDK" "dpdk" "${DPDK_ROOT}/debug/lib/spdk/libdpdk.a" "${DPDK_ROOT}/lib/spdk/libdpdk.a" "${DPDK_ROOT}/include/spdk-dpdk") - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${DPDK_ROOT}/debug/lib/spdk) -ELSE () - LINK_DIRECTORIES(${DPDK_ROOT}/lib/spdk) -ENDIF () - -FILE(GLOB DPDK_LIBS ${DPDK_ROOT}/lib/spdk/librte*.*) -FOREACH (LIB_FILE_NAME ${DPDK_LIBS}) - GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) - GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) - STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") - SET_LIBRARY_TARGET("SPDK" "${LIB_NAME}" "${DPDK_ROOT}/debug/lib/spdk/${FULL_LIB_NAME}" "${DPDK_ROOT}/lib/spdk/${FULL_LIB_NAME}" "${DPDK_ROOT}/include/spdk-dpdk") -ENDFOREACH () diff --git a/ports/spdk-dpdk/usage b/ports/spdk-dpdk/usage deleted file mode 100644 index 4fc9ddf257d02f..00000000000000 --- a/ports/spdk-dpdk/usage +++ /dev/null @@ -1 +0,0 @@ -This package is a dependency of SPDK port. It is not intended for direct consumption by end-user. \ No newline at end of file diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json deleted file mode 100644 index 7727ec2ef15708..00000000000000 --- a/ports/spdk-dpdk/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "spdk-dpdk", - "version-date": "2018-11-24", - "port-version": 3, - "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", - "supports": "linux", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/spdk-ipsec/CMakeLists.txt b/ports/spdk-ipsec/CMakeLists.txt deleted file mode 100644 index fb02b164b91d4f..00000000000000 --- a/ports/spdk-ipsec/CMakeLists.txt +++ /dev/null @@ -1,57 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(ipsec C) - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -FIND_PROGRAM(NASM nasm) -IF (NOT NASM) - MESSAGE(FATAL_ERROR "NASM not found") -ENDIF () - -FIND_PROGRAM(MAKE make) -IF (NOT MAKE) - MESSAGE(FATAL_ERROR "MAKE not found") -ENDIF () - -IF (EXEC_ENV STREQUAL "Windows") - FIND_PROGRAM(MAKE nmake) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "nmake not found") - ENDIF () -ENDIF () - -SET(MAKE_FLAGS) - -IF (EXEC_ENV STREQUAL "Windows") - LIST(APPEND MAKE_FLAGS /f win_x64.mak) -ENDIF () - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LIST(APPEND MAKE_FLAGS DEBUG=y) -ENDIF () - -IF (NOT BUILD_SHARED_LIBS) - LIST(APPEND MAKE_FLAGS SHARED=n) -ENDIF () - -MESSAGE(STATUS "${MAKE_FLAGS}") -ADD_CUSTOM_TARGET(ipsec-mb ALL - COMMAND ${MAKE} -j ${MAKE_FLAGS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ -# VERBATIM - ) - -SET(LIB_PATH ${CMAKE_SOURCE_DIR}/) -IF(BUILD_SHARED_LIBS) - STRING(APPEND LIB_PATH libIPSec_MB.so) -ELSE () - STRING(APPEND LIB_PATH libIPSec_MB.a) -ENDIF () -INSTALL(FILES ${LIB_PATH} - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/ports/spdk-ipsec/portfile.cmake b/ports/spdk-ipsec/portfile.cmake deleted file mode 100644 index f82f2621d3708b..00000000000000 --- a/ports/spdk-ipsec/portfile.cmake +++ /dev/null @@ -1,57 +0,0 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME) - SET(EXEC_ENV "Windows") -ELSE () - SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") -ENDIF () - -IF (NOT VCPKG_TARGET_IS_LINUX) - MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports Linux/Windows platforms") - MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows") -ENDIF () - -IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - MESSAGE(FATAL_ERROR "Intel(R) Multi-Buffer Crypto for IPsec Library currently only supports x64 architecture") -ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO spdk/intel-ipsec-mb - REF spdk - SHA512 037fc382d9aa87b6645309f29cb761a584ed855c583638c9e27b5b7200ceb2ae21ad5adcc7c92b2b1d1387186a7fd2b5ae22f337a8f52dea3f6c35d8f90b42bd - HEAD_REF master -) - -VCPKG_FIND_ACQUIRE_PROGRAM(NASM) - -execute_process( - COMMAND "${NASM}" -v - OUTPUT_VARIABLE NASM_OUTPUT - ERROR_VARIABLE NASM_OUTPUT -) -STRING(REGEX REPLACE "NASM version ([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1" NASM_VERSION "${NASM_OUTPUT}") -IF (NASM_VERSION VERSION_LESS 2.13.03) - MESSAGE(FATAL_ERROR "NASM version 2.13.03 (or newer) is required to build this package") -ENDIF () - -GET_FILENAME_COMPONENT(NASM_PATH "${NASM}" DIRECTORY) -vcpkg_add_to_path("${NASM_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" - OPTIONS - "-DSOURCE_PATH=${SOURCE_PATH}" - -DEXEC_ENV=${VCPKG_CMAKE_SYSTEM_NAME} -) - -vcpkg_cmake_install() - -FILE(INSTALL "${SOURCE_PATH}/Release/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/spdk") -if(NOT VCPKG_BUILD_TYPE) - FILE(INSTALL "${SOURCE_PATH}/Debug/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/spdk") -endif() -FILE(INSTALL "${SOURCE_PATH}/Release/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-ipsecConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk-ipsec/spdk-ipsecConfig.cmake b/ports/spdk-ipsec/spdk-ipsecConfig.cmake deleted file mode 100644 index 60777b95904b5c..00000000000000 --- a/ports/spdk-ipsec/spdk-ipsecConfig.cmake +++ /dev/null @@ -1,17 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) - -SET_LIBRARY_TARGET("SPDK" "ipsec" "${ROOT}/debug/lib/spdk/libIPSec_MB.a" "${ROOT}/lib/spdk/libIPSec_MB.a" "${ROOT}/include/spdk-ipsec") diff --git a/ports/spdk-ipsec/usage b/ports/spdk-ipsec/usage deleted file mode 100644 index 4fc9ddf257d02f..00000000000000 --- a/ports/spdk-ipsec/usage +++ /dev/null @@ -1 +0,0 @@ -This package is a dependency of SPDK port. It is not intended for direct consumption by end-user. \ No newline at end of file diff --git a/ports/spdk-ipsec/vcpkg.json b/ports/spdk-ipsec/vcpkg.json deleted file mode 100644 index 5981ad1ad720d4..00000000000000 --- a/ports/spdk-ipsec/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "spdk-ipsec", - "version-date": "2018-07-11", - "port-version": 3, - "description": "SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library", - "supports": "x64 & linux", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/spdk-isal/portfile.cmake b/ports/spdk-isal/portfile.cmake deleted file mode 100644 index 1fae5d89832074..00000000000000 --- a/ports/spdk-isal/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -if(EXISTS "${CURRENT_INSTALLED_DIR}/share/isal/copyright") - message(FATAL_ERROR "'${PORT}' conflicts with 'isal'. Please remove isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO spdk/isa-l - REF spdk - SHA512 1d170ed050fb612816c77b3586f1cdce9129eedc559e3fcefc983ede05b6c8e13a52e400ee6935f5da6ab045a899c97f6ed6be3a79691284e211ea8a6d697f7c - HEAD_REF master -) - -vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_PATH ${NASM} DIRECTORY) -vcpkg_add_to_path("${NASM_PATH}") - -vcpkg_find_acquire_program(YASM) - -vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_install_make() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-isalConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk-isal/spdk-isalConfig.cmake b/ports/spdk-isal/spdk-isalConfig.cmake deleted file mode 100644 index f14282ff1216b6..00000000000000 --- a/ports/spdk-isal/spdk-isalConfig.cmake +++ /dev/null @@ -1,17 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) - -SET_LIBRARY_TARGET("SPDK" "isal" "${ROOT}/debug/lib/spdk/isa-l.a" "${ROOT}/lib/spdk/isa-l.a" "${ROOT}/include/spdk-isal") diff --git a/ports/spdk-isal/usage b/ports/spdk-isal/usage deleted file mode 100644 index 4fc9ddf257d02f..00000000000000 --- a/ports/spdk-isal/usage +++ /dev/null @@ -1 +0,0 @@ -This package is a dependency of SPDK port. It is not intended for direct consumption by end-user. \ No newline at end of file diff --git a/ports/spdk-isal/vcpkg.json b/ports/spdk-isal/vcpkg.json deleted file mode 100644 index b1e6045d4191af..00000000000000 --- a/ports/spdk-isal/vcpkg.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "spdk-isal", - "version-date": "2018-10-06", - "port-version": 3, - "description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library", - "homepage": "https://github.com/spdk/isa-l", - "license": "BSD-3-Clause", - "supports": "!windows & !(osx & x64)" -} diff --git a/ports/spdk/CMakeLists.txt b/ports/spdk/CMakeLists.txt deleted file mode 100644 index dabc61c5a6c29c..00000000000000 --- a/ports/spdk/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(spdk C) - -LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") -LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") - -FIND_PACKAGE(Numa REQUIRED) -FIND_PACKAGE(uuid REQUIRED) -FIND_PACKAGE(ibverbs REQUIRED) -FIND_PACKAGE(RDMA REQUIRED) -FIND_PACKAGE(OpenSSL REQUIRED) -FIND_PACKAGE(Python COMPONENTS Interpreter REQUIRED) - -FIND_PROGRAM(MAKE make) - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -SET(SPDK_CONFIG --disable-tests --with-rdma --without-isal --with-dpdk=${CMAKE_SOURCE_DIR}/../../../spdk-dpdk/src/spdk-18.11-411c51fb97/build) -# No option to define path for isa-l (--with-isal=${CMAKE_SOURCE_DIR}/../../../spdk-isal/src/spdk-d34ebb51cd) -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LIST(APPEND ${SPDK_CONFIG} --enable-debug) -ENDIF () - -SET(DPDK_CONFIG "-fPIC") -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - STRING(APPEND ${DPDK_CONFIG} "-O0 -g") -ENDIF () - -ADD_CUSTOM_TARGET(spdk-configure - COMMAND ./configure ${SPDK_CONFIG} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - VERBATIM - ) - -ADD_CUSTOM_TARGET(spdk ALL - COMMAND ${MAKE} -j DPDK_CFLAGS=${DPDK_CONFIG} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - ) - -ADD_DEPENDENCIES(spdk spdk-configure) - -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/ports/spdk/FindNuma.cmake b/ports/spdk/FindNuma.cmake deleted file mode 100644 index d5bb6143559541..00000000000000 --- a/ports/spdk/FindNuma.cmake +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PATH(NUMA_ROOT_DIR - NAMES include/numa.h - PATHS ENV NUMA_ROOT - DOC "NUMA library root directory") - -FIND_PATH(NUMA_INCLUDE_DIR - NAMES numa.h - HINTS ${NUMA_ROOT_DIR} - PATH_SUFFIXES include - DOC "NUMA include directory") - -FIND_LIBRARY(NUMA_LIBRARY - NAMES numa - HINTS ${NUMA_ROOT_DIR} - DOC "NUMA library file") - -IF (NUMA_LIBRARY) - GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) - MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) -ELSE () - SET(NUMA_FOUND FALSE) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () diff --git a/ports/spdk/FindRDMA.cmake b/ports/spdk/FindRDMA.cmake deleted file mode 100644 index b84ec123ed1357..00000000000000 --- a/ports/spdk/FindRDMA.cmake +++ /dev/null @@ -1,32 +0,0 @@ -FIND_PATH(RDMA_INCLUDE_DIR rdma/rdma_cma.h - /usr/include - /usr/include/linux - /usr/local/include - ) - -FIND_LIBRARY(RDMA_LIBRARY NAMES rdmacm - PATHS - /usr/lib - /usr/local/lib - /usr/lib64 - /usr/local/lib64 - /lib/i386-linux-gnu - /lib/x86_64-linux-gnu - /usr/lib/x86_64-linux-gnu - ) - -INCLUDE(FindPackageHandleStandardArgs) -IF (APPLE) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(RDMA DEFAULT_MSG - RDMA_INCLUDE_DIR) -ELSE () - FIND_PACKAGE_HANDLE_STANDARD_ARGS(RDMA DEFAULT_MSG - RDMA_LIBRARY RDMA_INCLUDE_DIR) -ENDIF () - -MARK_AS_ADVANCED(RDMA_INCLUDE_DIR RDMA_LIBRARY) - -IF (NOT RDMA_LIBRARY) - SET(RDMA_FOUND FALSE) - MESSAGE(FATAL_ERROR "RDMA library not found.\nTry: 'sudo yum install librdmacm-devel librdmacm' (or sudo apt-get install librdmacm-dev librdmacm1)") -ENDIF () diff --git a/ports/spdk/Findibverbs.cmake b/ports/spdk/Findibverbs.cmake deleted file mode 100644 index c018df19dec466..00000000000000 --- a/ports/spdk/Findibverbs.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Find the ibverbs libraries -# -# The following variables are optionally searched for defaults -# IBVERBS_ROOT_DIR: Base directory where all ibverbs components are found -# IBVERBS_INCLUDE_DIR: Directory where ibverbs headers are found -# IBVERBS_LIB_DIR: Directory where ibverbs libraries are found - -# The following are set after configuration is done: -# IBVERBS_FOUND -# IBVERBS_INCLUDE_DIRS -# IBVERBS_LIBRARIES - -FIND_PATH(IBVERBS_INCLUDE_DIRS - NAMES infiniband/verbs.h - HINTS - ${IBVERBS_INCLUDE_DIR} - ${IBVERBS_ROOT_DIR} - ${IBVERBS_ROOT_DIR}/include) - -FIND_LIBRARY(IBVERBS_LIBRARIES - NAMES ibverbs - HINTS - ${IBVERBS_LIB_DIR} - ${IBVERBS_ROOT_DIR} - ${IBVERBS_ROOT_DIR}/lib) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ibverbs DEFAULT_MSG IBVERBS_INCLUDE_DIRS IBVERBS_LIBRARIES) -MARK_AS_ADVANCED(IBVERBS_INCLUDE_DIR IBVERBS_LIBRARIES) - -IF (NOT IBVERBS_LIBRARIES) - SET(IBVERBS_FOUND FALSE) - MESSAGE(FATAL_ERROR "ibverbs library not found.\nTry: 'sudo yum install libibverbs-devel libibverbs' (or sudo apt-get install libibverbs-dev libibverbs1)") -ENDIF () diff --git a/ports/spdk/Finduuid.cmake b/ports/spdk/Finduuid.cmake deleted file mode 100644 index 2bd54af7831efb..00000000000000 --- a/ports/spdk/Finduuid.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FIND_PATH(UUID_INCLUDE_DIR uuid/uuid.h - /usr/include - /usr/include/linux - /usr/local/include - ) - -FIND_LIBRARY(UUID_LIBRARY NAMES uuid - PATHS - /usr/lib - /usr/local/lib - /usr/lib64 - /usr/local/lib64 - /lib/i386-linux-gnu - /lib/x86_64-linux-gnu - /usr/lib/x86_64-linux-gnu - ) - -INCLUDE(FindPackageHandleStandardArgs) -IF (APPLE) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(UUID DEFAULT_MSG - UUID_INCLUDE_DIR) -ELSE () - FIND_PACKAGE_HANDLE_STANDARD_ARGS(UUID DEFAULT_MSG - UUID_LIBRARY UUID_INCLUDE_DIR) -ENDIF () - -MARK_AS_ADVANCED(UUID_INCLUDE_DIR UUID_LIBRARY) - -IF (NOT UUID_LIBRARY) - SET(UUID_FOUND FALSE) - MESSAGE(FATAL_ERROR "UUID library not found.\nTry: 'sudo yum install libuuid uuid-devel' (or sudo apt-get install libuuid1 uuid-dev)") -ENDIF () diff --git a/ports/spdk/portfile.cmake b/ports/spdk/portfile.cmake deleted file mode 100644 index 1a3150b09c43ba..00000000000000 --- a/ports/spdk/portfile.cmake +++ /dev/null @@ -1,37 +0,0 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel spdk currently only supports Linux/BSD platforms") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO spdk/spdk - REF "v${VERSION}" - SHA512 c683136593661fddae6e849a1496e6664ad74e89661f6ec6ad82e653d8fc5bb64496d5d9fb263c1a05c868c1ecd1cc869d48c52895423aebab5df7a161197199 - HEAD_REF master -) - -FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS "$ENV{HOME}/local/include" /opt/local/include /usr/local/include /usr/include -) -IF (NOT NUMA_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () - -vcpkg_cmake_configure( - SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" - OPTIONS - "-DSOURCE_PATH=${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -FILE(INSTALL "${SOURCE_PATH}/Release/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -FILE(INSTALL "${SOURCE_PATH}/Debug/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -FILE(INSTALL "${SOURCE_PATH}/include/spdk" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -FILE(INSTALL "${SOURCE_PATH}/scripts/setup.sh" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts") -FILE(INSTALL "${SOURCE_PATH}/scripts/common.sh" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts") -FILE(INSTALL "${SOURCE_PATH}/include/spdk/pci_ids.h" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/spdk") -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -FILE(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spdk/spdkConfig.cmake b/ports/spdk/spdkConfig.cmake deleted file mode 100644 index 7db413800e919b..00000000000000 --- a/ports/spdk/spdkConfig.cmake +++ /dev/null @@ -1,29 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(SPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(SPDK_ROOT "${SPDK_ROOT}" PATH) -GET_FILENAME_COMPONENT(SPDK_ROOT "${SPDK_ROOT}" PATH) - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${SPDK_ROOT}/debug/lib/) -ELSE () - LINK_DIRECTORIES(${SPDK_ROOT}/lib/) -ENDIF () - -FILE(GLOB SPDK_LIBS ${SPDK_ROOT}/lib/libspdk*.*) -FOREACH (LIB_FILE_NAME ${SPDK_LIBS}) - GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) - GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) - STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") - SET_LIBRARY_TARGET("SPDK" "${LIB_NAME}" "${SPDK_ROOT}/debug/lib/${FULL_LIB_NAME}" "${SPDK_ROOT}/lib/${FULL_LIB_NAME}" "${SPDK_ROOT}/include/spdk") -ENDFOREACH () diff --git a/ports/spdk/usage b/ports/spdk/usage deleted file mode 100644 index f26b41649c99f2..00000000000000 --- a/ports/spdk/usage +++ /dev/null @@ -1,44 +0,0 @@ -The package spdk is compatible with built-in CMake targets: - -Add following to build examples/nvme/perf/perf.c - - FIND_PACKAGE(spdk CONFIG REQUIRED) - FIND_PACKAGE(spdk-dpdk CONFIG REQUIRED) - - ADD_EXECUTABLE(SPDKTest perf.c) - - TARGET_LINK_DIRECTORIES(SPDKTest PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/spdk) - TARGET_LINK_LIBRARIES(SPDKTest PRIVATE - SPDK::spdk_app_rpc - SPDK::spdk_bdev - SPDK::spdk_bdev_null - SPDK::spdk_bdev_rpc - SPDK::spdk_conf - SPDK::spdk_copy - SPDK::spdk_thread - SPDK::spdk_event - SPDK::spdk_event_bdev - SPDK::spdk_event_copy - SPDK::spdk_event_net - SPDK::spdk_net - SPDK::spdk_nvmf - SPDK::spdk_nvme - SPDK::spdk_sock_posix - SPDK::spdk_sock - SPDK::spdk_rpc - SPDK::spdk_jsonrpc - SPDK::spdk_json - SPDK::spdk_trace - SPDK::spdk_util - SPDK::spdk_log - SPDK::spdk_env_dpdk - SPDK::dpdk - numa - rdmacm - uuid - ibverbs - pthread - dl - ) - -Configuration script can be found at: ${CURRENT_PACKAGES_DIR}/share/${PORT}/scripts diff --git a/ports/spdk/vcpkg.json b/ports/spdk/vcpkg.json deleted file mode 100644 index a8001d25684455..00000000000000 --- a/ports/spdk/vcpkg.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "spdk", - "version-string": "24.01", - "description": "Storage Performance Development Kit", - "supports": "linux", - "dependencies": [ - "spdk-dpdk", - "spdk-ipsec", - "spdk-isal", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index 041c309b439adb..9d16e7d28fe30b 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,10 +1,11 @@ { "name": "usd", "version": "24.8", + "port-version": 1, "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, - "supports": "!x86 & !arm & !android", + "supports": "!x86 & !arm & !android & (!windows | !static)", "dependencies": [ "opensubdiv", "tbb", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bed1067d674150..7cafb398b3a4e0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -67,13 +67,6 @@ atliac-minitest:x64-uwp=fail backward-cpp:arm-neon-android=fail backward-cpp:arm64-android=fail backward-cpp:x64-android=fail -bde:arm64-osx =skip # conflict https://github.com/microsoft/vcpkg/pull/32645 -bde:x64-linux =skip -bde:x64-osx =skip -bde:x64-windows-static-md =skip -bde:x64-windows-static =skip -bde:x64-windows =skip -bde:x86-windows =skip benchmark:arm-neon-android=fail bento4:arm-neon-android=fail berkeleydb:arm-neon-android=fail @@ -151,50 +144,13 @@ boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip boringssl:x86-windows=skip brpc:x64-android=fail -buck-yeh-bux:x64-uwp=skip -buck-yeh-bux:x86-windows=skip -buck-yeh-bux-mariadb-client:x86-windows=skip caf:arm-neon-android=fail caf:arm64-uwp=fail caf:arm64-android=fail caf:x64-android=fail caf:x64-uwp=fail -# file conflict with dbg-macro -c-dbg-macro:x86-windows=skip -c-dbg-macro:x64-windows=skip -c-dbg-macro:x64-windows-static=skip -c-dbg-macro:x64-windows-static-md=skip -c-dbg-macro:x64-uwp=skip -c-dbg-macro:arm64-windows=skip -c-dbg-macro:arm64-uwp=skip -c-dbg-macro:x64-osx=skip -c-dbg-macro:arm64-osx=skip -c-dbg-macro:x64-linux=skip - -# Needs work -casadi:arm64-android=skip -casadi:x64-android=skip -casadi:arm-neon-android=skip -casadi:x64-windows-static=skip -casadi:x64-windows-static-md=skip -casadi:x64-uwp=skip -casadi:arm64-uwp=skip - casclib:arm64-uwp=fail casclib:x64-uwp=fail -catch-classic:arm-neon-android=skip -catch-classic:arm64-android=skip -catch-classic:arm64-windows = skip -catch-classic:arm64-uwp = skip -catch-classic:x64-android=skip -catch-classic:x64-linux = skip -catch-classic:x64-osx = skip -catch-classic:arm64-osx = skip -catch-classic:x64-uwp = skip -catch-classic:x64-windows = skip -catch-classic:x64-windows-static = skip -catch-classic:x64-windows-static-md=skip -catch-classic:x86-windows = skip cctag:x64-windows-static-md=fail cello:arm64-uwp=fail cello:x64-uwp=fail @@ -202,25 +158,7 @@ chakracore:x64-linux=skip # chartdir does not offer stable download URLs chartdir:arm-neon-android=fail chartdir:arm64-android=fail -chartdir:arm64-windows=skip -chartdir:arm64-uwp=skip chartdir:x64-android=fail -chartdir:x64-uwp=skip -chartdir:x64-windows-static=skip -chartdir:x86-windows=skip -chartdir:x64-windows=skip -chartdir:x64-windows-static-md=skip -chartdir:x64-osx=skip -# chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI -# broken on Windows because it does not yet support VS2022 -chromium-base:x64-windows=skip -chromium-base:x64-windows-static=skip -chromium-base:x64-windows-static-md=skip -# broken on Linux because -chromium-base:x64-linux=skip -# broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache -# because the first attempt to build it fails, but subsequent attempts succeed -chromium-base:x64-osx=skip clamav:arm64-windows=fail clblas:arm-neon-android=fail clblas:arm64-android=fail @@ -238,12 +176,6 @@ coroutine:arm64-osx=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail cpp-ipc:x64-android=fail -cppmicroservices:arm-neon-android=fail -cppmicroservices:arm64-android=fail -cppmicroservices:arm64-windows=fail -cppmicroservices:arm64-uwp=fail -cppmicroservices:x64-android=fail -cppmicroservices:x64-uwp=fail # Requires full C++20 support, currently absent from CI for these triplets. cppslippi:x64-linux=fail cppcoro:arm-neon-android=fail @@ -460,24 +392,10 @@ ignition-msgs1:x64-android=fail ignition-msgs1:x64-uwp=fail ignition-msgs5:x64-android=fail ignition-msgs5:x64-osx=skip -# Conflicts with libjpeg-turbo, mozjpeg ignition-msgs6:x64-android=fail ignition-tools:arm-neon-android=fail ignition-tools:arm64-android=fail ignition-tools:x64-android=fail -ijg-libjpeg:arm-neon-android=skip -ijg-libjpeg:arm64-uwp = skip -ijg-libjpeg:arm64-android=skip -ijg-libjpeg:arm64-osx = skip -ijg-libjpeg:arm64-windows = skip -ijg-libjpeg:x64-android=skip -ijg-libjpeg:x64-linux = skip -ijg-libjpeg:x64-osx = skip -ijg-libjpeg:x64-uwp = skip -ijg-libjpeg:x64-windows = skip -ijg-libjpeg:x64-windows-static = skip -ijg-libjpeg:x64-windows-static-md=fail -ijg-libjpeg:x86-windows = skip intelrdfpmathlib:arm-neon-android=fail intelrdfpmathlib:arm64-android=fail intelrdfpmathlib:x64-android=fail @@ -585,8 +503,6 @@ libmariadb:x64-windows-static-md=skip libmaxminddb:arm64-android=fail libmaxminddb:arm-neon-android=fail libmaxminddb:x64-android=fail -# libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) -libmesh:x64-linux=skip libmikmod:arm-neon-android=fail libmikmod:arm64-android=fail libmikmod:x64-android=fail @@ -599,28 +515,6 @@ libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail libp7client:x64-android=fail -libpng-apng:arm64-windows = skip -libpng-apng:arm64-uwp = skip -libpng-apng:x64-linux = skip -libpng-apng:x64-osx = skip -libpng-apng:x64-uwp = skip -libpng-apng:x64-windows = skip -libpng-apng:x64-windows-static = skip -libpng-apng:x64-windows-static-md=skip -libpng-apng:x86-windows = skip -# The developer of libqcow does not offer stable release archives -libqcow:arm-neon-android=skip -libqcow:arm64-uwp=skip -libqcow:arm64-android=skip -libqcow:x64-android=skip -libqcow:x64-uwp=skip -libqcow:x64-windows-static=skip -libqcow:x64-windows-static-md=skip -libqcow:x64-osx=skip -libqcow:x64-windows=skip -libqcow:x64-linux=skip -libqcow:x86-windows=skip -libqcow:arm64-windows=skip # 32-bit needs android-24 libraw:arm-neon-android=fail # Conflicts with openssl @@ -651,22 +545,9 @@ libusb-win32:x64-uwp=fail libvhdi:arm-neon-android=fail libvhdi:arm64-android=fail libvhdi:x64-android=fail -#Skip detection to avoid upstream remove older releases -libvmdk:arm-neon-android =skip # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253 -libvmdk:arm64-android =skip -libvmdk:arm64-osx =skip -libvmdk:arm64-windows =skip -libvmdk:x64-android =skip -libvmdk:x64-linux =skip -libvmdk:x64-osx =skip -libvmdk:x64-windows-static-md =skip -libvmdk:x64-windows-static =skip -libvmdk:x64-windows =skip -libvmdk:x86-windows =skip libwandio:arm-neon-android=fail libwandio:arm64-android=fail libwandio:x64-android=fail -libxaw:x64-windows-static=skip # clang-cl ICEd libxt:arm64-windows=fail libzen:arm-neon-android=fail @@ -696,14 +577,6 @@ magma:x64-linux=fail mchehab-zbar:arm-neon-android=fail mchehab-zbar:arm64-android=fail mchehab-zbar:x64-android=fail -mecab:arm64-windows = skip -mecab:arm64-uwp = skip -mecab:x64-linux = skip -mecab:x64-uwp = skip -mecab:x64-windows = skip -mecab:x64-windows-static = skip -mecab:x64-windows-static-md=skip -mecab:x86-windows = skip memorymodule:arm-neon-android=fail memorymodule:arm64-android=fail memorymodule:x64-android=fail @@ -737,20 +610,6 @@ moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail -# Conflicts with libjpeg-turbo -mozjpeg:arm-neon-android=fail -mozjpeg:arm64-android=fail -mozjpeg:x64-android=fail -mozjpeg:arm64-windows = skip -mozjpeg:arm64-uwp = skip -mozjpeg:x64-linux = skip -mozjpeg:x64-osx = skip -mozjpeg:arm64-osx = skip -mozjpeg:x64-uwp = skip -mozjpeg:x64-windows = skip -mozjpeg:x64-windows-static = skip -mozjpeg:x64-windows-static-md=skip -mozjpeg:x86-windows = skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 mpir:x86-windows=skip @@ -771,7 +630,7 @@ nana:x64-android=fail nana:x64-linux=fail nana:x64-osx=fail nana:arm64-osx=fail -nanodbc:x64-linux=skip +nanodbc:x64-linux=fail netcdf-c:arm-neon-android=fail netcdf-c:arm64-android=fail netcdf-c:x64-android=fail @@ -836,20 +695,6 @@ openscap:x64-windows-static=fail opensubdiv:x64-android=fail openturns:arm64-windows=fail openvr:x64-windows-static=fail -# Conflicts with optional-lite, by the same author -optional-bare:arm-neon-android=skip -optional-bare:arm64-android=skip -optional-bare:arm64-osx=skip -optional-bare:arm64-uwp=skip -optional-bare:arm64-windows=skip -optional-bare:x64-android=skip -optional-bare:x64-linux=skip -optional-bare:x64-osx=skip -optional-bare:x64-uwp=skip -optional-bare:x64-windows-static-md=skip -optional-bare:x64-windows-static=skip -optional-bare:x64-windows=skip -optional-bare:x86-windows=skip orc:arm-neon-android=fail orc:arm64-android=fail orc:x64-android=fail @@ -899,15 +744,6 @@ qt5-base:arm-neon-android=fail qt5-base:arm64-android=fail qt5-base:arm64-windows=fail qt5-base:x64-android=fail -# Skip deprecated Qt module -# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) -qt5-canvas3d:x64-linux=skip -qt5-canvas3d:x64-osx=skip -qt5-canvas3d:arm64-osx=skip -qt5-canvas3d:x64-windows=skip -qt5-canvas3d:x64-windows-static=skip -qt5-canvas3d:x64-windows-static-md=skip -qt5-canvas3d:x86-windows=skip # Missing system libraries qtwayland:x64-osx=skip qtwayland:arm64-osx=skip @@ -920,19 +756,6 @@ qwt-qt6:x64-osx=fail rabit:arm-neon-android=fail rabit:arm64-android=fail rabit:x64-android=fail -range-v3-vs2015:arm-neon-android=skip -range-v3-vs2015:arm64-android=skip -range-v3-vs2015:arm64-windows = skip -range-v3-vs2015:arm64-uwp = skip -range-v3-vs2015:x64-android=skip -range-v3-vs2015:x64-linux = skip -range-v3-vs2015:x64-osx = skip -range-v3-vs2015:arm64-osx = skip -range-v3-vs2015:x64-uwp = skip -range-v3-vs2015:x64-windows = skip -range-v3-vs2015:x64-windows-static = skip -range-v3-vs2015:x64-windows-static-md=skip -range-v3-vs2015:x86-windows = skip rapidstring:arm64-windows=fail rapidstring:arm64-uwp=fail rapidstring:x64-linux=fail @@ -944,16 +767,6 @@ rapidstring:x86-windows=fail # ALooper_pollAll no longer available raylib:arm64-android=fail raylib:x64-android=fail -# file conflicts with rbdl -rbdl-orb:x86-windows=skip -rbdl-orb:x64-windows=skip -rbdl-orb:x64-windows-static=skip -rbdl-orb:x64-windows-static-md=skip -rbdl-orb:x64-uwp=skip -rbdl-orb:arm64-uwp=skip -rbdl-orb:arm64-windows=skip -rbdl-orb:x64-linux=skip -rbdl-orb:x64-osx=skip rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail @@ -974,19 +787,6 @@ salome-medcoupling:x64-linux=fail scintilla:arm-neon-android=fail scintilla:arm64-android=fail scintilla:x64-android=fail -sciter:arm-neon-android=fail -sciter:arm64-android=fail -sciter:arm64-windows=skip -sciter:arm64-uwp=skip -sciter:x64-android=fail -sciter:x64-linux=skip -sciter:x64-osx=skip -sciter:arm64-osx=skip -sciter:x64-uwp=skip -sciter:x64-windows=skip -sciter:x64-windows-static=skip -sciter:x64-windows-static-md=skip -sciter:x86-windows=skip sdl1:arm-neon-android=fail sdl1:arm64-android=fail sdl1:x64-android=fail @@ -999,30 +799,6 @@ sfml:arm-neon-android=fail sfml:arm64-android=fail sfml:x64-android=fail shader-slang:x64-windows-static=fail -shogun:arm64-windows = skip -shogun:arm64-uwp = skip -shogun:x64-osx = skip -shogun:arm64-osx = skip -shogun:x64-uwp = skip -shogun:x64-windows = skip -shogun:x64-windows-static = skip -shogun:x64-windows-static-md=skip -shogun:x86-windows = skip -shogun:arm64-android = skip -# "Obsolete" and conflicts with microsoft-signalr -signalrclient:arm-neon-android=skip -signalrclient:arm64-android=skip -signalrclient:arm64-osx=skip -signalrclient:arm64-uwp=skip -signalrclient:arm64-windows=skip -signalrclient:x64-android=skip -signalrclient:x64-linux=skip -signalrclient:x64-osx=skip -signalrclient:x64-uwp=skip -signalrclient:x64-windows=skip -signalrclient:x64-windows-static-md=skip -signalrclient:x64-windows-static=skip -signalrclient:x86-windows=skip simbody:arm64-windows=fail simd:arm-neon-android=fail simd:arm64-android=fail @@ -1054,12 +830,6 @@ spaceland:x64-uwp=fail spatialite-tools:arm-neon-android=fail spatialite-tools:arm64-android=fail spatialite-tools:x64-android=fail -spdk-isal:arm-neon-android=fail -spdk-isal:arm64-android=fail -spdk-isal:x64-android=fail -spdk:x64-linux=fail -# Conflict with isal, and "internal" dep of spdk:x64-linux=fail -spdk-isal:x64-linux=skip spscqueue:arm-neon-android=fail spscqueue:arm64-android=fail spscqueue:x64-android=fail @@ -1067,11 +837,6 @@ spscqueue:x64-android=fail stormlib:arm64-uwp=fail stormlib:x64-uwp=fail stxxl:arm-neon-android=fail -# upstream issue https://github.com/stxxl/stxxl/issues/99 -stxxl:x86-windows=skip -stxxl:x64-windows=skip -stxxl:x64-windows-static=skip -stxxl:x64-windows-static-md=skip systemc:arm64-windows=fail systemc:arm64-uwp=fail systemc:x64-uwp=fail @@ -1109,8 +874,6 @@ tvision:arm-neon-android=fail tvision:arm64-android=fail tvision:x64-android=fail unicorn:x64-windows-static-md=fail -# Proper support for a true static usd build is left as a future port improvement. It probably require fiddling with its monolithic mode. -usd:x64-windows-static=skip # needs android-24 usrsctp:arm-neon-android=fail usrsctp:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index a838774201f2f2..22ff8d5d0a6621 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1460,10 +1460,6 @@ "baseline": "1.34.2", "port-version": 0 }, - "c-dbg-macro": { - "baseline": "2020-02-29", - "port-version": 0 - }, "c4core": { "baseline": "0.2.1", "port-version": 0 @@ -1520,10 +1516,6 @@ "baseline": "1.0.0", "port-version": 6 }, - "casadi": { - "baseline": "3.6.7", - "port-version": 0 - }, "casclib": { "baseline": "2024-06-05", "port-version": 0 @@ -1532,10 +1524,6 @@ "baseline": "alias", "port-version": 1 }, - "catch-classic": { - "baseline": "1.12.2", - "port-version": 2 - }, "catch2": { "baseline": "3.7.1", "port-version": 0 @@ -1644,10 +1632,6 @@ "baseline": "1.5.1", "port-version": 0 }, - "chromium-base": { - "baseline": "86.0.4199.1", - "port-version": 6 - }, "chronoengine": { "baseline": "8.0.0", "port-version": 0 @@ -1980,10 +1964,6 @@ "baseline": "0.4.0", "port-version": 0 }, - "cppmicroservices": { - "baseline": "3.7.6", - "port-version": 1 - }, "cppp-reiconv": { "baseline": "2.1.0", "port-version": 0 @@ -3680,10 +3660,6 @@ "baseline": "1.9.5", "port-version": 0 }, - "ijg-libjpeg": { - "baseline": "9e", - "port-version": 2 - }, "im3d": { "baseline": "2022-10-11", "port-version": 0 @@ -4796,10 +4772,6 @@ "baseline": "24.11", "port-version": 0 }, - "libmesh": { - "baseline": "1.5.0", - "port-version": 6 - }, "libmicrodns": { "baseline": "0.2.0", "port-version": 2 @@ -5004,10 +4976,6 @@ "baseline": "0.21.5", "port-version": 1 }, - "libqcow": { - "baseline": "20221124", - "port-version": 1 - }, "libqglviewer": { "baseline": "2.9.1", "port-version": 3 @@ -5324,10 +5292,6 @@ "baseline": "3.0.0", "port-version": 0 }, - "libvmdk": { - "baseline": "20221124", - "port-version": 1 - }, "libvorbis": { "baseline": "1.3.7", "port-version": 3 @@ -5362,7 +5326,7 @@ }, "libxaw": { "baseline": "1.0.13", - "port-version": 0 + "port-version": 1 }, "libxcomposite": { "baseline": "0.4.5", @@ -5872,10 +5836,6 @@ "baseline": "0.6.0", "port-version": 0 }, - "mecab": { - "baseline": "2019-09-25", - "port-version": 6 - }, "memorymodule": { "baseline": "2019-12-31", "port-version": 3 @@ -6064,10 +6024,6 @@ "baseline": "2.0.18", "port-version": 0 }, - "mozjpeg": { - "baseline": "4.1.5", - "port-version": 1 - }, "mp-units": { "baseline": "2.4.0", "port-version": 1 @@ -6792,10 +6748,6 @@ "baseline": "0.3.0", "port-version": 0 }, - "optional-bare": { - "baseline": "1.1.0", - "port-version": 3 - }, "optional-lite": { "baseline": "3.6.0", "port-version": 0 @@ -7384,10 +7336,6 @@ "baseline": "5.15.15", "port-version": 1 }, - "qt5-canvas3d": { - "baseline": "0", - "port-version": 3 - }, "qt5-charts": { "baseline": "5.15.15", "port-version": 0 @@ -7788,10 +7736,6 @@ "baseline": "0.12.0", "port-version": 4 }, - "range-v3-vs2015": { - "baseline": "20151130-vcpkg5", - "port-version": 3 - }, "rapidcheck": { "baseline": "2023-12-14", "port-version": 0 @@ -7836,10 +7780,6 @@ "baseline": "3.3.0", "port-version": 7 }, - "rbdl-orb": { - "baseline": "3.2.0", - "port-version": 2 - }, "re2": { "baseline": "2024-07-02", "port-version": 0 @@ -8148,10 +8088,6 @@ "baseline": "0.3.1", "port-version": 1 }, - "sciter": { - "baseline": "0", - "port-version": 1 - }, "sciter-js": { "baseline": "5.0.3.14", "port-version": 0 @@ -8348,10 +8284,6 @@ "baseline": "1.0", "port-version": 7 }, - "shogun": { - "baseline": "2023-12-19", - "port-version": 1 - }, "si": { "baseline": "2.5.1", "port-version": 0 @@ -8360,10 +8292,6 @@ "baseline": "0.2.0", "port-version": 0 }, - "signalrclient": { - "baseline": "1.0.0-beta1-9", - "port-version": 6 - }, "sigslot": { "baseline": "1.0.0", "port-version": 5 @@ -8560,22 +8488,6 @@ "baseline": "5.1.0-a", "port-version": 0 }, - "spdk": { - "baseline": "24.01", - "port-version": 0 - }, - "spdk-dpdk": { - "baseline": "2018-11-24", - "port-version": 3 - }, - "spdk-ipsec": { - "baseline": "2018-07-11", - "port-version": 3 - }, - "spdk-isal": { - "baseline": "2018-10-06", - "port-version": 3 - }, "spdlog": { "baseline": "1.15.0", "port-version": 0 @@ -9250,7 +9162,7 @@ }, "usd": { "baseline": "24.8", - "port-version": 0 + "port-version": 1 }, "usearch": { "baseline": "2.3.2", diff --git a/versions/l-/libxaw.json b/versions/l-/libxaw.json index 79816acce2bf98..72c7c87da38366 100644 --- a/versions/l-/libxaw.json +++ b/versions/l-/libxaw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dfc51816d10bc07c30a8cb9f03834336037fb98", + "version": "1.0.13", + "port-version": 1 + }, { "git-tree": "71b085f0a3771532f541cab3ca0d8e4222526949", "version": "1.0.13", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 257030cff1a1a7..a25936e5ef4eca 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8702676deb57ceca335f6f5436325a977c4e4669", + "version": "24.8", + "port-version": 1 + }, { "git-tree": "ead0e855944ba468f8f3e4cc4f1875ae14e2bbc1", "version": "24.8", From f400ef746e89c66e360e5e7e35735c56aa7458c5 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 18 Nov 2024 21:11:30 -0800 Subject: [PATCH 02/58] Restore buck-yeh-bux-mariadb-client:x86-windows. Add ntf-core, previously hidden by skipped bde. --- scripts/ci.baseline.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7cafb398b3a4e0..70c381807cc359 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -144,6 +144,7 @@ boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip boringssl:x86-windows=skip brpc:x64-android=fail +buck-yeh-bux-mariadb-client:x86-windows=fail caf:arm-neon-android=fail caf:arm64-uwp=fail caf:arm64-android=fail @@ -640,6 +641,13 @@ ngspice:x64-windows-static=fail nrf-ble-driver:arm-neon-android=fail nrf-ble-driver:arm64-android=fail nrf-ble-driver:x64-android=fail +ntf-core:arm64-osx=fail +ntf-core:x64-linux=fail +ntf-core:x64-osx=fail +ntf-core:x64-windows-static-md=fail +ntf-core:x64-windows-static=fail +ntf-core:x64-windows=fail +ntf-core:x86-windows=fail nvtt:x64-android=fail oatpp-libressl:x64-android=fail octave:x86-windows=fail From 678e0a8ff2449acc742087c229c5e43df278cd4b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 11 Aug 2025 18:22:35 -0700 Subject: [PATCH 03/58] Drop -r28c suffix now that that's the default. --- scripts/azure-pipelines/android/azure-pipelines.yml | 2 +- scripts/azure-pipelines/create-docker-images.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index 46d8db2a9a2ae2..e4f8d6e05d00ef 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -28,7 +28,7 @@ jobs: - name: ANDROID_NDK_HOME value: /android-ndk-r28c - name: ANDROID_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-android-r28c:2025-08-01' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-08-01' - name: LINUX_DOCKER_IMAGE value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-07-10' steps: diff --git a/scripts/azure-pipelines/create-docker-images.ps1 b/scripts/azure-pipelines/create-docker-images.ps1 index a852009d630732..26c3300abd84d0 100644 --- a/scripts/azure-pipelines/create-docker-images.ps1 +++ b/scripts/azure-pipelines/create-docker-images.ps1 @@ -56,7 +56,7 @@ Connect-AzContainerRegistry -Name $registry.Name if ($BuildAndroid) { Build-Image -AcrRegistry $registry ` -Location "$PSScriptRoot/android" ` - -ImageName "vcpkg-android-r28c" ` + -ImageName "vcpkg-android" ` -Date $Date } From 204da2f752f5433c56b753c97e440a8fc8c5f7ee Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 11 Aug 2025 18:22:46 -0700 Subject: [PATCH 04/58] Update Jammy base. --- scripts/azure-pipelines/linux/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/linux/Dockerfile b/scripts/azure-pipelines/linux/Dockerfile index 59276b61c52094..686a38c28595cc 100644 --- a/scripts/azure-pipelines/linux/Dockerfile +++ b/scripts/azure-pipelines/linux/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:jammy-20250619 +FROM ubuntu:jammy-20250714 ADD provision-image.sh /provision-image.sh RUN apt-get update && \ apt-get install --no-install-recommends -y curl gnupg ca-certificates From 7ed2a33ce71739fa2d935a6e195c4964f815c3aa Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 18:48:00 -0700 Subject: [PATCH 05/58] Update CUDA to 12.9 on Linux and make sure we are installing all libraries. In particular, nvtx was missing. --- .../azure-pipelines/linux/provision-image.sh | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 9d8bb89d3f7dd5..7d84b5d575141e 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -145,9 +145,23 @@ APT_PACKAGES="$APT_PACKAGES wayland-protocols" APT_PACKAGES="$APT_PACKAGES libbluetooth-dev" ## CUDA -APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-8 cuda-libraries-dev-12-8 cuda-driver-dev-12-8 \ - cuda-cudart-dev-12-8 libcublas-12-8 libcurand-dev-12-8 cuda-nvml-dev-12-8 libcudnn9-dev-cuda-12 \ - libnccl2 libnccl-dev" +# The intent is to install everything that does not require an actual GPU, driver, or GUI. +# Intentionally omitted: cuda-demo-suite-12-9 cuda-documentation-12-9 cuda-driver-* +# cuda-gdb-12-9 cuda-gdb-src-12-9 cuda-nsight-* cuda-nvdisasm +# cuda-nvprof cuda-nvprune cuda-profiler-api* cuda-sandbox-* +# cuda-visual-tools-12-9 nvidia-gds-12-9 cuda-nvvp-12-9 +# cuda-toolkit-12-9 cuda-tools-12-9 cuda-command-line-tools-12-9 +# cuda-runtime-12-9 +# All libraries for which there is a -dev suffix included here +# cudnn9-jit-cuda-12-9 : Depends: libcudnn9-jit-dev-cuda-12 (= 9.12.0.46-1) but it is not installable +APT_PACKAGES="$APT_PACKAGES cuda-cccl-12-9 cuda-compat-12-9 cuda-compiler-12-9 cuda-crt-12-9 \ + cuda-cudart-dev-12-9 cuda-cuobjdump-12-9 cuda-cupti-dev-12-9 cuda-cuxxfilt-12-9 \ + cuda-driver-dev-12-9 cuda-libraries-dev-12-9 cuda-minimal-build-12-9 cuda-nvcc-12-9 \ + cuda-nvml-dev-12-9 cuda-nvrtc-dev-12-9 cuda-nvtx-12-9 cuda-nvvm-12-9 cuda-opencl-dev-12-9 \ + cuda-sanitizer-12-9 cuda-toolkit-12-9-config-common cudnn9-cuda-12-9 gds-tools-12-9 \ + libcublas-12-9 libcudnn9-dev-cuda-12 libcufft-dev-12-9 libcurand-dev-12-9 libcusolver-dev-12-9 \ + libcusparse-dev-12-9 libnccl-dev libnpp-dev-12-9 libnvfatbin-dev-12-9 libnvjitlink-dev-12-9 \ + libnvjpeg-dev-12-9" ## PowerShell + Azure APT_PACKAGES="$APT_PACKAGES powershell azcopy azure-cli" From 9b6b66d69dc47176d97679c4ab942bd93d1cc755 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 18:48:36 -0700 Subject: [PATCH 06/58] Get rid of separate local image tag name, add option to not throw away credentials. --- scripts/azure-pipelines/create-docker-images.ps1 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/azure-pipelines/create-docker-images.ps1 b/scripts/azure-pipelines/create-docker-images.ps1 index 26c3300abd84d0..9f465bfad1d893 100644 --- a/scripts/azure-pipelines/create-docker-images.ps1 +++ b/scripts/azure-pipelines/create-docker-images.ps1 @@ -3,7 +3,8 @@ [CmdletBinding()] param( [switch]$OnlyAndroid, - [switch]$OnlyLinux + [switch]$OnlyLinux, + [switch]$NoLogout ) if ($OnlyAndroid -and $OnlyLinux) { @@ -34,10 +35,8 @@ function Build-Image { Push-Location $Location try { - docker build . -t $ImageName --build-arg BUILD_DATE=$Date $remote = [string]::Format('{0}/{1}:{2}', $AcrRegistry.LoginServer, $ImageName, $Date) - docker image tag $ImageName $remote - + docker build . -t $remote --build-arg BUILD_DATE=$Date docker push $remote Write-Host "Remote: $remote" } finally { @@ -67,4 +66,6 @@ if ($BuildLinux) { -Date $Date } -docker logout $registry.LoginServer +if (-not $NoLogout) { + docker logout $registry.LoginServer +} From 51632e595161401e8311338c9482794ca0bef2c1 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 18:51:10 -0700 Subject: [PATCH 07/58] Update azcopy to 10.30.0. --- scripts/azure-pipelines/windows/deploy-azcopy.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-azcopy.ps1 b/scripts/azure-pipelines/windows/deploy-azcopy.ps1 index e134caa7fe4f78..0d19fa410ac1d3 100644 --- a/scripts/azure-pipelines/windows/deploy-azcopy.ps1 +++ b/scripts/azure-pipelines/windows/deploy-azcopy.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$AzCopyUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.29.1/azcopy_windows_amd64_10.29.1.zip' + $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.0/azcopy_windows_amd64_10.30.0.zip' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.29.1.zip?$SasToken" + $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.30.0.zip?$SasToken" } mkdir -Force "C:\AzCopy10" From fc9b35f7ab982950cd068593ea568afda80f3f4a Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 18:51:20 -0700 Subject: [PATCH 08/58] Update Azure CLI to 2.76.0. --- scripts/azure-pipelines/windows/deploy-azure-cli.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 index 81903cfccc1503..c88831be737a11 100644 --- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 +++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$AzCliUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.75.0-x64.msi' + $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.75.0-x64.msi?$SasToken" + $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.76.0-x64.msi?$SasToken" } DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart') From e90614ebb2699f60931521628db964b1b554ee7a Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 18:52:42 -0700 Subject: [PATCH 09/58] Update Visual Studio to 17.14.11. --- scripts/azure-pipelines/windows/deploy-visual-studio.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 8b3ae223ea9af9..372da9d8b1c1de 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { } # See https://learn.microsoft.com/visualstudio/releases/2022/release-history -# 17.14.8 -$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/f55fba7b-3f02-49b7-9aca-a075049a807d/9aca214a7c2982c847582af89b9168b876cc5d4041ae64b6cb677f3ff7236388/vs_Enterprise.exe' +# 17.14.11 +$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/92d8ef2d-f13b-4768-84e8-c9fd160e0180/c6e38e6ef38792fd533594e7db388432682d6d066ce41e73d782435b19252d84/vs_Enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', From 7e4aefbdddc2f2fe65dec0b2920f2f2a232a9533 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 19:34:14 -0700 Subject: [PATCH 10/58] Update docker containers. --- scripts/azure-pipelines/android/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index e4f8d6e05d00ef..bba5e3a7acbe54 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -28,9 +28,9 @@ jobs: - name: ANDROID_NDK_HOME value: /android-ndk-r28c - name: ANDROID_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-08-01' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-08-12' - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-07-10' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index d7cedc4758f8d0..8a0e69c60ab032 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-07-10' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | From ea928611902fe02f4314006132f1ecdd41293a35 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 9 Jul 2025 19:51:04 -0700 Subject: [PATCH 11/58] Add more macos helpers --- .../osx/fire-register-guest.ps1 | 2 +- .../osx/start-parallels-vm.zsh | 47 +++++++++++++++++++ .../osx/stop-delete-all-vms.zsh | 17 +++++++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 scripts/azure-pipelines/osx/start-parallels-vm.zsh create mode 100644 scripts/azure-pipelines/osx/stop-delete-all-vms.zsh diff --git a/scripts/azure-pipelines/osx/fire-register-guest.ps1 b/scripts/azure-pipelines/osx/fire-register-guest.ps1 index 42dcf333d85ea6..3b2af668ffb872 100644 --- a/scripts/azure-pipelines/osx/fire-register-guest.ps1 +++ b/scripts/azure-pipelines/osx/fire-register-guest.ps1 @@ -14,7 +14,7 @@ $script = @" rm .ssh/known_hosts chmod +x /Users/vcpkg/register-guest.sh /Users/vcpkg/register-guest.sh $Pat -rm /Users/vcpkg/register-guest.sh "@ $script | ssh $sshCookie +ssh $sshCookie rm /Users/vcpkg/register-guest.sh diff --git a/scripts/azure-pipelines/osx/start-parallels-vm.zsh b/scripts/azure-pipelines/osx/start-parallels-vm.zsh new file mode 100644 index 00000000000000..5e60b2a13abf17 --- /dev/null +++ b/scripts/azure-pipelines/osx/start-parallels-vm.zsh @@ -0,0 +1,47 @@ +#!/usr/bin/env zsh + +set -e # Exit on any error + +# Find the .pvmp file +PVMP_FILE=$(find ~/Parallels -name "*.pvmp" -type f | head -1) +if [[ -z "$PVMP_FILE" ]]; then + echo "Error: No .pvmp file found in ~/Parallels" + exit 1 +fi + +echo "Found PVMP file: $PVMP_FILE" + +# Attach the PVMP file +echo "Registering PVMP file..." +/usr/local/bin/prlctl register "$PVMP_FILE" + +VM_NAME=$(/usr/local/bin/prlctl list --all --output name --no-header | head -1) + +if [[ -z "$VM_NAME" ]]; then + echo "Error: Failed to register PVMP file or extract VM ID" + exit 1 +fi + +echo "VM registered with ID: $VM_NAME" + +# Unpack the VM +echo "Unpacking VM..." +/usr/local/bin/prlctl unpack "$VM_NAME" + +# Configure startup and shutdown settings +echo "Configuring VM startup and shutdown settings..." +/usr/local/bin/prlctl set "$VM_NAME" --startup-view headless +/usr/local/bin/prlctl set "$VM_NAME" --autostart start-host +/usr/local/bin/prlctl set "$VM_NAME" --autostop shutdown +/usr/local/bin/prlctl set "$VM_NAME" --on-shutdown close +/usr/local/bin/prlctl set "$VM_NAME" --on-window-close keep-running + +echo "VM startup and shutdown settings configured successfully" + +# Display current VM configuration for verification +echo "Current VM configuration:" +/usr/local/bin/prlctl list "$VM_NAME" --info | grep -E "(Autostart|Autostop|Startup view|On shutdown|On window close)" + +echo "Parallels VM setup completed successfully!" +echo "VM ID: $VM_NAME" + diff --git a/scripts/azure-pipelines/osx/stop-delete-all-vms.zsh b/scripts/azure-pipelines/osx/stop-delete-all-vms.zsh new file mode 100644 index 00000000000000..1eb6fef238e7cd --- /dev/null +++ b/scripts/azure-pipelines/osx/stop-delete-all-vms.zsh @@ -0,0 +1,17 @@ +#!/usr/bin/env zsh + +vm_name=$(/usr/local/bin/prlctl list --all --output name --no-header 2>/dev/null | head -1) +if [[ -z "$vm_name" ]]; then + echo "No VM found on the system." + exit 0 +fi + +echo "Found VM: $vm_name" + +# Stop the VM if it's running +echo "Stopping VM..." +/usr/local/bin/prlctl stop "$vm_name" --kill 2>/dev/null || echo "VM was already stopped or failed to stop" + +# Delete the VM +echo "Deleting VM..." +/usr/local/bin/prlctl delete "$vm_name" \ No newline at end of file From ccf57e14f235dae1a54156dd995ff35c7ecfddea Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 19:56:45 -0700 Subject: [PATCH 12/58] Update macOS to 15.6, XCode CLT to 16.4, vsts-agent to 4.259.0, disable Spotlight. --- scripts/azure-pipelines/osx/README.md | 31 ++++++++++++++---------- scripts/azure-pipelines/osx/setup-box.sh | 5 ++-- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 0905368fa69cad..f1bba0dbe5a820 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -23,9 +23,9 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Update or install parallels - [ ] Download the macOS installer from the app store. See https://support.apple.com/en-us/102662 Note: This portion of the instructions is that which breaks most often depending on what Parallels and macOS are doing. - You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.2` and point Parallels + You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6` and point Parallels at that resulting installer in 'Applications' instead. -- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx--amd64", for example "vcpkg-osx-2025-01-24-amd64". +- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx--amd64", for example "vcpkg-osx-2025-08-12-amd64". - [ ] When creating the VM, customize the hardware to the following: * 12 processors * 24000 MB of memory @@ -34,6 +34,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi * Disable microphone * Do not share mac camera - [ ] Install MacOS like you would on real hardware. + * Set up as new * Apple ID: 'Set Up Later' / Skip * Account name: vcpkg * A very similar password :) @@ -42,9 +43,10 @@ This is the checklist for what the vcpkg team does when updating the macOS machi * Don't enable Ask Siri - [ ] Install Parallels Tools - [ ] Restart the VM -- [ ] Change the desktop background to a solid color +- [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) ) +- [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all - [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/4.248.0/vsts-agent-osx-x64-4.248.0.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz - [ ] In the guest, set the vcpkg user to be able to use sudo without a password: ```sh printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' @@ -74,8 +76,8 @@ This is the checklist for what the vcpkg team does when updating the macOS machi ```sh ssh vcpkg@HOSTMACHINE brew install azcopy - azcopy copy ~/Parallels/vcpkg-osx-2025-01-24-amd64.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?" - azcopy copy ~/Parallels/vcpkg-osx-2025-01-24-amd64.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?" + azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?" + azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?" exit ``` - [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD` based on the current date. Grant microsoft.vcpkg.ci and microsoft.vcpkg.pr access. @@ -96,22 +98,25 @@ This is the checklist for what the vcpkg team does when updating the macOS machi rm macosvm-0.2-1-arm64-darwin21.tar.gz exit ``` -- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2024FallFCS/fullrestores/072-44245/E811A1B0-28A9-4FCD-AE32-322E796F0EB8/UniversalMac_15.2_24C101_Restore.ipsw -- [ ] Determine the VM name using the form "vcpkg-osx--arm64", for example "vcpkg-osx-2025-01-24-arm64". -- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-01-24-arm64 and UniversalMac_15.2_24C101_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI: +- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/082-08674/51294E4D-A273-44BE-A280-A69FC347FB87/UniversalMac_15.6_24G84_Restore.ipsw +- [ ] Determine the VM name using the form "vcpkg-osx--arm64", for example "vcpkg-osx-2025-08-12-arm64". +- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-08-12-arm64 and UniversalMac_15.6_24G84_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI: ```sh - mkdir -p ~/Parallels/vcpkg-osx-2025-01-24-arm64 - cd ~/Parallels/vcpkg-osx-2025-01-24-arm64 - ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.2_24C101_Restore.ipsw ./vm.json + mkdir -p ~/Parallels/vcpkg-osx-2025-08-12-arm64 + cd ~/Parallels/vcpkg-osx-2025-08-12-arm64 + ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6_24G84_Restore.ipsw ./vm.json ~/macosvm -g ./vm.json ``` - [ ] Follow prompts as you would on real hardware. + * Set up as new. * Apple ID: 'Set Up Later' / Skip * Account name: vcpkg * A very similar password * No location services * Yes send crash reports + * Only download updates automatically - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) ) +- [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all - [ ] Enable remote login in the VM: Settings -> General -> Sharing -> Remote Login - [ ] Set the vcpkg user to be able to use sudo without a password. For example from a dev workstation: ```sh @@ -122,7 +127,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi sudo chmod 0440 '/etc/sudoers.d/vcpkg' exit ``` -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/4.248.0/vsts-agent-osx-arm64-4.248.0.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz - [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation: ```sh scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg diff --git a/scripts/azure-pipelines/osx/setup-box.sh b/scripts/azure-pipelines/osx/setup-box.sh index f80add86eb0ffe..ecf750182214a4 100644 --- a/scripts/azure-pipelines/osx/setup-box.sh +++ b/scripts/azure-pipelines/osx/setup-box.sh @@ -2,6 +2,7 @@ # The next 2 lines are a workaround for an XCode Command Line Tools bug: # https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues +sudo mdutil -ad sudo mkdir -p /Library/Developer/CommandLineTools sudo touch /Library/Developer/CommandLineTools/.beta hdiutil attach clt.dmg -mountpoint /Volumes/setup-installer @@ -19,9 +20,9 @@ fi brew install autoconf-archive autoconf automake azcopy azure-cli bison cmake gettext gfortran gnu-sed gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm mkdir ~/Data if [ `uname -m` = 'arm64' ]; then -curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.248.0/vsts-agent-osx-arm64-4.248.0.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz else -curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.248.0/vsts-agent-osx-x64-4.248.0.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz fi mkdir ~/myagent tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent From 0f22cdde27ebd79f2ff48b5f71835b787b3295ea Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 21:22:02 -0700 Subject: [PATCH 13/58] More macOS nitpicks. --- scripts/azure-pipelines/osx/README.md | 8 +++++--- scripts/azure-pipelines/osx/setup-box.sh | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index f1bba0dbe5a820..3d3f157b721ad9 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -46,7 +46,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) ) - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all - [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz - [ ] In the guest, set the vcpkg user to be able to use sudo without a password: ```sh printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' @@ -109,11 +109,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi ``` - [ ] Follow prompts as you would on real hardware. * Set up as new. - * Apple ID: 'Set Up Later' / Skip * Account name: vcpkg * A very similar password + * Do not allow computer account password to be reset with your Apple Account. + * Apple ID: 'Set Up Later' / Skip * No location services * Yes send crash reports + * Set up screen time later * Only download updates automatically - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) ) - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all @@ -127,7 +129,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi sudo chmod 0440 '/etc/sudoers.d/vcpkg' exit ``` -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz - [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation: ```sh scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg diff --git a/scripts/azure-pipelines/osx/setup-box.sh b/scripts/azure-pipelines/osx/setup-box.sh index ecf750182214a4..2adf6dcc328d5d 100644 --- a/scripts/azure-pipelines/osx/setup-box.sh +++ b/scripts/azure-pipelines/osx/setup-box.sh @@ -20,9 +20,9 @@ fi brew install autoconf-archive autoconf automake azcopy azure-cli bison cmake gettext gfortran gnu-sed gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm mkdir ~/Data if [ `uname -m` = 'arm64' ]; then -curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz else -curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz fi mkdir ~/myagent tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent From a1ec01f66f1a1baac96e2b4efef77a41ba57cccb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 21:23:24 -0700 Subject: [PATCH 14/58] Update macOS pools. --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index fe6de219e79258..2c2cdfcae24ebd 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -69,14 +69,14 @@ jobs: - template: osx/azure-pipelines.yml parameters: jobName: x64_osx - poolName: 'PrOsx-2025-01-24' + poolName: 'PrOsx-2025-08-12' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} - template: osx/azure-pipelines.yml parameters: jobName: arm64_osx - poolName: 'PrOsx-2025-01-24-arm64' + poolName: 'PrOsx-2025-08-12-arm64' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} From 725a67fb8a62098a199942ffcaf927bbc3588d70 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 12 Aug 2025 21:47:36 -0700 Subject: [PATCH 15/58] Update Windows image. --- scripts/azure-pipelines/windows-unstable/azure-pipelines.yml | 2 +- scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index b6acfd4f4b8c93..8009edf24fcf8e 100644 --- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -6,7 +6,7 @@ jobs: - job: x64_windows pool: name: vcpkg-testing-msvc - demands: ImageVersionOverride -equals 2025.07.14 + demands: ImageVersionOverride -equals 2025.08.12 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 5bf88397e7c322..a9bd56b6bbcaff 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}')) pool: name: PrWin-WUS - demands: ImageVersionOverride -equals 2025.07.14 + demands: ImageVersionOverride -equals 2025.08.12 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT From 4a52a2ee2cac752d3219d057865a57b6946618aa Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 13 Aug 2025 15:06:06 -0700 Subject: [PATCH 16/58] Fix pool detection in register-guest.sh on arm64. Fix shutting down arm64 VM. --- scripts/azure-pipelines/osx/README.md | 2 +- scripts/azure-pipelines/osx/fire-register-guest.ps1 | 2 ++ scripts/azure-pipelines/osx/register-guest.sh | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 3d3f157b721ad9..94a9c52d990924 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -236,7 +236,7 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i ```sh ./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere ``` -- [ ] In the KVM's terminal, relaunch the VM in ephemeral mode with: +- [ ] That will cleanly shut down the VM. In the KVM's terminal, relaunch the VM in ephemeral mode with: ```sh ~/macosvm --ephemeral ./vm.json ``` diff --git a/scripts/azure-pipelines/osx/fire-register-guest.ps1 b/scripts/azure-pipelines/osx/fire-register-guest.ps1 index 3b2af668ffb872..d3ea9c247dad48 100644 --- a/scripts/azure-pipelines/osx/fire-register-guest.ps1 +++ b/scripts/azure-pipelines/osx/fire-register-guest.ps1 @@ -10,10 +10,12 @@ Param( $sshCookie = "vcpkg@$Target" scp "$PSScriptRoot/register-guest.sh" "$($sshCookie):/Users/vcpkg/register-guest.sh" +# note that the empty line is load bearing $script = @" rm .ssh/known_hosts chmod +x /Users/vcpkg/register-guest.sh /Users/vcpkg/register-guest.sh $Pat + "@ $script | ssh $sshCookie diff --git a/scripts/azure-pipelines/osx/register-guest.sh b/scripts/azure-pipelines/osx/register-guest.sh index 09df7b37e7373e..f27056699a8f8d 100644 --- a/scripts/azure-pipelines/osx/register-guest.sh +++ b/scripts/azure-pipelines/osx/register-guest.sh @@ -6,7 +6,7 @@ fi export AGENT=`hostname | sed -nr 's/([^.]+).*/\1/p'` echo "THIS IS AGENT: $AGENT" if [ `uname -m` = 'arm64' ]; then -export POOL=`echo ~/Parallels/* | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-arm64/PrOsx-\1-arm64/p'` +export POOL=`echo ~/Parallels/*/ | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-arm64\/$/PrOsx-\1-arm64/p'` # on arm64, DNS works export SSH_COOKIE=vcpkg@vcpkgs-Virtual-Machine.local else @@ -16,3 +16,6 @@ export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{ export SSH_COOKIE=vcpkg@$GUEST_IP fi ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula" +if [ `uname -m` = 'arm64' ]; then + ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "sudo shutdown -h now" +fi From f725130fa107288668a3e2c54cbbed48f0960d9f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 13 Aug 2025 17:21:01 -0700 Subject: [PATCH 17/58] Make sudo easier for amd64. --- scripts/azure-pipelines/osx/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 94a9c52d990924..abf5459e1269ac 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -47,10 +47,16 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all - [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login - [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz -- [ ] In the guest, set the vcpkg user to be able to use sudo without a password: +- [ ] In the guest, set the vcpkg user to be able to use sudo without a password. From a dev machine: ```sh + ssh vcpkg@HOSTMACHINE + export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'` + export SSH_COOKIE=vcpkg@$GUEST_IP + ssh $SSH_COOKIE # and then enter the password here printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' sudo chmod 0440 '/etc/sudoers.d/vcpkg' + exit + exit ``` - [ ] Copy setup-guest, setup-box.sh, and the xcode installer renamed to 'clt.dmg' to the host, and run setup-guest.sh. From a developer machine: ```sh From f141e680892233cb17570e91e3e28d855cef8e8e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 13 Aug 2025 17:42:02 -0700 Subject: [PATCH 18/58] Make sure the agent name is uppercase. --- scripts/azure-pipelines/osx/register-guest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/osx/register-guest.sh b/scripts/azure-pipelines/osx/register-guest.sh index f27056699a8f8d..c3802b1cf2ea9e 100644 --- a/scripts/azure-pipelines/osx/register-guest.sh +++ b/scripts/azure-pipelines/osx/register-guest.sh @@ -3,7 +3,7 @@ if [ -z "$1" ]; then echo "PAT missing" exit 1 fi -export AGENT=`hostname | sed -nr 's/([^.]+).*/\1/p'` +export AGENT=$(hostname | sed -nr 's/([^.]+).*/\1/p' | tr '[:lower:]' '[:upper:]') echo "THIS IS AGENT: $AGENT" if [ `uname -m` = 'arm64' ]; then export POOL=`echo ~/Parallels/*/ | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-arm64\/$/PrOsx-\1-arm64/p'` From c7e00a22c7021c06c23fcac4bc20a36331570758 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 13 Aug 2025 18:01:44 -0700 Subject: [PATCH 19/58] Add note to disable time sync. --- scripts/azure-pipelines/osx/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index abf5459e1269ac..dff7285687d9cd 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -190,7 +190,10 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i * On VM Shutdown: Close Window (this one should already be set) * On Mac Shutdown: Shut Down * On Window Close: Keep Running in the Background -- [ ] Close and restart Parallels Desktop. The VM should start automatically. +- [ ] Under 'More Options': + * Time: Do not sync + * Uncheck 'Update Parallels Tools automatically' +- [ ] Close and restart Parallels Desktop. The VM should start automatically. If it does not, start it. - [ ] [grab a PAT][] if you don't already have one - [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine: ```sh From d21c5055c9bcb80994ebd06835620b23641b21ca Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 15 Aug 2025 14:56:09 -0700 Subject: [PATCH 20/58] Change VS to 17.14.12 and Windows 10 SDK to 19041; 20348 is no longer offered by the VS installer. --- scripts/azure-pipelines/windows/deploy-visual-studio.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 372da9d8b1c1de..3ea5d25d569f2e 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { } # See https://learn.microsoft.com/visualstudio/releases/2022/release-history -# 17.14.11 -$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/92d8ef2d-f13b-4768-84e8-c9fd160e0180/c6e38e6ef38792fd533594e7db388432682d6d066ce41e73d782435b19252d84/vs_Enterprise.exe' +# 17.14.12 +$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/a54455c3-57af-4ccb-ab09-88cfa071f1b5/c5dc5ae50da56fa711f3d699747e9bb2ac8795bd2535a1d288d2f4c88b64a582/vs_Enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', @@ -22,7 +22,7 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.ATL.ARM64', 'Microsoft.VisualStudio.Component.VC.MFC.ARM64', 'Microsoft.VisualStudio.Component.Windows11SDK.26100', - 'Microsoft.VisualStudio.Component.Windows10SDK.20348', # As of 2024-11-15, CMake explicitly needs a Windows 10 SDK for Store + 'Microsoft.VisualStudio.Component.Windows10SDK.19041', # As of 2024-11-15, CMake explicitly needs a Windows 10 SDK for Store # These .NET parts are needed for easyhook, openni2 'Microsoft.Net.Component.4.8.SDK', 'Microsoft.Net.Component.4.7.2.TargetingPack', From 5e1a635541ab59c29178e70b82f38fb99bd88882 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 15 Aug 2025 16:34:32 -0700 Subject: [PATCH 21/58] [popsift] Guard nvtx calls rather than trying to macroize names popsift does not own. --- ports/popsift/portfile.cmake | 1 + ports/popsift/remove-nvtx-macros.diff | 340 ++++++++++++++++++++++++++ ports/popsift/vcpkg.json | 2 +- scripts/ci.feature.baseline.txt | 3 + versions/baseline.json | 2 +- versions/p-/popsift.json | 5 + 6 files changed, 351 insertions(+), 2 deletions(-) create mode 100644 ports/popsift/remove-nvtx-macros.diff diff --git a/ports/popsift/portfile.cmake b/ports/popsift/portfile.cmake index a2633e267b4a9e..c87c29bb6310fd 100644 --- a/ports/popsift/portfile.cmake +++ b/ports/popsift/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix_missing_thrust_include.patch 144.patch cuda_12_1.patch + remove-nvtx-macros.diff ) vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) diff --git a/ports/popsift/remove-nvtx-macros.diff b/ports/popsift/remove-nvtx-macros.diff new file mode 100644 index 00000000000000..fc1d4021b192fc --- /dev/null +++ b/ports/popsift/remove-nvtx-macros.diff @@ -0,0 +1,340 @@ +diff --git a/src/application/main.cpp b/src/application/main.cpp +index 0eec1c2..f30be1b 100755 +--- a/src/application/main.cpp ++++ b/src/application/main.cpp +@@ -32,9 +32,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + using namespace std; +@@ -183,7 +180,9 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + exit( -1 ); + } + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "load and convert image - devil" ); ++#endif + + ilImage img; + if( img.Load( inputFile.c_str() ) == false ) { +@@ -200,7 +199,9 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + + image_data = img.GetData(); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop( ); // "load and convert image - devil" ++#endif + + job = PopSift.enqueue( w, h, image_data ); + +@@ -209,7 +210,10 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + else + #endif + { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "load and convert image - pgmread" ); ++#endif ++ + int w{}; + int h{}; + image_data = readPGMfile( inputFile, w, h ); +@@ -217,7 +221,9 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + exit( EXIT_FAILURE ); + } + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop( ); // "load and convert image - pgmread" ++#endif + + if( ! float_mode ) + { +@@ -251,16 +257,20 @@ void read_job( SiftJob* job, bool really_write ) + << endl; + + if( really_write ) { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "Writing features to disk" ); ++#endif + + std::ofstream of( "output-features.txt" ); + feature_list->print( of, write_as_uchar ); + } + delete feature_list; + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + if( really_write ) { + nvtxRangePop( ); // Writing features to disk + } ++#endif + } + + int main(int argc, char **argv) +diff --git a/src/application/match.cpp b/src/application/match.cpp +index 852d9b6..7483dda 100755 +--- a/src/application/match.cpp ++++ b/src/application/match.cpp +@@ -32,9 +32,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + using namespace std; +@@ -171,7 +168,9 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + unsigned char* image_data; + SiftJob* job; + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "load and convert image" ); ++#endif + #ifdef USE_DEVIL + if( ! pgmread_loading ) + { +@@ -189,7 +188,9 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + cout << "Loading " << w << " x " << h << " image " << inputFile << endl; + image_data = img.GetData(); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop( ); ++#endif + + // PopSift.init( w, h ); + job = PopSift.enqueue( w, h, image_data ); +@@ -206,7 +207,9 @@ SiftJob* process_image( const string& inputFile, PopSift& PopSift ) + exit( EXIT_FAILURE ); + } + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop( ); ++#endif + + // PopSift.init( w, h ); + job = PopSift.enqueue( w, h, image_data ); +diff --git a/src/popsift/s_filtergrid.cu b/src/popsift/s_filtergrid.cu +index a766c2d..d8d3bb8 100644 +--- a/src/popsift/s_filtergrid.cu ++++ b/src/popsift/s_filtergrid.cu +@@ -11,9 +11,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + #if ! POPSIFT_IS_DEFINED(POPSIFT_DISABLE_GRID_FILTER) +@@ -317,9 +314,13 @@ int Pyramid::extrema_filter_grid( const Config& conf, int ext_total ) + } + } + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "writing back count" ); ++#endif + writeDescCountersToDevice( ); ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop( ); ++#endif + + return ret_ext_total; + } +diff --git a/src/popsift/s_image.cu b/src/popsift/s_image.cu +index f26b8e3..92060d5 100755 +--- a/src/popsift/s_image.cu ++++ b/src/popsift/s_image.cu +@@ -17,9 +17,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + using namespace std; +@@ -98,7 +95,9 @@ void Image::resetDimensions( int w, int h ) + destroyTexture( ); + createTexture( ); + } else { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "reallocating host-side image memory" ); ++#endif + + _max_w = max( w, _max_w ); + _max_h = max( h, _max_h ); +@@ -112,20 +111,26 @@ void Image::resetDimensions( int w, int h ) + destroyTexture( ); + createTexture( ); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); // "reallocating host-side image memory" ++#endif + } + } + + void Image::allocate( int w, int h ) + { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "allocating host-side image memory" ); ++#endif + + _input_image_h.allocHost( w, h, popsift::CudaAllocated ); + _input_image_d.allocDev( w, h ); + + createTexture( ); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); // "allocating host-side image memory" ++#endif + } + + void Image::destroyTexture( ) +@@ -222,7 +227,9 @@ void ImageFloat::resetDimensions( int w, int h ) + destroyTexture( ); + createTexture( ); + } else { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "reallocating host-side image memory" ); ++#endif + + _max_w = max( w, _max_w ); + _max_h = max( h, _max_h ); +@@ -236,20 +243,26 @@ void ImageFloat::resetDimensions( int w, int h ) + destroyTexture( ); + createTexture( ); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); // "reallocating host-side image memory" ++#endif + } + } + + void ImageFloat::allocate( int w, int h ) + { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "allocating host-side image memory" ); ++#endif + + _input_image_h.allocHost( w, h, popsift::CudaAllocated ); + _input_image_d.allocDev( w, h ); + + createTexture( ); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); // "allocating host-side image memory" ++#endif + } + + void ImageFloat::destroyTexture( ) +diff --git a/src/popsift/s_orientation.cu b/src/popsift/s_orientation.cu +index f6b36fc..f5e1011 100644 +--- a/src/popsift/s_orientation.cu ++++ b/src/popsift/s_orientation.cu +@@ -20,9 +20,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + using namespace popsift; +diff --git a/src/popsift/sift_desc.cu b/src/popsift/sift_desc.cu +index b0eb0bd..5649edf 100644 +--- a/src/popsift/sift_desc.cu ++++ b/src/popsift/sift_desc.cu +@@ -23,9 +23,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + using namespace popsift; +@@ -55,11 +52,15 @@ using namespace std; + __host__ + void Pyramid::descriptors( const Config& conf ) + { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA("Reading orientation count"); ++#endif + + readDescCountersFromDevice( _octaves[0].getStream() ); + cudaStreamSynchronize( _octaves[0].getStream() ); ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop( ); ++#endif + + for( int octave=_num_octaves-1; octave>=0; octave-- ) + // for( int octave=0; octave<_num_octaves; octave++ ) +diff --git a/src/popsift/sift_pyramid.cu b/src/popsift/sift_pyramid.cu +index f5cb3e2..77332dc 100755 +--- a/src/popsift/sift_pyramid.cu ++++ b/src/popsift/sift_pyramid.cu +@@ -27,9 +27,6 @@ + + #if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + #include +-#else +-#define nvtxRangePushA(a) +-#define nvtxRangePop() + #endif + + #define PYRAMID_PRINT_DEBUG 0 +@@ -287,12 +284,16 @@ FeaturesHost* Pyramid::get_descriptors( const Config& conf ) + + readDescCountersFromDevice(); + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "download descriptors" ); ++#endif + FeaturesHost* features = new FeaturesHost( hct.ext_total, hct.ori_total ); + + if( hct.ext_total == 0 || hct.ori_total == 0 ) + { ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); ++#endif + return features; + } + +@@ -300,9 +301,13 @@ FeaturesHost* Pyramid::get_descriptors( const Config& conf ) + prep_features<<>>( features->getDescriptors(), up_fac ); + POP_SYNC_CHK; + ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "register host memory" ); ++#endif + features->pin( ); ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); ++#endif + popcuda_memcpy_async( features->getFeatures(), + dobuf_shadow.features, + hct.ext_total * sizeof(Feature), +@@ -315,10 +320,14 @@ FeaturesHost* Pyramid::get_descriptors( const Config& conf ) + cudaMemcpyDeviceToHost, + _download_stream ); + cudaStreamSynchronize( _download_stream ); ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePushA( "unregister host memory" ); ++#endif + features->unpin( ); ++#if POPSIFT_IS_DEFINED(POPSIFT_USE_NVTX) + nvtxRangePop(); + nvtxRangePop(); ++#endif + + return features; + } diff --git a/ports/popsift/vcpkg.json b/ports/popsift/vcpkg.json index 0307c5334bc02d..8646c1204f9e56 100644 --- a/ports/popsift/vcpkg.json +++ b/ports/popsift/vcpkg.json @@ -1,7 +1,7 @@ { "name": "popsift", "version": "0.9", - "port-version": 5, + "port-version": 6, "description": "PopSift is an implementation of the SIFT algorithm in CUDA.", "homepage": "https://github.com/alicevision/popsift", "supports": "!(uwp | arm | arm64 | android | x86)", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 5c10bd3c991c93..c6347f96b0b573 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -409,7 +409,10 @@ pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail pmdk:x86-windows=fail +popsift:x64-windows-release=fail popsift:x64-windows-static-md=fail +popsift:x64-windows-static=fail +popsift:x64-windows=fail portable-snippets:arm-uwp=fail qbittorrent:x64-linux=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail # Not yet ready for these platforms. diff --git a/versions/baseline.json b/versions/baseline.json index a9c0a2f291f2ad..a69fcce17d2882 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7514,7 +7514,7 @@ }, "popsift": { "baseline": "0.9", - "port-version": 5 + "port-version": 6 }, "portable-file-dialogs": { "baseline": "0.1.0", diff --git a/versions/p-/popsift.json b/versions/p-/popsift.json index c14d496c967c8b..5735e0ab9d08b3 100644 --- a/versions/p-/popsift.json +++ b/versions/p-/popsift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3683687d6244a6c7f051930a912ad6ee13566d52", + "version": "0.9", + "port-version": 6 + }, { "git-tree": "df628dcfa7ee8110e38f7a449b599e3b014645eb", "version": "0.9", From 9ef46f7b9cdef24f7d2a22922d3b2733f07f983e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 15 Aug 2025 17:33:03 -0700 Subject: [PATCH 22/58] Cherry pick port fixes from https://github.com/microsoft/vcpkg/pull/44273 --- ports/clapack/FindLAPACK.cmake | 11 +- ports/clapack/vcpkg.json | 2 +- ports/clockutils/cmake4.patch | 22 ++++ ports/clockutils/portfile.cmake | 1 + ports/clockutils/vcpkg.json | 2 +- ports/ecm/fix-wrong-version.patch | 12 ++ ports/ecm/portfile.cmake | 1 + ports/ecm/vcpkg.json | 1 + ports/jsonnet/001-enable-msvc.patch | 2 + .../002-fix-dependency-and-install.patch | 5 + ports/jsonnet/vcpkg.json | 1 + ports/lemon-parser-generator/CMakeLists.txt | 1 + ports/lemon-parser-generator/vcpkg.json | 1 + ports/libbson/cmake4.patch | 16 +++ ports/libbson/portfile.cmake | 1 + ports/libbson/vcpkg.json | 1 + ports/libevhtp/fix-cmake4.patch | 16 +++ ports/libevhtp/portfile.cmake | 2 + ports/libevhtp/vcpkg.json | 2 +- ports/libgme/cmake4.patch | 13 ++ ports/libgme/portfile.cmake | 1 + ports/libgme/vcpkg.json | 1 + ports/liblas/fix-cmake4.patch | 14 +++ ports/liblas/portfile.cmake | 1 + ports/liblas/vcpkg.json | 2 +- ports/liblemon/fix-cmake4.patch | 19 +++ ports/liblemon/portfile.cmake | 1 + ports/liblemon/vcpkg.json | 2 +- ports/llvm/cmake4.patch | 117 ++++++++++++++++++ ports/llvm/portfile.cmake | 1 + ports/llvm/vcpkg.json | 2 +- ports/msquic/cmake4.patch | 12 ++ ports/msquic/portfile.cmake | 1 + ports/msquic/vcpkg.json | 1 + ports/nanogui/cmake4.patch | 22 ++++ ports/nanogui/portfile.cmake | 1 + ports/nanogui/vcpkg.json | 2 +- ports/ogre/cmake4.patch | 30 +++++ ports/ogre/portfile.cmake | 1 + ports/ogre/vcpkg.json | 1 + ports/ois/0002-fix-cmake4.patch | 14 +++ ports/ois/portfile.cmake | 1 + ports/ois/vcpkg.json | 2 +- ports/opencv2/0010-fix-cmake4.patch | 34 +++++ ports/opencv2/portfile.cmake | 1 + ports/opencv2/vcpkg.json | 2 +- ports/outcome/files-do-not-exist.patch | 41 ++++++ ports/outcome/portfile.cmake | 1 + ports/outcome/vcpkg.json | 1 + ports/physx/portfile.cmake | 1 - ports/physx/vcpkg.json | 1 + ports/qca/0004-fix-cmake4.patch | 15 +++ ports/qca/portfile.cmake | 1 + ports/qca/vcpkg.json | 2 +- ports/salome-configuration/cmake-4.patch | 14 +++ ports/salome-configuration/portfile.cmake | 2 + ports/salome-configuration/vcpkg.json | 2 +- ports/sdl2pp/fix-dependencies.patch | 4 +- ports/sdl2pp/vcpkg.json | 2 +- ports/sentry-native/fix-cmake4.patch | 24 ++++ ports/sentry-native/portfile.cmake | 1 + ports/sentry-native/vcpkg.json | 1 + ports/spaceland/fix-cmake4.patch | 13 ++ ports/spaceland/portfile.cmake | 4 +- ports/spaceland/vcpkg.json | 2 +- ports/torch-th/fix-cmake4.patch | 45 +++++++ ports/torch-th/portfile.cmake | 1 + ports/torch-th/vcpkg.json | 2 +- ports/x265/fix-cmake-4.patch | 39 ++++++ ports/x265/portfile.cmake | 1 + ports/x265/vcpkg.json | 1 + ports/yajl/fix_cmake_4.patch | 45 +++++++ ports/yajl/portfile.cmake | 4 +- ports/yajl/vcpkg.json | 2 +- ports/yasm/cmake.patch | 77 ++++++++++++ ports/yasm/portfile.cmake | 1 + ports/yasm/vcpkg.json | 2 +- ports/zkpp/CMakeLists.txt | 2 - ports/zkpp/vcpkg.json | 2 +- scripts/cmake/vcpkg_from_git.cmake | 2 +- versions/baseline.json | 56 ++++----- versions/c-/clapack.json | 5 + versions/c-/clockutils.json | 5 + versions/e-/ecm.json | 5 + versions/j-/jsonnet.json | 5 + versions/l-/lemon-parser-generator.json | 5 + versions/l-/libbson.json | 5 + versions/l-/libevhtp.json | 5 + versions/l-/libgme.json | 5 + versions/l-/liblas.json | 5 + versions/l-/liblemon.json | 5 + versions/l-/llvm.json | 5 + versions/m-/msquic.json | 5 + versions/n-/nanogui.json | 5 + versions/o-/ogre.json | 5 + versions/o-/ois.json | 5 + versions/o-/opencv2.json | 5 + versions/o-/outcome.json | 5 + versions/p-/physx.json | 5 + versions/q-/qca.json | 5 + versions/s-/salome-configuration.json | 5 + versions/s-/sdl2pp.json | 5 + versions/s-/sentry-native.json | 5 + versions/s-/spaceland.json | 5 + versions/t-/torch-th.json | 5 + versions/x-/x265.json | 5 + versions/y-/yajl.json | 5 + versions/y-/yasm.json | 5 + versions/z-/zkpp.json | 5 + 109 files changed, 893 insertions(+), 60 deletions(-) create mode 100644 ports/clockutils/cmake4.patch create mode 100644 ports/ecm/fix-wrong-version.patch create mode 100644 ports/libbson/cmake4.patch create mode 100644 ports/libevhtp/fix-cmake4.patch create mode 100644 ports/libgme/cmake4.patch create mode 100644 ports/liblas/fix-cmake4.patch create mode 100644 ports/liblemon/fix-cmake4.patch create mode 100644 ports/llvm/cmake4.patch create mode 100644 ports/msquic/cmake4.patch create mode 100644 ports/nanogui/cmake4.patch create mode 100644 ports/ogre/cmake4.patch create mode 100644 ports/ois/0002-fix-cmake4.patch create mode 100644 ports/opencv2/0010-fix-cmake4.patch create mode 100644 ports/outcome/files-do-not-exist.patch create mode 100644 ports/qca/0004-fix-cmake4.patch create mode 100644 ports/salome-configuration/cmake-4.patch create mode 100644 ports/sentry-native/fix-cmake4.patch create mode 100644 ports/spaceland/fix-cmake4.patch create mode 100644 ports/torch-th/fix-cmake4.patch create mode 100644 ports/x265/fix-cmake-4.patch create mode 100644 ports/yajl/fix_cmake_4.patch create mode 100644 ports/yasm/cmake.patch diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index 8516fc78d42052..a65af18e2ea463 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -35,14 +35,9 @@ if(NOT TARGET LAPACK::LAPACK) get_property(LAPACK_INCLUDE_DIR TARGET lapack PROPERTY INTERFACE_INCLUDE_DIRECTORIES) # Doesn't make much sense but ok. select_library_configurations(LAPACK) - get_property(LAPACK_LINKER_FLAGS_RELEASE TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) - get_property(LAPACK_LINKER_FLAGS_DEBUG TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) - list(TRANSFORM LAPACK_LINKER_FLAGS_DEBUG PREPEND "$<$:") - list(TRANSFORM LAPACK_LINKER_FLAGS_DEBUG APPEND ">") - list(TRANSFORM LAPACK_LINKER_FLAGS_RELEASE PREPEND "$<$>:") - list(TRANSFORM LAPACK_LINKER_FLAGS_RELEASE APPEND ">") - - set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};${LAPACK_LINKER_FLAGS_DEBUG};${LAPACK_LINKER_FLAGS_RELEASE}") + get_property(LAPACK_LINKER_FLAGS TARGET lapack PROPERTY INTERFACE_LINK_LIBRARIES) + + set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};${LAPACK_LINKER_FLAGS}") set(LAPACK95_LIBRARIES "${LAPACK_LIBRARIES}") set(LAPACK95_FOUND "TRUE") set(LAPACK_LINKER_FLAGS "${LAPACK_LIBRARIES}") diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 42091fd81abc06..b17edb56d204f7 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 23, + "port-version": 24, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://netlib.org/lapack/", "license": null, diff --git a/ports/clockutils/cmake4.patch b/ports/clockutils/cmake4.patch new file mode 100644 index 00000000000000..1c95cdc13c2448 --- /dev/null +++ b/ports/clockutils/cmake4.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 89b42c8398..5c77383813 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,7 +61,7 @@ IF(WITH_TESTING AND UNIX) + ENDIF(WITH_TESTING AND UNIX) + set (CLANG_FLAGS "-Wstring-plus-int") + +-IF(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) ++IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang) + set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${CLANG_FLAGS} -g") + set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG") + set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror") +@@ -141,7 +141,7 @@ ELSEIF(WIN32) + ENDIF() + SET(COMPILER_VERSION ${DEP_DIR_BUILD}) + ELSEIF(UNIX) +- IF(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) ++ IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang) + SET(DEP_DIR_BUILD "clang") + SET(UNIX_COMPILER "clang") + ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake index 5ca33127f5a6c7..c7b8351cb95fea 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-warningC4643.patch add-missing-thread-header.patch + cmake4.patch ) set(SHARED_FLAG OFF) diff --git a/ports/clockutils/vcpkg.json b/ports/clockutils/vcpkg.json index d40cc4f116fdd9..a97ad8ad631d8f 100644 --- a/ports/clockutils/vcpkg.json +++ b/ports/clockutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clockutils", "version": "1.1.1", - "port-version": 2, + "port-version": 3, "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", "homepage": "https://github.com/ClockworkOrigins/clockUtils", "license": "MIT", diff --git a/ports/ecm/fix-wrong-version.patch b/ports/ecm/fix-wrong-version.patch new file mode 100644 index 00000000000000..2d558f6a0543ed --- /dev/null +++ b/ports/ecm/fix-wrong-version.patch @@ -0,0 +1,12 @@ +diff --git a/modules/ECMSetupVersion.cmake b/modules/ECMSetupVersion.cmake +index 7164c9a0bd..408ef33638 100644 +--- a/modules/ECMSetupVersion.cmake ++++ b/modules/ECMSetupVersion.cmake +@@ -112,7 +112,6 @@ function(ecm_setup_version _version) + set(use_project_version FALSE) + cmake_policy(GET CMP0048 project_version_policy) + if(project_version_policy STREQUAL "NEW") +- set(project_manages_version TRUE) + if(_version STREQUAL "PROJECT") + set(use_project_version TRUE) + endif() diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 2d0b905406fb9d..2a82cf0b8f67b4 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201 + fix-wrong-version.patch ) vcpkg_cmake_configure( diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index 1c26bf35ead59a..8f18c48c3caa2a 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ecm", "version": "6.7.0", + "port-version": 1, "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", "homepage": "https://github.com/KDE/extra-cmake-modules", "dependencies": [ diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch index 3c93d581567783..60fdd0c5a93b9a 100644 --- a/ports/jsonnet/001-enable-msvc.patch +++ b/ports/jsonnet/001-enable-msvc.patch @@ -78,4 +78,6 @@ index a481d9f..d4829f8 100644 # Standard library build target that libjsonnet can depend on. add_custom_target(stdlib ALL DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) ++else() ++add_custom_target(stdlib) +endif() diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch index 560567748a2728..38d515a2e87950 100644 --- a/ports/jsonnet/002-fix-dependency-and-install.patch +++ b/ports/jsonnet/002-fix-dependency-and-install.patch @@ -46,6 +46,11 @@ index 153a4a1..9b37ef4 100644 if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. + add_library(libjsonnet++_static STATIC ${LIBJSONNETPP_SOURCE}) +- add_dependencies(libjsonnet++_static jsonnet) + target_link_libraries(libjsonnet++_static libjsonnet_static) + set_target_properties(libjsonnet++_static PROPERTIES OUTPUT_NAME jsonnet++) + install(TARGETS libjsonnet++_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") @@ -43,6 +44,7 @@ else() add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static) endif() diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json index 0f9db21b2baa1e..faf795c6c37b26 100644 --- a/ports/jsonnet/vcpkg.json +++ b/ports/jsonnet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jsonnet", "version": "0.21.0", + "port-version": 1, "description": "Jsonnet - The data templating language", "homepage": "https://github.com/google/jsonnet", "license": "Apache-2.0", diff --git a/ports/lemon-parser-generator/CMakeLists.txt b/ports/lemon-parser-generator/CMakeLists.txt index c5fc7b09c09a3f..26eca12514dbc7 100644 --- a/ports/lemon-parser-generator/CMakeLists.txt +++ b/ports/lemon-parser-generator/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 4.0) project(lemon-parser-generator C) add_executable(lemon lemon.c) install(TARGETS lemon diff --git a/ports/lemon-parser-generator/vcpkg.json b/ports/lemon-parser-generator/vcpkg.json index ba43a3443b9c48..9e91f067c8d8a2 100644 --- a/ports/lemon-parser-generator/vcpkg.json +++ b/ports/lemon-parser-generator/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lemon-parser-generator", "version": "3.39.3", + "port-version": 1, "description": "The Lemon program is an LALR(1) parser generator. It takes a context free grammar and converts it into a subroutine that will parse a file using that grammar.", "homepage": "https://www.hwaci.com/sw/lemon/index.html", "license": "blessing", diff --git a/ports/libbson/cmake4.patch b/ports/libbson/cmake4.patch new file mode 100644 index 00000000000000..4b597c43682ee4 --- /dev/null +++ b/ports/libbson/cmake4.patch @@ -0,0 +1,16 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index 829d77c88c..8b87297c11 100644 +--- a/src/libbson/CMakeLists.txt ++++ b/src/libbson/CMakeLists.txt +@@ -33,11 +33,6 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) + # potentially co-locate additional future major versions. + set (BSON_API_VERSION 1.0) + +-if (APPLE) +- cmake_policy (SET CMP0042 OLD) +-endif () +- +- + # .d8888b. 888 888 d8b + # d88P Y88b 888 888 Y8P + # Y88b. 888 888 diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index ec0eca9fad7329..63186c29f29e82 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-include-directory.patch # vcpkg legacy decision + cmake4.patch ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index d896c559db5553..69cedf1f334a85 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libbson", "version": "1.30.3", + "port-version": 1, "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/libevhtp/fix-cmake4.patch b/ports/libevhtp/fix-cmake4.patch new file mode 100644 index 00000000000000..1d3fd60edae7f6 --- /dev/null +++ b/ports/libevhtp/fix-cmake4.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 481ddd0e86..a1a806ce99 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,7 +40,10 @@ check_type_size("int" SIZEOF_INT) + check_type_size("long" SIZEOF_LONG) + check_type_size("short" SIZEOF_SHORT) + +-test_big_endian(HOST_BIG_ENDIAN) ++set(HOST_BIG_ENDIAN OFF) ++if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN") ++ set(HOST_BIG_ENDIAN ON) ++endif() + + check_c_compiler_flag(-std=c99 has_c99) + diff --git a/ports/libevhtp/portfile.cmake b/ports/libevhtp/portfile.cmake index 48d496ac30791b..753e8c07c50799 100644 --- a/ports/libevhtp/portfile.cmake +++ b/ports/libevhtp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF e200bfa85bf253e9cfe1c1a9e705fccb176b9171 SHA512 d77d6d12dcc2762c8311a04cd3d33c7dfde7b406dbbb544d683e6a3b8e5912ba37a196470bc5aca92b58bd9659fbb396e5a11234b98435534f535046d6dab6eb HEAD_REF master + PATCHES + fix-cmake4.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libevhtp/vcpkg.json b/ports/libevhtp/vcpkg.json index d504396672f2fd..c65e4eb2a24b7f 100644 --- a/ports/libevhtp/vcpkg.json +++ b/ports/libevhtp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libevhtp", "version": "1.2.18", - "port-version": 5, + "port-version": 6, "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", "homepage": "https://github.com/criticalstack/libevhtp", "supports": "!windows", diff --git a/ports/libgme/cmake4.patch b/ports/libgme/cmake4.patch new file mode 100644 index 00000000000000..c3721031c7a527 --- /dev/null +++ b/ports/libgme/cmake4.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62349bd48d..23985cdd94 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ option(BUILD_FRAMEWORK "Build framework instead of dylib (on macOS)" OFF) + # Check for GCC/Clang "visibility" support. + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" + OR +- CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++ CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC) + + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -Wextra") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") diff --git a/ports/libgme/portfile.cmake b/ports/libgme/portfile.cmake index 72b20746b4717a..9bd3a169a34801 100644 --- a/ports/libgme/portfile.cmake +++ b/ports/libgme/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_bitbucket( PATCHES disable-player-and-demo.patch disable-static-zlib-hack.patch + cmake4.patch ) # This file is generated during the CMake build diff --git a/ports/libgme/vcpkg.json b/ports/libgme/vcpkg.json index 5db9f020d7c828..9fdaa974ef3f63 100644 --- a/ports/libgme/vcpkg.json +++ b/ports/libgme/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgme", "version": "0.6.3", + "port-version": 1, "description": "Video game music file emulation/playback library", "homepage": "https://bitbucket.org/mpyne/game-music-emu/wiki/Home", "license": "LGPL-2.1-or-later OR GPL-2.0-or-later", diff --git a/ports/liblas/fix-cmake4.patch b/ports/liblas/fix-cmake4.patch new file mode 100644 index 00000000000000..0ee3aa945474a0 --- /dev/null +++ b/ports/liblas/fix-cmake4.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5af9ac21a5..5cc6f88939 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,9 +75,6 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE) + + # Path to additional CMake modules + set(CMAKE_MODULE_PATH "${libLAS_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) +-if (CMAKE_MAJOR_VERSION GREATER 2) +- cmake_policy(SET CMP0042 OLD) +-endif() + + if (CMAKE_SYSTEM_NAME MATCHES "Linux") + set(CMAKE_SKIP_RPATH ON) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index a987af9e53e3ba..ac41485619eb6f 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_extract_source_archive( misc-fixes.patch remove_unnecessary_boost_dependency.diff force-cpp11.patch + fix-cmake4.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index bb135a43691f6b..fd0221ed598469 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblas", "version": "1.8.1", - "port-version": 15, + "port-version": 16, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", "license": null, "supports": "!arm & !staticcrt", diff --git a/ports/liblemon/fix-cmake4.patch b/ports/liblemon/fix-cmake4.patch new file mode 100644 index 00000000000000..0573e8e07a5bae --- /dev/null +++ b/ports/liblemon/fix-cmake4.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5717680e51..4a3992dafa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,14 +1,5 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + +-IF(POLICY CMP0048) +- CMAKE_POLICY(SET CMP0048 OLD) +-ENDIF(POLICY CMP0048) +- +-IF(POLICY CMP0026) +- #This is for copying the dll's needed by glpk (in lp_test and mip_test) +- CMAKE_POLICY(SET CMP0026 OLD) +-ENDIF(POLICY CMP0026) +- + SET(PROJECT_NAME "LEMON") + PROJECT(${PROJECT_NAME}) + diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index 6db26e44298fd8..e91f4e48c06da7 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive( SOURCE_BASE "${VERSION}" PATCHES fix-cmake.patch + fix-cmake4.patch ) vcpkg_cmake_configure( diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index bcc8b89def6e62..02b40ba099c14a 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblemon", "version-date": "2019-06-13", - "port-version": 9, + "port-version": 10, "description": "Library for Efficient Modeling and Optimization in Networks", "homepage": "https://lemon.cs.elte.hu/trac/lemon", "supports": "!uwp", diff --git a/ports/llvm/cmake4.patch b/ports/llvm/cmake4.patch new file mode 100644 index 00000000000000..984981e88f8bcb --- /dev/null +++ b/ports/llvm/cmake4.patch @@ -0,0 +1,117 @@ +diff --git a/cmake/Modules/HandleCompilerRT.cmake b/cmake/Modules/HandleCompilerRT.cmake +index 6865f45175..33dda44d18 100644 +--- a/cmake/Modules/HandleCompilerRT.cmake ++++ b/cmake/Modules/HandleCompilerRT.cmake +@@ -20,25 +20,25 @@ function(get_component_name name variable) + if(NOT name MATCHES "builtins.*") + set(component_name "${name}_") + endif() +- if (CMAKE_OSX_SYSROOT MATCHES ".+MacOSX.+") ++ if (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+MacOSX.+") + set(component_name "${component_name}osx") + +- elseif (CMAKE_OSX_SYSROOT MATCHES ".+iPhoneOS.+") ++ elseif (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+iPhoneOS.+") + set(component_name "${component_name}ios") +- elseif (CMAKE_OSX_SYSROOT MATCHES ".+iPhoneSimulator.+") ++ elseif (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+iPhoneSimulator.+") + set(component_name "${component_name}iossim") + +- elseif (CMAKE_OSX_SYSROOT MATCHES ".+AppleTVOS.+") ++ elseif (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+AppleTVOS.+") + set(component_name "${component_name}tvos") +- elseif (CMAKE_OSX_SYSROOT MATCHES ".+AppleTVSimulator.+") ++ elseif (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+AppleTVSimulator.+") + set(component_name "${component_name}tvossim") + +- elseif (CMAKE_OSX_SYSROOT MATCHES ".+WatchOS.+") ++ elseif (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+WatchOS.+") + set(component_name "${component_name}watchos") +- elseif (CMAKE_OSX_SYSROOT MATCHES ".+WatchSimulator.+") ++ elseif (_CMAKE_OSX_SYSROOT_PATH MATCHES ".+WatchSimulator.+") + set(component_name "${component_name}watchossim") + else() +- message(WARNING "Unknown Apple SDK ${CMAKE_OSX_SYSROOT}, we don't know which compiler-rt library suffix to use.") ++ message(WARNING "Unknown Apple SDK ${_CMAKE_OSX_SYSROOT_PATH}, we don't know which compiler-rt library suffix to use.") + endif() + else() + set(component_name "${name}") +diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt +index f4722c3b35..a553615ebc 100644 +--- a/libcxxabi/src/CMakeLists.txt ++++ b/libcxxabi/src/CMakeLists.txt +@@ -134,7 +134,7 @@ if ( APPLE ) + # Make sure we link in CrashReporterClient if we find it -- it's used by + # abort() on Apple platforms when building the system dylib. + find_library(CrashReporterClient NAMES libCrashReporterClient.a +- PATHS "${CMAKE_OSX_SYSROOT}/usr/local/lib") ++ PATHS "${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib") + if (CrashReporterClient) + message(STATUS "Linking with CrashReporterClient at ${CrashReporterClient}") + add_library_flags("${CrashReporterClient}") +diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt +index f0b9756bec..0c784545c4 100644 +--- a/lldb/tools/debugserver/source/CMakeLists.txt ++++ b/lldb/tools/debugserver/source/CMakeLists.txt +@@ -125,17 +125,17 @@ if(APPLE) + set(LIBCOMPRESSION compression) + if(APPLE_EMBEDDED) + find_library(BACKBOARD_LIBRARY BackBoardServices +- PATHS ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks) ++ PATHS ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/PrivateFrameworks) + find_library(FRONTBOARD_LIBRARY FrontBoardServices +- PATHS ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks) ++ PATHS ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/PrivateFrameworks) + find_library(SPRINGBOARD_LIBRARY SpringBoardServices +- PATHS ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks) ++ PATHS ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/PrivateFrameworks) + find_library(MOBILESERVICES_LIBRARY MobileCoreServices +- PATHS ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks) ++ PATHS ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/PrivateFrameworks) + find_library(LOCKDOWN_LIBRARY lockdown) + if (APPLE_EMBEDDED STREQUAL "watchos") + find_library(CAROUSELSERVICES_LIBRARY CarouselServices +- PATHS ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks) ++ PATHS ${_CMAKE_OSX_SYSROOT_PATH}/System/Library/PrivateFrameworks) + endif() + + if(NOT BACKBOARD_LIBRARY) +@@ -158,7 +158,7 @@ endif() + + add_definitions(-DLLDB_USE_OS_LOG) + +-if(${CMAKE_OSX_SYSROOT} MATCHES ".Internal.sdk$") ++if(${_CMAKE_OSX_SYSROOT_PATH} MATCHES ".Internal.sdk$") + message(STATUS "LLDB debugserver energy support is enabled") + add_definitions(-DLLDB_ENERGY) + set(ENERGY_LIBRARY -lpmenergy -lpmsample) +@@ -181,7 +181,7 @@ endif() + separate_arguments(MIG_ARCH_FLAGS_SEPARTED NATIVE_COMMAND "${MIG_ARCH_FLAGS}") + + add_custom_command(OUTPUT ${generated_mach_interfaces} +- VERBATIM COMMAND mig ${MIG_ARCH_FLAGS_SEPARTED} -isysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CURRENT_SOURCE_DIR}/MacOSX/dbgnub-mig.defs ++ VERBATIM COMMAND mig ${MIG_ARCH_FLAGS_SEPARTED} -isysroot ${_CMAKE_OSX_SYSROOT_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/MacOSX/dbgnub-mig.defs + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/MacOSX/dbgnub-mig.defs + ) + +@@ -305,7 +305,7 @@ if(APPLE_EMBEDDED) + WITH_BKS + ) + set_property(TARGET lldbDebugserverCommon APPEND PROPERTY COMPILE_FLAGS +- -F${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks ++ -F${_CMAKE_OSX_SYSROOT_PATH}/System/Library/PrivateFrameworks + ) + + add_lldb_library(lldbDebugserverCommon_NonUI ${lldbDebugserverCommonSources}) +diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt +index 6127b76db0..0a810db531 100644 +--- a/llvm/test/CMakeLists.txt ++++ b/llvm/test/CMakeLists.txt +@@ -33,6 +33,7 @@ configure_lit_site_cfg( + MAIN_CONFIG + ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py + PATHS ++ "_CMAKE_OSX_SYSROOT_PATH" + "CMAKE_OSX_SYSROOT" + "LLVM_SOURCE_DIR" + "LLVM_BINARY_DIR" diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 1d10911aff89e9..7764357a6dbb3b 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( 79694.patch # [SEH] Ignore EH pad check for internal intrinsics #79694 82407.patch # [Clang][Sema] Fix incorrect rejection default construction of union with nontrivial member #82407 add-include-chrono.patch # https://github.com/llvm/llvm-project/pull/118059 + cmake4.patch ) vcpkg_check_features( diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 9bd2cb8a414d4c..3c7ee6e2d534d5 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "18.1.6", - "port-version": 4, + "port-version": 5, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0 WITH LLVM-exception", diff --git a/ports/msquic/cmake4.patch b/ports/msquic/cmake4.patch new file mode 100644 index 00000000000000..e4952428770232 --- /dev/null +++ b/ports/msquic/cmake4.patch @@ -0,0 +1,12 @@ +diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt +index b0f0e2d1ee..1fa98fa430 100644 +--- a/submodules/CMakeLists.txt ++++ b/submodules/CMakeLists.txt +@@ -257,7 +257,6 @@ else() + message(ERROR "WTF ${CX_PLATFORM} ${CMAKE_TARGET_ARCHITECTURE}") + set(OPENSSL_CONFIG_CMD ${CMAKE_CURRENT_SOURCE_DIR}/${QUIC_OPENSSL}/config) + endif() +- list(APPEND OPENSSL_CONFIG_FLAGS -isysroot ${CMAKE_OSX_SYSROOT}) + if(SDK_NAME) + list(APPEND OPENSSL_CONFIG_FLAGS "-m${SDK_NAME}-version-min=${DEPLOYMENT_TARGET}") + elseif(CMAKE_OSX_DEPLOYMENT_TARGET) diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake index 3304cfa2bd2ea3..a4b8926c9b2228 100644 --- a/ports/msquic/portfile.cmake +++ b/ports/msquic/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( exports-for-msh3.diff no-werror.patch avoid-w-invalid-unevaluated-string.patch + cmake4.patch ) set(QUIC_TLS "schannel") diff --git a/ports/msquic/vcpkg.json b/ports/msquic/vcpkg.json index 9738a759689b31..c9ba094c2e9229 100644 --- a/ports/msquic/vcpkg.json +++ b/ports/msquic/vcpkg.json @@ -1,6 +1,7 @@ { "name": "msquic", "version": "2.4.8", + "port-version": 1, "description": "Cross-platform, C implementation of the IETF QUIC protocol", "homepage": "https://github.com/microsoft/msquic", "license": "MIT", diff --git a/ports/nanogui/cmake4.patch b/ports/nanogui/cmake4.patch new file mode 100644 index 00000000000000..479520fbfd7803 --- /dev/null +++ b/ports/nanogui/cmake4.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 22dc16fc59..894fcce2ad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -116,7 +116,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES " + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") + endif() + +-if (CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang|Intel)$") ++if (CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang|Intel)$") + CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG) + CHECK_CXX_COMPILER_FLAG("-std=c++11" HAS_CPP11_FLAG) + +@@ -131,7 +131,7 @@ endif() + + # Various optimizations for shared library release builds + if (NANOGUI_BUILD_SHARED) +- if (U_CMAKE_BUILD_TYPE MATCHES REL AND CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang)$") ++ if (U_CMAKE_BUILD_TYPE MATCHES REL AND CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$") + # Set the default symbol visibility to hidden + if (NOT CMAKE_CXX_FLAGS MATCHES "-fvisibility") + set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}") diff --git a/ports/nanogui/portfile.cmake b/ports/nanogui/portfile.cmake index 5cc5fc86511124..cc7e5c5481bf2c 100644 --- a/ports/nanogui/portfile.cmake +++ b/ports/nanogui/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( fix-cmakelists.patch fix-glad-dependence.patch fix-release-build.patch + cmake4.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/nanogui/vcpkg.json b/ports/nanogui/vcpkg.json index 65f6eb91392e84..174a4fae519d38 100644 --- a/ports/nanogui/vcpkg.json +++ b/ports/nanogui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanogui", "version-date": "2019-09-23", - "port-version": 6, + "port-version": 7, "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", "homepage": "https://github.com/wjakob/nanogui", "license": "BSD-3-Clause", diff --git a/ports/ogre/cmake4.patch b/ports/ogre/cmake4.patch new file mode 100644 index 00000000000000..993f9a422f5315 --- /dev/null +++ b/ports/ogre/cmake4.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 15edbe3917..206d532ddb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,11 +46,6 @@ endif() + if (APPLE AND NOT ANDROID AND NOT EMSCRIPTEN AND NOT ANDROID_PLATFORM) + SET(CMAKE_SIZEOF_VOID_P 4) + +- if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") +- enable_language(OBJC) +- enable_language(OBJCXX) +- endif() +- + if(POLICY CMP0068) + cmake_policy(SET CMP0068 NEW) # CMake 3.9+: `RPATH` settings on macOS do not affect `install_name`. + endif() +@@ -65,6 +60,13 @@ endif () + + project(OGRE VERSION 14.3.2) + ++if (APPLE AND NOT ANDROID AND NOT EMSCRIPTEN AND NOT ANDROID_PLATFORM) ++ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") ++ enable_language(OBJC) ++ enable_language(OBJCXX) ++ endif() ++endif() ++ + # extra version info + set(OGRE_VERSION_SUFFIX "") + set(OGRE_VERSION_NAME "Tsathoggua") diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index b64c34178278f7..41830bd5c22197 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( swig-python-polyfill.patch pkgconfig.patch same-install-rules-all-platforms.patch + cmake4.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 1b8f197b5fdf50..69badf42139396 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ogre", "version": "14.3.2", + "port-version": 1, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", diff --git a/ports/ois/0002-fix-cmake4.patch b/ports/ois/0002-fix-cmake4.patch new file mode 100644 index 00000000000000..55c65890eadf1d --- /dev/null +++ b/ports/ois/0002-fix-cmake4.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f65b86000d..c06b1dd64d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,8 +188,7 @@ endif() + if(UNIX) + + if (NOT APPLE) +- add_dependencies(OIS X11) +- target_link_libraries(OIS X11) ++ target_link_libraries(OIS X11::X11) + endif() + + set_target_properties(OIS PROPERTIES diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index e7b5d2bce00fca..7213bbd7e72272 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001_install_pkgconfig_win32.patch + 0002-fix-cmake4.patch ) vcpkg_cmake_configure( diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index c73ac9131e911c..64715bfbf94cd0 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ois", "version": "1.5.1", - "port-version": 1, + "port-version": 2, "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/", "license": "Zlib", diff --git a/ports/opencv2/0010-fix-cmake4.patch b/ports/opencv2/0010-fix-cmake4.patch new file mode 100644 index 00000000000000..cbe3a9a2047692 --- /dev/null +++ b/ports/opencv2/0010-fix-cmake4.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 940a018373..0e84287be9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,11 +48,6 @@ if(POLICY CMP0026) + cmake_policy(SET CMP0026 NEW) + endif() + +-if (POLICY CMP0042) +- # silence cmake 3.0+ warnings about MACOSX_RPATH +- cmake_policy(SET CMP0042 OLD) +-endif() +- + # must go before the project command + set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) + if(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8") +diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake +index 23d493dd13..090ad4e362 100644 +--- a/cmake/OpenCVDetectCXXCompiler.cmake ++++ b/cmake/OpenCVDetectCXXCompiler.cmake +@@ -5,11 +5,11 @@ if(CMAKE_CL_64) + set(MSVC64 1) + endif() + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC) + set(CMAKE_COMPILER_IS_GNUCXX 1) + set(CMAKE_COMPILER_IS_CLANGCXX 1) + endif() +-if(CMAKE_C_COMPILER_ID STREQUAL "Clang") ++if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT MSVC) + set(CMAKE_COMPILER_IS_GNUCC 1) + set(CMAKE_COMPILER_IS_CLANGCC 1) + endif() diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 4f614d8ecf5ea4..d978fd170b4a7f 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( 0007-fix-openexr.patch 0008-missing-include.patch 0009-pkgconfig-suffix.patch + 0010-fix-cmake4.patch ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 9d0ec1355666ec..f6233584b55944 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 24, + "port-version": 25, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/outcome/files-do-not-exist.patch b/ports/outcome/files-do-not-exist.patch new file mode 100644 index 00000000000000..d1a838b118a203 --- /dev/null +++ b/ports/outcome/files-do-not-exist.patch @@ -0,0 +1,41 @@ +diff --git a/cmake/headers.cmake b/cmake/headers.cmake +index b734a78f90..48c32a7a73 100644 +--- a/cmake/headers.cmake ++++ b/cmake/headers.cmake +@@ -22,36 +22,10 @@ set(outcome_HEADERS + "include/outcome/detail/trait_std_exception.hpp" + "include/outcome/detail/value_storage.hpp" + "include/outcome/detail/version.hpp" + "include/outcome/experimental/coroutine_support.hpp" + "include/outcome/experimental/result.h" +- "include/outcome/experimental/status-code/include/status-code/boost_error_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/com_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/config.hpp" +- "include/outcome/experimental/status-code/include/status-code/detail/nt_code_to_generic_code.ipp" +- "include/outcome/experimental/status-code/include/status-code/detail/nt_code_to_win32_code.ipp" +- "include/outcome/experimental/status-code/include/status-code/detail/win32_code_to_generic_code.ipp" +- "include/outcome/experimental/status-code/include/status-code/error.hpp" +- "include/outcome/experimental/status-code/include/status-code/errored_status_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/generic_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/getaddrinfo_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/http_status_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/iostream_support.hpp" +- "include/outcome/experimental/status-code/include/status-code/nested_status_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/nt_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/posix_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/quick_status_code_from_enum.hpp" +- "include/outcome/experimental/status-code/include/status-code/result.hpp" +- "include/outcome/experimental/status-code/include/status-code/status_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/status_code_domain.hpp" +- "include/outcome/experimental/status-code/include/status-code/status_error.hpp" +- "include/outcome/experimental/status-code/include/status-code/std_error_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/system_code.hpp" +- "include/outcome/experimental/status-code/include/status-code/system_code_from_exception.hpp" +- "include/outcome/experimental/status-code/include/status-code/system_error2.hpp" +- "include/outcome/experimental/status-code/include/status-code/win32_code.hpp" +- "include/outcome/experimental/status-code/single-header/system_error2.hpp" + "include/outcome/experimental/status_outcome.hpp" + "include/outcome/experimental/status_result.hpp" + "include/outcome/iostream_support.hpp" + "include/outcome/outcome.hpp" + "include/outcome/outcome.natvis" diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index fb770828fb836d..2dc3e25783ddd7 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -29,6 +29,7 @@ vcpkg_from_github( HEAD_REF develop PATCHES fix-status-code-path.patch + files-do-not-exist.patch ) # Because outcome's deployed files are header-only, the debug build is not necessary diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 47cb2644a6657c..abe4a880f4662d 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,6 +1,7 @@ { "name": "outcome", "version": "2.2.12", + "port-version": 1, "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 8a41bc4044d328..493bbe956252d1 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -159,7 +159,6 @@ set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams}) # Finally invoke physx's CMake to configure the PhysX project vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" - GENERATOR "${generator}" WINDOWS_USE_MSBUILD OPTIONS -DCMAKE_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index dc3913c0679177..87363722db0d56 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "physx", "version": "5.5.0", + "port-version": 1, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port is NOT officially supported by NVIDIA.", "homepage": "https://github.com/NVIDIA-Omniverse/PhysX", "license": "BSD-3-Clause", diff --git a/ports/qca/0004-fix-cmake4.patch b/ports/qca/0004-fix-cmake4.patch new file mode 100644 index 00000000000000..747bc9c59cb89c --- /dev/null +++ b/ports/qca/0004-fix-cmake4.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a1680f..9a70ccd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,10 +15,6 @@ set(QCA_LIB_MAJOR_VERSION "2") + set(QCA_LIB_MINOR_VERSION "3") + set(QCA_LIB_PATCH_VERSION "7") + +-if(POLICY CMP0042) +- cmake_policy(SET CMP0042 OLD) +-endif() +- + option(BUILD_WITH_QT6 "Build with Qt 6" OFF) + option(BUILD_TESTS "Create test" ON) + option(BUILD_TOOLS "Compile mozcerts and qcatool" ON) diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 5a6d83a8983327..ab3ea4a483a983 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( 0001-fix-path-for-vcpkg.patch 0002-fix-build-error.patch 0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch + 0004-fix-cmake4.patch ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index b786720068f244..4861e32e40737e 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qca", "version": "2.3.7", - "port-version": 3, + "port-version": 4, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ diff --git a/ports/salome-configuration/cmake-4.patch b/ports/salome-configuration/cmake-4.patch new file mode 100644 index 00000000000000..d70aff6dae3809 --- /dev/null +++ b/ports/salome-configuration/cmake-4.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake +index bb38859ee9..3b7662dcae 100644 +--- a/cmake/SalomeMacros.cmake ++++ b/cmake/SalomeMacros.cmake +@@ -23,9 +23,6 @@ + # Set-up global policies + #---------------------------------------------------------------------------- + CMAKE_POLICY(SET CMP0003 NEW) # Ensure proper linker behavior +-IF(WIN32) +- CMAKE_POLICY(SET CMP0020 OLD) # Disable automatic linking to qtmain.lib +-ENDIF(WIN32) + CMAKE_POLICY(SET CMP0053 NEW) # For correct Qt 5 detection procedure + IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) + CMAKE_POLICY(SET CMP0074 NEW) # Use ROOT variables when detecting packages diff --git a/ports/salome-configuration/portfile.cmake b/ports/salome-configuration/portfile.cmake index d7c9faa88185bf..ba9b41749c3944 100644 --- a/ports/salome-configuration/portfile.cmake +++ b/ports/salome-configuration/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF "V${UNDERSCORE_VERSION}" SHA512 e905a0f1e1105f5a630153036b80942032ccc07fad411d390e4da19d56561e224ac2ac681873b97d811d33ce4b0c9518ce3488b54414a42e011c39628d8e1673 HEAD_REF master + PATCHES + cmake-4.patch ) file(COPY "${SOURCE_PATH_CONFIG}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/salome-configuration/vcpkg.json b/ports/salome-configuration/vcpkg.json index 33b3d3fff9e887..393cc926214465 100644 --- a/ports/salome-configuration/vcpkg.json +++ b/ports/salome-configuration/vcpkg.json @@ -1,7 +1,7 @@ { "name": "salome-configuration", "version": "9.10.0", - "port-version": 1, + "port-version": 2, "description": "Configuration files and other utilities for SALOME platform", "homepage": "https://www.salome-platform.org", "license": "LGPL-2.1-or-later", diff --git a/ports/sdl2pp/fix-dependencies.patch b/ports/sdl2pp/fix-dependencies.patch index ca680b4f2e6700..3bed05c0998859 100644 --- a/ports/sdl2pp/fix-dependencies.patch +++ b/ports/sdl2pp/fix-dependencies.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index cdfd2a6..dc08748 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,10 +23,25 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) +@@ -23,10 +23,27 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # depends FIND_PACKAGE(SDL2 REQUIRED) @@ -16,6 +16,7 @@ index cdfd2a6..dc08748 100644 +ENDIF() SET(SDL2_ALL_PKGCONFIG_MODULES sdl2) -SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY}) ++if(TARGET SDL2::SDL2main) +set(SDL2PP_EXTRA_LIBRARIES SDL2::SDL2main) +get_target_property(SDL2_MAIN_LIBRARY_DEBUG SDL2::SDL2main IMPORTED_LOCATION_DEBUG) +get_target_property(SDL2_MAIN_LIBRARY_RELEASE SDL2::SDL2main IMPORTED_LOCATION_RELEASE) @@ -27,6 +28,7 @@ index cdfd2a6..dc08748 100644 +set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_RELEASE}") +elseif(SDL2_MAIN_LIBRARY_GENERAL) +set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_GENERAL}") ++endif() +endif() SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY}) diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json index dd910dc113ef7c..9bdd70ef61fcdb 100644 --- a/ports/sdl2pp/vcpkg.json +++ b/ports/sdl2pp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 11, + "port-version": 12, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", "license": "Zlib", diff --git a/ports/sentry-native/fix-cmake4.patch b/ports/sentry-native/fix-cmake4.patch new file mode 100644 index 00000000000000..74664c2778f40c --- /dev/null +++ b/ports/sentry-native/fix-cmake4.patch @@ -0,0 +1,24 @@ +diff --git a/external/crashpad/util/CMakeLists.txt b/external/crashpad/util/CMakeLists.txt +index ef066fb9b1..4a96a8386b 100644 +--- a/external/crashpad/util/CMakeLists.txt ++++ b/external/crashpad/util/CMakeLists.txt +@@ -407,7 +407,7 @@ if(APPLE) + foreach(x ${def_relative_files}) + # CMAKE_OSX_SYSROOT may be empty (e.g. for Makefile generators), + # in this case files will be taken from root. +- set(full_path "${CMAKE_OSX_SYSROOT}/usr/include/mach/${x}") ++ set(full_path "${_CMAKE_OSX_SYSROOT_PATH}/usr/include/mach/${x}") + if(NOT EXISTS "${full_path}") + message(FATAL_ERROR "File not found: ${full_path}") + endif() +@@ -438,8 +438,8 @@ if(APPLE) + endif() + list(TRANSFORM includes PREPEND "--include=") + +- if(CMAKE_OSX_SYSROOT) +- set(sdk --sdk ${CMAKE_OSX_SYSROOT}) ++ if(_CMAKE_OSX_SYSROOT_PATH) ++ set(sdk --sdk ${_CMAKE_OSX_SYSROOT_PATH}) + endif() + + # When building for Xcode, the `CMAKE_OSX_SYSROOT` is not set to a proper diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 13ab809d110c5c..4d4f938fd12bbb 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive( PATCHES fix-crashpad-wer.patch fix-usage-runtime.patch + fix-cmake4.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/external/crashpad/third_party/zlib/zlib") diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 32e077a0b1ed54..6fcf4621f11ceb 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sentry-native", "version": "0.10.0", + "port-version": 1, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/ports/spaceland/fix-cmake4.patch b/ports/spaceland/fix-cmake4.patch new file mode 100644 index 00000000000000..404d04a5784b57 --- /dev/null +++ b/ports/spaceland/fix-cmake4.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fb062c7e4..5a93a8c4c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -211,7 +211,7 @@ ADD_CUSTOM_TARGET(uninstall + # Compiler dependent definitions + + +-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") ++if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang") + # using Clang + MESSAGE("-- Current build compiler is Clang") + ADD_DEFINITIONS(-D_ISOC9X_SOURCE) diff --git a/ports/spaceland/portfile.cmake b/ports/spaceland/portfile.cmake index 0c3ab97401b889..f3f20698e60bce 100644 --- a/ports/spaceland/portfile.cmake +++ b/ports/spaceland/portfile.cmake @@ -9,7 +9,9 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES include_functional.patch + PATCHES + include_functional.patch + fix-cmake4.patch ) vcpkg_cmake_configure( diff --git a/ports/spaceland/vcpkg.json b/ports/spaceland/vcpkg.json index fcdf3eb40830cf..21bc11d20af444 100644 --- a/ports/spaceland/vcpkg.json +++ b/ports/spaceland/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spaceland", "version": "7.8.2", - "port-version": 10, + "port-version": 11, "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.", "dependencies": [ { diff --git a/ports/torch-th/fix-cmake4.patch b/ports/torch-th/fix-cmake4.patch new file mode 100644 index 00000000000000..e3f9e1ba8bb1b8 --- /dev/null +++ b/ports/torch-th/fix-cmake4.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f3d1d4785d..e17b084ad2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,10 +1,4 @@ +-IF(APPLE) +- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) +- CMAKE_POLICY(VERSION 2.8.12) +-ELSE() +- CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) +- CMAKE_POLICY(VERSION 2.8) +-ENDIF() ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) + + SET(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake" +diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt +index 7db876be41..66b5f49d84 100644 +--- a/lib/TH/CMakeLists.txt ++++ b/lib/TH/CMakeLists.txt +@@ -1,10 +1,5 @@ + cmake_minimum_required(VERSION 2.6) + +-# avoid some cmake warnings +-IF(POLICY CMP0026) +- CMAKE_POLICY(SET CMP0026 OLD) +-ENDIF() +- + SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) + SET(CMAKE_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ ${CMAKE_LIBRARY_PATH}) + +@@ -497,10 +492,11 @@ IF (BLAS_FOUND AND BLAS_INSTALL_LIBRARIES) + ENDIF() + + # Create THConfig.cmake ++if(0) +-GET_TARGET_PROPERTY(TH_OUTPUT_NAME TH LOCATION) + GET_FILENAME_COMPONENT(TH_OUTPUT_NAME ${TH_OUTPUT_NAME} NAME) + SET(TH_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${TH_INSTALL_LIB_SUBDIR}/${TH_OUTPUT_NAME}") + SET(TH_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${TH_INSTALL_INCLUDE_SUBDIR}/TH") + CONFIGURE_FILE(THConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/THConfig.cmake") + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake-exports/THConfig.cmake" + DESTINATION "${TH_INSTALL_CMAKE_SUBDIR}") ++endif() +\ No newline at end of file diff --git a/ports/torch-th/portfile.cmake b/ports/torch-th/portfile.cmake index 5850724e8fcf2f..6b75bbac34372d 100644 --- a/ports/torch-th/portfile.cmake +++ b/ports/torch-th/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES debug.patch fix-arm64-osx-config.patch + fix-cmake4.patch # Note: The portfile currently deletes all cmake files ) vcpkg_cmake_configure( diff --git a/ports/torch-th/vcpkg.json b/ports/torch-th/vcpkg.json index a2da610f09bc3e..6cec9982c7bb28 100644 --- a/ports/torch-th/vcpkg.json +++ b/ports/torch-th/vcpkg.json @@ -1,7 +1,7 @@ { "name": "torch-th", "version-date": "2019-04-19", - "port-version": 4, + "port-version": 5, "description": "Torch's TH library", "homepage": "https://github.com/torch/torch7", "license": "BSD-3-Clause", diff --git a/ports/x265/fix-cmake-4.patch b/ports/x265/fix-cmake-4.patch new file mode 100644 index 00000000000000..88742659f496e3 --- /dev/null +++ b/ports/x265/fix-cmake-4.patch @@ -0,0 +1,39 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 8a9ec44542..54f000c6d4 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -1,4 +1,5 @@ + # vim: syntax=cmake ++cmake_minimum_required (VERSION 3.10) + if(NOT CMAKE_BUILD_TYPE) + # default to Release build for GCC builds + set(CMAKE_BUILD_TYPE Release CACHE STRING +@@ -6,18 +7,9 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") +-if(POLICY CMP0025) +- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang +-endif() +-if(POLICY CMP0042) +- cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH +-endif() +-if(POLICY CMP0054) +- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted +-endif() + + project (x265) +-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8 ++ + include(CheckIncludeFiles) + include(CheckFunctionExists) + include(CheckSymbolExists) +@@ -171,7 +163,7 @@ if(APPLE) + add_definitions(-DMACOS=1) + endif() + +-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") ++if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + set(CLANG 1) + endif() + if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 83fad41a5f1eeb..7609049e8ae34e 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_bitbucket( pthread.diff compiler-target.diff neon.diff + fix-cmake-4.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json index d8a599aad45c3f..2559f355909ac2 100644 --- a/ports/x265/vcpkg.json +++ b/ports/x265/vcpkg.json @@ -1,6 +1,7 @@ { "name": "x265", "version": "4.1", + "port-version": 1, "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", "homepage": "https://bitbucket.org/multicoreware/x265_git/", "license": "GPL-2.0-or-later", diff --git a/ports/yajl/fix_cmake_4.patch b/ports/yajl/fix_cmake_4.patch new file mode 100644 index 00000000000000..ed01ff6fee92f0 --- /dev/null +++ b/ports/yajl/fix_cmake_4.patch @@ -0,0 +1,45 @@ +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index 52a9bee8a6..0e826a14cf 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -35,9 +35,4 @@ IF (NOT WIN32) + ENDIF (NOT WIN32) + + # copy the binary into the output directory +-GET_TARGET_PROPERTY(binPath json_reformat LOCATION) +- +-ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) +- + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 05596be9e0..5bd41da522 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -67,10 +67,7 @@ CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc) + FOREACH (header ${PUB_HDRS}) + SET (header ${CMAKE_CURRENT_SOURCE_DIR}/${header}) + +- EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) +- +- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) ++ file(COPY "${header}" DESTINATION "${incDir}") + ENDFOREACH (header ${PUB_HDRS}) + + INCLUDE_DIRECTORIES(${incDir}/..) +diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt +index 967fca1607..85fd080207 100644 +--- a/verify/CMakeLists.txt ++++ b/verify/CMakeLists.txt +@@ -28,10 +28,4 @@ ADD_EXECUTABLE(json_verify ${SRCS}) + + TARGET_LINK_LIBRARIES(json_verify yajl_s) + +-# copy in the binary +-GET_TARGET_PROPERTY(binPath json_verify LOCATION) +- +-ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) +- + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) diff --git a/ports/yajl/portfile.cmake b/ports/yajl/portfile.cmake index 43783a70896e61..89097ba0230908 100644 --- a/ports/yajl/portfile.cmake +++ b/ports/yajl/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF a0ecdde0c042b9256170f2f8890dd9451a4240aa #2.1.0 SHA512 cf0279fdbdc21d07bc0f2d409f1dddb39fd2ad62ab9872e620f46de4753958f8c59e44ef2ee734547f0f25f9490bada8c9e97dcc1a4b14b25d3e7a7254f8e1f3 HEAD_REF master - PATCHES cmake.patch + PATCHES + cmake.patch + fix_cmake_4.patch ) vcpkg_cmake_configure( diff --git a/ports/yajl/vcpkg.json b/ports/yajl/vcpkg.json index 03c8bca942b80c..c68354fb5cbfa4 100644 --- a/ports/yajl/vcpkg.json +++ b/ports/yajl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "yajl", "version": "2.1.0", - "port-version": 4, + "port-version": 5, "description": "Yet Another JSON Library", "homepage": "https://github.com/lloyd/yajl", "license": "ISC", diff --git a/ports/yasm/cmake.patch b/ports/yasm/cmake.patch new file mode 100644 index 00000000000000..204fc32c76638b --- /dev/null +++ b/ports/yasm/cmake.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8df871cf74..bb7a879f81 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,8 +1,8 @@ +-PROJECT(yasm) + CMAKE_MINIMUM_REQUIRED(VERSION 2.4) + if (COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) + endif (COMMAND cmake_policy) ++PROJECT(yasm) + + OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) + +diff --git a/cmake/modules/YasmMacros.cmake b/cmake/modules/YasmMacros.cmake +index 918f51b844..db61eeae51 100644 +--- a/cmake/modules/YasmMacros.cmake ++++ b/cmake/modules/YasmMacros.cmake +@@ -58,37 +58,37 @@ macro (YASM_ADD_MODULE _module_NAME) + endmacro (YASM_ADD_MODULE) + + macro (YASM_GENPERF _in_NAME _out_NAME) + if (NOT _tmp_GENPERF_EXE) +- get_target_property(_tmp_GENPERF_EXE genperf LOCATION) ++ set(_tmp_GENPERF_EXE genperf) + endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_GENPERF_EXE} ${_in_NAME} ${_out_NAME} + DEPENDS ${_tmp_GENPERF_EXE} + MAIN_DEPENDENCY ${_in_NAME} + ) + endmacro (YASM_GENPERF) + + macro (YASM_RE2C _in_NAME _out_NAME) + if (NOT _tmp_RE2C_EXE) +- get_target_property(_tmp_RE2C_EXE re2c LOCATION) ++ set(_tmp_RE2C_EXE re2c) + endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_RE2C_EXE} ${ARGN} -o ${_out_NAME} ${_in_NAME} + DEPENDS ${_tmp_RE2C_EXE} + MAIN_DEPENDENCY ${_in_NAME} + ) + endmacro (YASM_RE2C) + + macro (YASM_GENMACRO _in_NAME _out_NAME _var_NAME) + if (NOT _tmp_GENMACRO_EXE) +- get_target_property(_tmp_GENMACRO_EXE genmacro LOCATION) ++ set(_tmp_GENMACRO_EXE genmacro) + endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_GENMACRO_EXE} ${_out_NAME} ${_var_NAME} ${_in_NAME} + DEPENDS ${_tmp_GENMACRO_EXE} + MAIN_DEPENDENCY ${_in_NAME} + ) + endmacro (YASM_GENMACRO) +diff --git a/modules/preprocs/nasm/CMakeLists.txt b/modules/preprocs/nasm/CMakeLists.txt +index e28ffbb212..fdd512346d 100644 +--- a/modules/preprocs/nasm/CMakeLists.txt ++++ b/modules/preprocs/nasm/CMakeLists.txt +@@ -1,12 +1,12 @@ + if (NOT _tmp_GENVERSION_EXE) + add_executable(genversion preprocs/nasm/genversion.c) + install(TARGETS genversion RUNTIME DESTINATION bin) +-get_target_property(_tmp_GENVERSION_EXE genversion LOCATION) ++set(_tmp_GENVERSION_EXE genversion) + endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.mac + COMMAND ${_tmp_GENVERSION_EXE} ${CMAKE_CURRENT_BINARY_DIR}/version.mac + DEPENDS ${_tmp_GENVERSION_EXE} + ) + + YASM_GENMACRO( diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 3cf4099311f1c0..555364ae87f16f 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( cmake-4.diff fix-cross-build.patch fix-overlay-pdb.patch + cmake.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json index 7393149b2f6c01..7d5000597c80ba 100644 --- a/ports/yasm/vcpkg.json +++ b/ports/yasm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "yasm", "version": "1.3.0", - "port-version": 7, + "port-version": 8, "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only", diff --git a/ports/zkpp/CMakeLists.txt b/ports/zkpp/CMakeLists.txt index f0b5c602390421..4cc6c78cbf633a 100644 --- a/ports/zkpp/CMakeLists.txt +++ b/ports/zkpp/CMakeLists.txt @@ -23,8 +23,6 @@ message(STATUS "Software Version: ${ZKPP_VERSION}") # CMake # ################################################################################ -cmake_policy(VERSION 3.5) -cmake_policy(SET CMP0037 OLD) # allow generation of "test" target set(CMAKE_REQUIRED_QUIET YES) # tell check_include_file_cxx to keep quiet list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") diff --git a/ports/zkpp/vcpkg.json b/ports/zkpp/vcpkg.json index 8a051673a570bb..458242b4476d1b 100644 --- a/ports/zkpp/vcpkg.json +++ b/ports/zkpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zkpp", "version": "0.2.3", - "port-version": 4, + "port-version": 5, "description": "A ZooKeeper client for C++.", "homepage": "https://github.com/tgockel/zookeeper-cpp", "supports": "!windows", diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index 0b477acb822f09..e994b9913332bf 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -24,7 +24,7 @@ function(vcpkg_from_git) if(DEFINED arg_FETCH_REF AND NOT DEFINED arg_REF) message(FATAL_ERROR "REF must be specified if FETCH_REF is specified") endif() - if(NOT DEFINED arg_LFS AND "LFS" IN_LIST arg_KEYWORDS_MISSING_VALUES) + if(arg_LFS STREQUAL "" AND "LFS" IN_LIST arg_KEYWORDS_MISSING_VALUES) set(arg_LFS "${arg_URL}") endif() diff --git a/versions/baseline.json b/versions/baseline.json index a69fcce17d2882..657cc4673cd966 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1746,7 +1746,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 23 + "port-version": 24 }, "clara": { "baseline": "1.1.5", @@ -1794,7 +1794,7 @@ }, "clockutils": { "baseline": "1.1.1", - "port-version": 2 + "port-version": 3 }, "clrng": { "baseline": "2020-12-01", @@ -2618,7 +2618,7 @@ }, "ecm": { "baseline": "6.7.0", - "port-version": 0 + "port-version": 1 }, "ecos": { "baseline": "2.0.10", @@ -4094,7 +4094,7 @@ }, "jsonnet": { "baseline": "0.21.0", - "port-version": 0 + "port-version": 1 }, "juce": { "baseline": "8.0.7", @@ -4442,7 +4442,7 @@ }, "lemon-parser-generator": { "baseline": "3.39.3", - "port-version": 0 + "port-version": 1 }, "lensfun": { "baseline": "0.3.4", @@ -4562,7 +4562,7 @@ }, "libbson": { "baseline": "1.30.3", - "port-version": 0 + "port-version": 1 }, "libcaer": { "baseline": "3.3.17", @@ -4762,7 +4762,7 @@ }, "libevhtp": { "baseline": "1.2.18", - "port-version": 5 + "port-version": 6 }, "libexif": { "baseline": "0.6.25", @@ -4838,7 +4838,7 @@ }, "libgme": { "baseline": "0.6.3", - "port-version": 0 + "port-version": 1 }, "libgnutls": { "baseline": "3.8.7.1", @@ -4970,7 +4970,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 15 + "port-version": 16 }, "liblbfgs": { "baseline": "1.10", @@ -4982,7 +4982,7 @@ }, "liblemon": { "baseline": "2019-06-13", - "port-version": 9 + "port-version": 10 }, "liblinear": { "baseline": "243", @@ -5866,7 +5866,7 @@ }, "llvm": { "baseline": "18.1.6", - "port-version": 4 + "port-version": 5 }, "lmdb": { "baseline": "0.9.33", @@ -6490,7 +6490,7 @@ }, "msquic": { "baseline": "2.4.8", - "port-version": 0 + "port-version": 1 }, "mstch": { "baseline": "1.0.2", @@ -6586,7 +6586,7 @@ }, "nanogui": { "baseline": "2019-09-23", - "port-version": 6 + "port-version": 7 }, "nanojsonc": { "baseline": "1.3.0", @@ -6902,7 +6902,7 @@ }, "ogre": { "baseline": "14.3.2", - "port-version": 0 + "port-version": 1 }, "ogre-next": { "baseline": "2.3.3", @@ -6910,7 +6910,7 @@ }, "ois": { "baseline": "1.5.1", - "port-version": 1 + "port-version": 2 }, "omniorb": { "baseline": "4.3.0", @@ -7002,7 +7002,7 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 24 + "port-version": 25 }, "opencv3": { "baseline": "3.4.20", @@ -7190,7 +7190,7 @@ }, "outcome": { "baseline": "2.2.12", - "port-version": 0 + "port-version": 1 }, "p-ranav-csv": { "baseline": "2019-07-11", @@ -7350,7 +7350,7 @@ }, "physx": { "baseline": "5.5.0", - "port-version": 0 + "port-version": 1 }, "picojson": { "baseline": "1.3.0", @@ -7690,7 +7690,7 @@ }, "qca": { "baseline": "2.3.7", - "port-version": 3 + "port-version": 4 }, "qcbor": { "baseline": "1.5.3", @@ -8562,7 +8562,7 @@ }, "salome-configuration": { "baseline": "9.10.0", - "port-version": 1 + "port-version": 2 }, "salome-med-fichier": { "baseline": "4.1.1", @@ -8682,7 +8682,7 @@ }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 11 + "port-version": 12 }, "sdl3": { "baseline": "3.2.20", @@ -8726,7 +8726,7 @@ }, "sentry-native": { "baseline": "0.10.0", - "port-version": 0 + "port-version": 1 }, "septag-dmon": { "baseline": "2022-02-08", @@ -9010,7 +9010,7 @@ }, "spaceland": { "baseline": "7.8.2", - "port-version": 10 + "port-version": 11 }, "span-lite": { "baseline": "0.11.0", @@ -9670,7 +9670,7 @@ }, "torch-th": { "baseline": "2019-04-19", - "port-version": 4 + "port-version": 5 }, "tracy": { "baseline": "0.11.1", @@ -10382,7 +10382,7 @@ }, "x265": { "baseline": "4.1", - "port-version": 0 + "port-version": 1 }, "x86-simd-sort": { "baseline": "5.0", @@ -10526,7 +10526,7 @@ }, "yajl": { "baseline": "2.1.0", - "port-version": 4 + "port-version": 5 }, "yalantinglibs": { "baseline": "0.5.3", @@ -10546,7 +10546,7 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 7 + "port-version": 8 }, "yasm-tool": { "baseline": "2021-12-14", @@ -10610,7 +10610,7 @@ }, "zkpp": { "baseline": "0.2.3", - "port-version": 4 + "port-version": 5 }, "zlib": { "baseline": "1.3.1", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index fe49646fda3247..ab4fd29ceb3b7f 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "184a25decba1a211c20e298df2046b34adc9e555", + "version": "3.2.1", + "port-version": 24 + }, { "git-tree": "42a62cb53a007074bab56cc3086796b291428b4b", "version": "3.2.1", diff --git a/versions/c-/clockutils.json b/versions/c-/clockutils.json index b36b30b5def239..b5a82ce99fee9e 100644 --- a/versions/c-/clockutils.json +++ b/versions/c-/clockutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff817069188d4dc9146f7f4627e40e367f12ad64", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "a5491981971509dc1260393cea620c731aa418b0", "version": "1.1.1", diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index a94bc83deeb509..3493c7df8aa1f6 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e876677d7266faf1a354f2e90d6d79b9f1b70e5", + "version": "6.7.0", + "port-version": 1 + }, { "git-tree": "5709bdab7668ace236f37659923062c27aae0988", "version": "6.7.0", diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index d794b5d2753ab1..23ef2326043476 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a760f501796c04b20a4a8fd492bcaaa5312dbf19", + "version": "0.21.0", + "port-version": 1 + }, { "git-tree": "8f3cf70fb2bb82085e2a418387b4dc189d3809c2", "version": "0.21.0", diff --git a/versions/l-/lemon-parser-generator.json b/versions/l-/lemon-parser-generator.json index 7b49ddd2def193..2d8ae2f51689d8 100644 --- a/versions/l-/lemon-parser-generator.json +++ b/versions/l-/lemon-parser-generator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9afd998d68c29bdbc7edd43643b7dda5cfaa0b99", + "version": "3.39.3", + "port-version": 1 + }, { "git-tree": "efe39fd9654d045490a62729cba3e44840b7dd6f", "version": "3.39.3", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 3215db04cf94ba..a5095b4f910e32 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07f400236cfb59ab68a9f8a67adc810bff8e7b01", + "version": "1.30.3", + "port-version": 1 + }, { "git-tree": "de32ee59fdfe05b9b28234a3c73ddf804eae8633", "version": "1.30.3", diff --git a/versions/l-/libevhtp.json b/versions/l-/libevhtp.json index 384d6b72533d88..1a8fe3e830a75c 100644 --- a/versions/l-/libevhtp.json +++ b/versions/l-/libevhtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8020f839b63bc367a5d138e2c16f0ec934d46253", + "version": "1.2.18", + "port-version": 6 + }, { "git-tree": "21ee98ebfdc5d2b8992e13025b5d3ebdb8f91c0b", "version": "1.2.18", diff --git a/versions/l-/libgme.json b/versions/l-/libgme.json index 3c2b9a2444113e..687e3830f5940d 100644 --- a/versions/l-/libgme.json +++ b/versions/l-/libgme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24ce21e444af677ecea37ee2ff90d788054e0b00", + "version": "0.6.3", + "port-version": 1 + }, { "git-tree": "2472a6f203e9ed53baddf37ab2c075a57254d68a", "version": "0.6.3", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 2b880b90d666e8..0a44697b93b461 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5b760d509ff1efdb358f14e344c608768746e95", + "version": "1.8.1", + "port-version": 16 + }, { "git-tree": "8826214421f62064e90cedc20d62c70e338f9ba0", "version": "1.8.1", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index 55c66a4503c264..b11bbd314dbf7e 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7dacf5245415e8fb67ed80971336d39da864f4ee", + "version-date": "2019-06-13", + "port-version": 10 + }, { "git-tree": "2bf1f61e61e2ed7917a9ec102b564a6c68229d7b", "version-date": "2019-06-13", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 8fc4525804b94c..256242ae6e0517 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "680d20d34077e7f0937b68f8f9bcd22fac6bd11e", + "version": "18.1.6", + "port-version": 5 + }, { "git-tree": "de2757d5adacfd8a2d00a79278a84680d2beca11", "version": "18.1.6", diff --git a/versions/m-/msquic.json b/versions/m-/msquic.json index c68148bc711974..5cc9fba819a2f3 100644 --- a/versions/m-/msquic.json +++ b/versions/m-/msquic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cf60f2e9285c034e5129aebf659bfe18d39046d", + "version": "2.4.8", + "port-version": 1 + }, { "git-tree": "3509b90a15065b7d89109b53e179b2908dda7dda", "version": "2.4.8", diff --git a/versions/n-/nanogui.json b/versions/n-/nanogui.json index d0dbab48fb1c2f..528fcf0a603a6f 100644 --- a/versions/n-/nanogui.json +++ b/versions/n-/nanogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14e9332fbd14774a75292382f504b5c0fa4aa5b3", + "version-date": "2019-09-23", + "port-version": 7 + }, { "git-tree": "15edf616d37b31a8d07a171617608fac711a36f4", "version-date": "2019-09-23", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index c767e06df05028..fabe89fd815623 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02f0e1642a29a2b9ba7f6b5373408dfe867528f4", + "version": "14.3.2", + "port-version": 1 + }, { "git-tree": "8ebbc6dd4c3d1e066759933c9e9a290505957992", "version": "14.3.2", diff --git a/versions/o-/ois.json b/versions/o-/ois.json index 39d8df3b2b7240..c6f739ba4d5b15 100644 --- a/versions/o-/ois.json +++ b/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09bdf5d45cb89f22668fab20acd5156a3d016bc3", + "version": "1.5.1", + "port-version": 2 + }, { "git-tree": "79d79b0c5901492572044ad873cdf4df864accea", "version": "1.5.1", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index a55cbbf9036289..974b4f3039e2b6 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4be615ddf3239bab9286dce71795294baa6347a2", + "version": "2.4.13.7", + "port-version": 25 + }, { "git-tree": "cd24bcc821a685ba7e30b4abb448f283c389688e", "version": "2.4.13.7", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index b4a545413bf0d0..4d84b98836bf74 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2901c85d03a19191defb9319aebc035699182bb", + "version": "2.2.12", + "port-version": 1 + }, { "git-tree": "88de921d47cae0d3372f2f3e5aace2920839a3dc", "version": "2.2.12", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 60b6f2172ee788..cfa5d9b4b0acda 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16abda6708b257471aabf0702d2eed9f95c5e206", + "version": "5.5.0", + "port-version": 1 + }, { "git-tree": "2b50dbfa444d9f6dc81dfe858c7841891cde9b80", "version": "5.5.0", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index 01831767ebfd7b..a337e9d622ae44 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f9895a4c55a72d609dec360bb2e989dbfe4b613", + "version": "2.3.7", + "port-version": 4 + }, { "git-tree": "ea6eaf031e8b46b5ef65ea43cc0a72115d1962c1", "version": "2.3.7", diff --git a/versions/s-/salome-configuration.json b/versions/s-/salome-configuration.json index 4b4eaf83cadd89..79b2050d94a134 100644 --- a/versions/s-/salome-configuration.json +++ b/versions/s-/salome-configuration.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9e03cc22d9adc228768adcb64c2b6a9c401ca1b", + "version": "9.10.0", + "port-version": 2 + }, { "git-tree": "729c277b29f980cab19babca0dadc1a1ffb6de61", "version": "9.10.0", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index 5d05bf7234494f..30910c8a77ac91 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d7a7ab49f374da1e64de4f3ce02611bcb598bdb", + "version": "0.16.1", + "port-version": 12 + }, { "git-tree": "52a51ba0c6e4248bf4597ca6d6f839111be2fa18", "version": "0.16.1", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 610e71a8d74ed6..6d42cf40489257 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "773da13a82a0cdc98c2151b62bbb585dce3e98fa", + "version": "0.10.0", + "port-version": 1 + }, { "git-tree": "2993bfa28cbb97842e75b91889d5c174ef442e67", "version": "0.10.0", diff --git a/versions/s-/spaceland.json b/versions/s-/spaceland.json index afd0d80d43a5ad..8dbb2f5b1d61da 100644 --- a/versions/s-/spaceland.json +++ b/versions/s-/spaceland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c360e517b48147e0cc8730dd143f76dac5fd01eb", + "version": "7.8.2", + "port-version": 11 + }, { "git-tree": "b63d4ef664c1c2e13dfa609c8434b66ea9f5a3e5", "version": "7.8.2", diff --git a/versions/t-/torch-th.json b/versions/t-/torch-th.json index e4f280774ffd63..435440c05b72c4 100644 --- a/versions/t-/torch-th.json +++ b/versions/t-/torch-th.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c89a8250bd96aa24c7dbd3f3683fe5fb542952f8", + "version-date": "2019-04-19", + "port-version": 5 + }, { "git-tree": "e870a035791ae5e1dbb2c86fe94644812852ca2d", "version-date": "2019-04-19", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index 0823c25558be7b..ecb9a1644ccb6f 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60fe09f80081483ddf42bdce23d163d5a8362f98", + "version": "4.1", + "port-version": 1 + }, { "git-tree": "1339ba96a9ac2711d282d16e067b1d420ed0a9f8", "version": "4.1", diff --git a/versions/y-/yajl.json b/versions/y-/yajl.json index 74831ee23b22c5..c76045bdf80fb8 100644 --- a/versions/y-/yajl.json +++ b/versions/y-/yajl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2996da35d26420ec80baa20e069b0c9b96e783b6", + "version": "2.1.0", + "port-version": 5 + }, { "git-tree": "3f4f50d7448d28c577777c09895a93847124e1d3", "version": "2.1.0", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 4b3784e336be5a..8d86a705e1b384 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c613e028b8277981f02c08181d05185d6775870", + "version": "1.3.0", + "port-version": 8 + }, { "git-tree": "aae36f033e868ed60d6894f260e7b5ee515089b6", "version": "1.3.0", diff --git a/versions/z-/zkpp.json b/versions/z-/zkpp.json index 7265ffda3df88d..a5599d2a9a27c2 100644 --- a/versions/z-/zkpp.json +++ b/versions/z-/zkpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc435e6d2d346e9e0ae5a156c7c83e4aa5723dfe", + "version": "0.2.3", + "port-version": 5 + }, { "git-tree": "ce87f456b26d4e19568b3dcc97e2862e2ee796d8", "version": "0.2.3", From 0adb8259959ca546f54ba8fbb0e9197f3f9f422d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 15 Aug 2025 17:33:58 -0700 Subject: [PATCH 23/58] Update Windows pools again. --- scripts/azure-pipelines/windows-unstable/azure-pipelines.yml | 2 +- scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index 8009edf24fcf8e..5ec13e15e03811 100644 --- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -6,7 +6,7 @@ jobs: - job: x64_windows pool: name: vcpkg-testing-msvc - demands: ImageVersionOverride -equals 2025.08.12 + demands: ImageVersionOverride -equals 2025.08.15 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index a9bd56b6bbcaff..d55a07124c13ff 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}')) pool: name: PrWin-WUS - demands: ImageVersionOverride -equals 2025.08.12 + demands: ImageVersionOverride -equals 2025.08.15 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT From fb74bbed9c461071e199d7008f5b6863cac51f02 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 20 Aug 2025 16:54:58 -0700 Subject: [PATCH 24/58] [yasm] Revert as changes should have been applied in https://github.com/microsoft/vcpkg/pull/45856 --- ports/yasm/cmake.patch | 77 --------------------------------------- ports/yasm/portfile.cmake | 1 - ports/yasm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yasm.json | 5 --- 5 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 ports/yasm/cmake.patch diff --git a/ports/yasm/cmake.patch b/ports/yasm/cmake.patch deleted file mode 100644 index 204fc32c76638b..00000000000000 --- a/ports/yasm/cmake.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8df871cf74..bb7a879f81 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,8 +1,8 @@ --PROJECT(yasm) - CMAKE_MINIMUM_REQUIRED(VERSION 2.4) - if (COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - endif (COMMAND cmake_policy) -+PROJECT(yasm) - - OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) - -diff --git a/cmake/modules/YasmMacros.cmake b/cmake/modules/YasmMacros.cmake -index 918f51b844..db61eeae51 100644 ---- a/cmake/modules/YasmMacros.cmake -+++ b/cmake/modules/YasmMacros.cmake -@@ -58,37 +58,37 @@ macro (YASM_ADD_MODULE _module_NAME) - endmacro (YASM_ADD_MODULE) - - macro (YASM_GENPERF _in_NAME _out_NAME) - if (NOT _tmp_GENPERF_EXE) -- get_target_property(_tmp_GENPERF_EXE genperf LOCATION) -+ set(_tmp_GENPERF_EXE genperf) - endif() - add_custom_command( - OUTPUT ${_out_NAME} - COMMAND ${_tmp_GENPERF_EXE} ${_in_NAME} ${_out_NAME} - DEPENDS ${_tmp_GENPERF_EXE} - MAIN_DEPENDENCY ${_in_NAME} - ) - endmacro (YASM_GENPERF) - - macro (YASM_RE2C _in_NAME _out_NAME) - if (NOT _tmp_RE2C_EXE) -- get_target_property(_tmp_RE2C_EXE re2c LOCATION) -+ set(_tmp_RE2C_EXE re2c) - endif() - add_custom_command( - OUTPUT ${_out_NAME} - COMMAND ${_tmp_RE2C_EXE} ${ARGN} -o ${_out_NAME} ${_in_NAME} - DEPENDS ${_tmp_RE2C_EXE} - MAIN_DEPENDENCY ${_in_NAME} - ) - endmacro (YASM_RE2C) - - macro (YASM_GENMACRO _in_NAME _out_NAME _var_NAME) - if (NOT _tmp_GENMACRO_EXE) -- get_target_property(_tmp_GENMACRO_EXE genmacro LOCATION) -+ set(_tmp_GENMACRO_EXE genmacro) - endif() - add_custom_command( - OUTPUT ${_out_NAME} - COMMAND ${_tmp_GENMACRO_EXE} ${_out_NAME} ${_var_NAME} ${_in_NAME} - DEPENDS ${_tmp_GENMACRO_EXE} - MAIN_DEPENDENCY ${_in_NAME} - ) - endmacro (YASM_GENMACRO) -diff --git a/modules/preprocs/nasm/CMakeLists.txt b/modules/preprocs/nasm/CMakeLists.txt -index e28ffbb212..fdd512346d 100644 ---- a/modules/preprocs/nasm/CMakeLists.txt -+++ b/modules/preprocs/nasm/CMakeLists.txt -@@ -1,12 +1,12 @@ - if (NOT _tmp_GENVERSION_EXE) - add_executable(genversion preprocs/nasm/genversion.c) - install(TARGETS genversion RUNTIME DESTINATION bin) --get_target_property(_tmp_GENVERSION_EXE genversion LOCATION) -+set(_tmp_GENVERSION_EXE genversion) - endif() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.mac - COMMAND ${_tmp_GENVERSION_EXE} ${CMAKE_CURRENT_BINARY_DIR}/version.mac - DEPENDS ${_tmp_GENVERSION_EXE} - ) - - YASM_GENMACRO( diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 555364ae87f16f..3cf4099311f1c0 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -9,7 +9,6 @@ vcpkg_from_github( cmake-4.diff fix-cross-build.patch fix-overlay-pdb.patch - cmake.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json index 7d5000597c80ba..7393149b2f6c01 100644 --- a/ports/yasm/vcpkg.json +++ b/ports/yasm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "yasm", "version": "1.3.0", - "port-version": 8, + "port-version": 7, "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index b1c325c29ec9eb..41dd373f3ee0c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10570,7 +10570,7 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 8 + "port-version": 7 }, "yasm-tool": { "baseline": "2021-12-14", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 8d86a705e1b384..4b3784e336be5a 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "4c613e028b8277981f02c08181d05185d6775870", - "version": "1.3.0", - "port-version": 8 - }, { "git-tree": "aae36f033e868ed60d6894f260e7b5ee515089b6", "version": "1.3.0", From e8d668960a02807c435751b57ccc9fc155642294 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 20 Aug 2025 17:20:54 -0700 Subject: [PATCH 25/58] [jsonnet] Regenerate patches. --- ports/jsonnet/0004-incorporate-md5.patch | 2 +- .../jsonnet/0005-use-upstream-rapidyaml.patch | 4 +- ports/jsonnet/0006-use-cxx17.patch | 40 ++--- ports/jsonnet/001-enable-msvc.patch | 163 +++++++++--------- .../002-fix-dependency-and-install.patch | 121 +++++++------ versions/j-/jsonnet.json | 2 +- 6 files changed, 164 insertions(+), 168 deletions(-) diff --git a/ports/jsonnet/0004-incorporate-md5.patch b/ports/jsonnet/0004-incorporate-md5.patch index 4ec54d8dbc24fa..2921368693e520 100644 --- a/ports/jsonnet/0004-incorporate-md5.patch +++ b/ports/jsonnet/0004-incorporate-md5.patch @@ -1,5 +1,5 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 4be4a9e..b858c08 100644 +index 2eb28d2..8116ac3 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -16,7 +16,8 @@ set(LIBJSONNET_HEADERS diff --git a/ports/jsonnet/0005-use-upstream-rapidyaml.patch b/ports/jsonnet/0005-use-upstream-rapidyaml.patch index 68c93cdbbb71b1..b47a25409eb842 100644 --- a/ports/jsonnet/0005-use-upstream-rapidyaml.patch +++ b/ports/jsonnet/0005-use-upstream-rapidyaml.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f02cba9..0c8f8ce 100644 +index 3ebf359..8562715 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -14,6 +14,7 @@ option(BUILD_STATIC_LIBS "Build a static libjsonnet." ON) +@@ -13,6 +13,7 @@ option(BUILD_STATIC_LIBS "Build a static libjsonnet." ON) option(BUILD_SHARED_BINARIES "Link binaries to the shared libjsonnet instead of the static one." OFF) option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF) option(USE_SYSTEM_JSON "Use the system-provided json library" OFF) diff --git a/ports/jsonnet/0006-use-cxx17.patch b/ports/jsonnet/0006-use-cxx17.patch index 31174021a9ed10..84791efcb1d3d2 100644 --- a/ports/jsonnet/0006-use-cxx17.patch +++ b/ports/jsonnet/0006-use-cxx17.patch @@ -1,20 +1,20 @@ -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index e8a0efa..5dfd2e4 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -34,6 +34,7 @@ if (BUILD_SHARED_BINARIES) - add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) - add_dependencies(libjsonnet stdlib) - target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml) -+target_compile_features(libjsonnet PRIVATE cxx_std_17) - - file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF - REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") -@@ -60,6 +61,7 @@ if (BUILD_STATIC_LIBS) - add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) - add_dependencies(libjsonnet_static stdlib) - target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml) -+ target_compile_features(libjsonnet_static PRIVATE cxx_std_17) - set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) - install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") - target_include_directories(libjsonnet_static INTERFACE +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 8116ac3..25cebd0 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -36,6 +36,7 @@ if (BUILD_SHARED_BINARIES) + add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet stdlib) + target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml) ++target_compile_features(libjsonnet PRIVATE cxx_std_17) + + file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF + REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") +@@ -63,6 +64,7 @@ if (BUILD_STATIC_LIBS) + add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet_static stdlib) + target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml) ++ target_compile_features(libjsonnet_static PRIVATE cxx_std_17) + set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) + install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") + target_include_directories(libjsonnet_static INTERFACE diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch index 60fdd0c5a93b9a..1e51a0a7f78285 100644 --- a/ports/jsonnet/001-enable-msvc.patch +++ b/ports/jsonnet/001-enable-msvc.patch @@ -1,83 +1,80 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd17367..f02cba9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,8 @@ - cmake_minimum_required(VERSION 2.8.7) - project(jsonnet C CXX) - -+add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ - include(ExternalProject) - include(GNUInstallDirs) - -@@ -33,6 +35,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) - - # Compiler flags. -+if(0) - if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR - ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") - set(OPT "-O3") -@@ -42,7 +45,7 @@ else() - # TODO: Windows support. - message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported") - endif() -- -+endif() - set(CMAKE_CXX_STANDARD 17) - - -diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt -index c032f02..b5db01d 100644 ---- a/cmd/CMakeLists.txt -+++ b/cmd/CMakeLists.txt -@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS) - add_dependencies(jsonnetfmt libjsonnet_for_binaries) - target_link_libraries(jsonnetfmt libjsonnet_for_binaries) - -- install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) - endif() -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 8ab3777..9e8ffe2 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -30,7 +30,7 @@ set(LIBJSONNET_SOURCE - string_utils.cpp - vm.cpp) - --add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) -+add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) - add_dependencies(libjsonnet md5 stdlib) - target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) - -@@ -49,7 +49,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet - install(TARGETS libjsonnet - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - target_include_directories(libjsonnet INTERFACE - $) -diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt -index a481d9f..d4829f8 100644 ---- a/stdlib/CMakeLists.txt -+++ b/stdlib/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Utility to convert file to a list of integeters. - - add_executable(to_c_array to_c_array.cpp) -- -+if(0) - # Custom command that will only build stdlib when it changes. - add_custom_command( - OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h -@@ -13,3 +13,4 @@ add_custom_command( - # Standard library build target that libjsonnet can depend on. - add_custom_target(stdlib ALL - DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) -+else() -+add_custom_target(stdlib) -+endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd17367..3ebf359 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,7 @@ + cmake_minimum_required(VERSION 2.8.7) + project(jsonnet C CXX) + ++add_definitions(-D_CRT_SECURE_NO_WARNINGS) + include(ExternalProject) + include(GNUInstallDirs) + +@@ -33,6 +34,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH}) + + # Compiler flags. ++if(0) + if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR + ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") + set(OPT "-O3") +@@ -43,6 +45,7 @@ else() + message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported") + endif() + ++endif() + set(CMAKE_CXX_STANDARD 17) + + +diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt +index c032f02..d80d2a0 100644 +--- a/cmd/CMakeLists.txt ++++ b/cmd/CMakeLists.txt +@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS) + add_dependencies(jsonnetfmt libjsonnet_for_binaries) + target_link_libraries(jsonnetfmt libjsonnet_for_binaries) + +- install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) + endif() +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 8ab3777..9e8ffe2 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -30,7 +30,7 @@ set(LIBJSONNET_SOURCE + string_utils.cpp + vm.cpp) + +-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) ++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet md5 stdlib) + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) + +@@ -49,7 +49,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet + install(TARGETS libjsonnet + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet INTERFACE + $) +diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt +index a481d9f..002006f 100644 +--- a/stdlib/CMakeLists.txt ++++ b/stdlib/CMakeLists.txt +@@ -2,6 +2,7 @@ + + add_executable(to_c_array to_c_array.cpp) + ++if(0) + # Custom command that will only build stdlib when it changes. + add_custom_command( + OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h +@@ -13,3 +14,6 @@ add_custom_command( + # Standard library build target that libjsonnet can depend on. + add_custom_target(stdlib ALL + DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) ++else() ++add_custom_target(stdlib) ++endif() diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch index 38d515a2e87950..7a97939153e91b 100644 --- a/ports/jsonnet/002-fix-dependency-and-install.patch +++ b/ports/jsonnet/002-fix-dependency-and-install.patch @@ -1,61 +1,60 @@ -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 9e8ffe2..4be4a9e 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -30,6 +30,7 @@ set(LIBJSONNET_SOURCE - string_utils.cpp - vm.cpp) - -+if (BUILD_SHARED_BINARIES) - add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) - add_dependencies(libjsonnet md5 stdlib) - target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) -@@ -53,6 +54,7 @@ install(TARGETS libjsonnet - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - target_include_directories(libjsonnet INTERFACE - $) -+endif() - - if (BUILD_STATIC_LIBS) - # Static library for jsonnet command-line tool. -@@ -112,3 +114,5 @@ if (BUILD_TESTS) - add_test(jsonnet_test_snippet - ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET}) - endif() -+ -+install(FILES ${LIB_HEADER} DESTINATION include) -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 153a4a1..9b37ef4 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -8,8 +8,8 @@ set(LIBJSONNETPP_SOURCE - libjsonnet++.cpp - ) - -+if (BUILD_SHARED_BINARIES) - add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) --add_dependencies(libjsonnet++ jsonnet) - target_link_libraries(libjsonnet++ libjsonnet) - - # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without -@@ -25,6 +25,7 @@ install(TARGETS libjsonnet++ - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - target_include_directories(libjsonnet++ INTERFACE - $) -+endif() - - if (BUILD_STATIC_LIBS) - # Static library for jsonnet command-line tool. - add_library(libjsonnet++_static STATIC ${LIBJSONNETPP_SOURCE}) -- add_dependencies(libjsonnet++_static jsonnet) - target_link_libraries(libjsonnet++_static libjsonnet_static) - set_target_properties(libjsonnet++_static PROPERTIES OUTPUT_NAME jsonnet++) - install(TARGETS libjsonnet++_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") -@@ -43,6 +44,7 @@ else() - add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static) - endif() - -+install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include) - # Tests - function(add_test_executablepp test_name) - if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp) +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 9e8ffe2..2eb28d2 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -30,6 +30,7 @@ set(LIBJSONNET_SOURCE + string_utils.cpp + vm.cpp) + ++if (BUILD_SHARED_BINARIES) + add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet md5 stdlib) + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) +@@ -53,6 +54,7 @@ install(TARGETS libjsonnet + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet INTERFACE + $) ++endif() + + if (BUILD_STATIC_LIBS) + # Static library for jsonnet command-line tool. +@@ -112,3 +114,4 @@ if (BUILD_TESTS) + add_test(jsonnet_test_snippet + ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET}) + endif() ++install(FILES ${LIB_HEADER} DESTINATION include) +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 153a4a1..08bba4c 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -8,8 +8,8 @@ set(LIBJSONNETPP_SOURCE + libjsonnet++.cpp + ) + ++if (BUILD_SHARED_BINARIES) + add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE}) +-add_dependencies(libjsonnet++ jsonnet) + target_link_libraries(libjsonnet++ libjsonnet) + + # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without +@@ -25,11 +25,11 @@ install(TARGETS libjsonnet++ + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet++ INTERFACE + $) ++endif() + + if (BUILD_STATIC_LIBS) + # Static library for jsonnet command-line tool. + add_library(libjsonnet++_static STATIC ${LIBJSONNETPP_SOURCE}) +- add_dependencies(libjsonnet++_static jsonnet) + target_link_libraries(libjsonnet++_static libjsonnet_static) + set_target_properties(libjsonnet++_static PROPERTIES OUTPUT_NAME jsonnet++) + install(TARGETS libjsonnet++_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") +@@ -43,6 +43,7 @@ else() + add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static) + endif() + ++install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include) + # Tests + function(add_test_executablepp test_name) + if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp) diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index 23ef2326043476..8009d25f1cb130 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a760f501796c04b20a4a8fd492bcaaa5312dbf19", + "git-tree": "31b7e5a4417b0bc57c68826ba3d6982dc3c3bd46", "version": "0.21.0", "port-version": 1 }, From 2b5e8c33963413e02ffaf98d969da740cfaeb749 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 20 Aug 2025 17:22:37 -0700 Subject: [PATCH 26/58] [lemon-parser-generator] Accept CMake 3.30 --- ports/lemon-parser-generator/CMakeLists.txt | 2 +- versions/l-/lemon-parser-generator.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/lemon-parser-generator/CMakeLists.txt b/ports/lemon-parser-generator/CMakeLists.txt index 26eca12514dbc7..7c32b8206b7951 100644 --- a/ports/lemon-parser-generator/CMakeLists.txt +++ b/ports/lemon-parser-generator/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 4.0) +cmake_minimum_required(VERSION 3.30) project(lemon-parser-generator C) add_executable(lemon lemon.c) install(TARGETS lemon diff --git a/versions/l-/lemon-parser-generator.json b/versions/l-/lemon-parser-generator.json index 2d8ae2f51689d8..9a66a72d860819 100644 --- a/versions/l-/lemon-parser-generator.json +++ b/versions/l-/lemon-parser-generator.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9afd998d68c29bdbc7edd43643b7dda5cfaa0b99", + "git-tree": "189d22b86b5bd27f9bd13666f78921db811fa4f4", "version": "3.39.3", "port-version": 1 }, From e5751f257f2542173b9e6b08b06e5ab9117590e0 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 20 Aug 2025 17:26:24 -0700 Subject: [PATCH 27/58] [libbson] Upstream already applied, revert changes. --- ports/libbson/cmake4.patch | 16 ---------------- ports/libbson/portfile.cmake | 1 - ports/libbson/vcpkg.json | 1 - versions/baseline.json | 2 +- versions/l-/libbson.json | 5 ----- 5 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 ports/libbson/cmake4.patch diff --git a/ports/libbson/cmake4.patch b/ports/libbson/cmake4.patch deleted file mode 100644 index 4b597c43682ee4..00000000000000 --- a/ports/libbson/cmake4.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 829d77c88c..8b87297c11 100644 ---- a/src/libbson/CMakeLists.txt -+++ b/src/libbson/CMakeLists.txt -@@ -33,11 +33,6 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) - # potentially co-locate additional future major versions. - set (BSON_API_VERSION 1.0) - --if (APPLE) -- cmake_policy (SET CMP0042 OLD) --endif () -- -- - # .d8888b. 888 888 d8b - # d88P Y88b 888 888 Y8P - # Y88b. 888 888 diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 63186c29f29e82..ec0eca9fad7329 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-include-directory.patch # vcpkg legacy decision - cmake4.patch ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index 69cedf1f334a85..d896c559db5553 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libbson", "version": "1.30.3", - "port-version": 1, "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 41dd373f3ee0c2..5d1daea10a4749 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4574,7 +4574,7 @@ }, "libbson": { "baseline": "1.30.3", - "port-version": 1 + "port-version": 0 }, "libcaer": { "baseline": "3.3.17", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index a5095b4f910e32..3215db04cf94ba 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "07f400236cfb59ab68a9f8a67adc810bff8e7b01", - "version": "1.30.3", - "port-version": 1 - }, { "git-tree": "de32ee59fdfe05b9b28234a3c73ddf804eae8633", "version": "1.30.3", From e0b7b46308799082d98fdd63ab6486afda39b431 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 20 Aug 2025 17:32:28 -0700 Subject: [PATCH 28/58] [outcome] Regenerate patches. --- ports/outcome/files-do-not-exist.patch | 8 ++------ ports/outcome/fix-status-code-path.patch | 2 +- versions/o-/outcome.json | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ports/outcome/files-do-not-exist.patch b/ports/outcome/files-do-not-exist.patch index d1a838b118a203..53affeb6253370 100644 --- a/ports/outcome/files-do-not-exist.patch +++ b/ports/outcome/files-do-not-exist.patch @@ -1,10 +1,8 @@ diff --git a/cmake/headers.cmake b/cmake/headers.cmake -index b734a78f90..48c32a7a73 100644 +index 734e7d0..5d0f646 100644 --- a/cmake/headers.cmake +++ b/cmake/headers.cmake -@@ -22,36 +22,10 @@ set(outcome_HEADERS - "include/outcome/detail/trait_std_exception.hpp" - "include/outcome/detail/value_storage.hpp" +@@ -25,32 +25,6 @@ set(outcome_HEADERS "include/outcome/detail/version.hpp" "include/outcome/experimental/coroutine_support.hpp" "include/outcome/experimental/result.h" @@ -37,5 +35,3 @@ index b734a78f90..48c32a7a73 100644 "include/outcome/experimental/status_outcome.hpp" "include/outcome/experimental/status_result.hpp" "include/outcome/iostream_support.hpp" - "include/outcome/outcome.hpp" - "include/outcome/outcome.natvis" diff --git a/ports/outcome/fix-status-code-path.patch b/ports/outcome/fix-status-code-path.patch index ca630e91e2191a..755966d187f5b0 100644 --- a/ports/outcome/fix-status-code-path.patch +++ b/ports/outcome/fix-status-code-path.patch @@ -1,5 +1,5 @@ diff --git a/include/outcome/experimental/result.h b/include/outcome/experimental/result.h -index b912a55..401c6ca 100644 +index b912a55..1370e9e 100644 --- a/include/outcome/experimental/result.h +++ b/include/outcome/experimental/result.h @@ -278,14 +278,14 @@ extern "C" diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 4d84b98836bf74..8b88ff05558875 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d2901c85d03a19191defb9319aebc035699182bb", + "git-tree": "33cf7d851b6a24b72f6a070521dd45486ae84455", "version": "2.2.12", "port-version": 1 }, From 1f196c7f1c4051b390366bd51182f7f284ccb0f9 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 26 Aug 2025 15:37:21 -0700 Subject: [PATCH 29/58] Baseline fixes. --- scripts/ci.feature.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 881071c1f37376..7456b8591b88b4 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1475,6 +1475,9 @@ oatpp-mbedtls:arm64-uwp = cascade oatpp-mbedtls:x64-uwp = cascade oatpp-postgresql:arm64-uwp = cascade oatpp-postgresql:x64-uwp = cascade +ogre[csharp](windows)=fail # .NET workloads not installed in the build lab +ogre[d3d9](windows)=feature-fails # DirectX 9 SDK not installed in the build lab +ogre[python]=feature-fails # broken on all test platforms right now ogre:x64-uwp = cascade ogre[assimp,freeimage,openexr,python]:arm64-uwp = cascade ogre-next:arm64-uwp = cascade From 4ccbf47addd5a3e3e2d5692a4109b89bf0210e5f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 26 Aug 2025 17:21:33 -0700 Subject: [PATCH 30/58] [sentry-native] Fix patch --- ports/sentry-native/fix-cmake-4.patch | 22 +++++++++++++++++++++ ports/sentry-native/fix-usage-runtime.patch | 10 +++++----- versions/s-/sentry-native.json | 2 +- 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 ports/sentry-native/fix-cmake-4.patch diff --git a/ports/sentry-native/fix-cmake-4.patch b/ports/sentry-native/fix-cmake-4.patch new file mode 100644 index 00000000000000..b68d773fc0058d --- /dev/null +++ b/ports/sentry-native/fix-cmake-4.patch @@ -0,0 +1,22 @@ +diff --git a/external/crashpad/util/CMakeLists.txt b/external/crashpad/util/CMakeLists.txt +index f60da7d..b512fc8 100644 +--- a/external/crashpad/util/CMakeLists.txt ++++ b/external/crashpad/util/CMakeLists.txt +@@ -428,7 +428,7 @@ if(APPLE) + ) + endif() + foreach(x ${def_relative_files}) +- set(full_path "${CMAKE_OSX_SYSROOT}/usr/include/mach/${x}") ++ set(full_path "${_CMAKE_OSX_SYSROOT_PATH}/usr/include/mach/${x}") + if(NOT EXISTS "${full_path}") + message(FATAL_ERROR "File not found: ${full_path}") + endif() +@@ -460,7 +460,7 @@ if(APPLE) + list(TRANSFORM includes PREPEND "--include=") + + if(CMAKE_OSX_SYSROOT) +- set(sdk --sdk ${CMAKE_OSX_SYSROOT}) ++ set(sdk --sdk ${_CMAKE_OSX_SYSROOT_PATH}) + endif() + + # When building for Xcode, the `CMAKE_OSX_SYSROOT` is not set to a proper diff --git a/ports/sentry-native/fix-usage-runtime.patch b/ports/sentry-native/fix-usage-runtime.patch index 5df0fd72ccf0ff..3b65c48e17ed51 100644 --- a/ports/sentry-native/fix-usage-runtime.patch +++ b/ports/sentry-native/fix-usage-runtime.patch @@ -1,11 +1,11 @@ diff --git a/external/crashpad/handler/CMakeLists.txt b/external/crashpad/handler/CMakeLists.txt -index be0e544..b0d44af 100644 +index b89c570..2e0aaa1 100644 --- a/external/crashpad/handler/CMakeLists.txt +++ b/external/crashpad/handler/CMakeLists.txt -@@ -87,7 +87,7 @@ target_compile_options(crashpad_handler PRIVATE - $<$:-Wno-ignored-attributes> - ) - endif() +@@ -88,7 +88,7 @@ if(NOT IOS) + $<$:-Wno-ignored-attributes> + ) + endif() - if(LINUX) + if(LINUX AND BUILD_SHARED_LIBS) target_sources(crashpad_handler PRIVATE diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 6d42cf40489257..7996f178243489 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "773da13a82a0cdc98c2151b62bbb585dce3e98fa", + "git-tree": "e53fb9effdfad56fa39ea6677bb1e87f5c7fc7bf", "version": "0.10.0", "port-version": 1 }, From 0b2a55a8a8492ebeb1335005bf1624c9600f52d4 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 26 Aug 2025 17:21:41 -0700 Subject: [PATCH 31/58] Fix baseline syntax --- scripts/ci.feature.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 7456b8591b88b4..fdf6312bc82461 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1475,7 +1475,7 @@ oatpp-mbedtls:arm64-uwp = cascade oatpp-mbedtls:x64-uwp = cascade oatpp-postgresql:arm64-uwp = cascade oatpp-postgresql:x64-uwp = cascade -ogre[csharp](windows)=fail # .NET workloads not installed in the build lab +ogre[csharp](windows)=feature-fails # .NET workloads not installed in the build lab ogre[d3d9](windows)=feature-fails # DirectX 9 SDK not installed in the build lab ogre[python]=feature-fails # broken on all test platforms right now ogre:x64-uwp = cascade From da80248b04c0bc237ddad725d14e5f173454a1d6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 26 Aug 2025 17:36:34 -0700 Subject: [PATCH 32/58] [sentry-native] Fix patch again --- ports/sentry-native/fix-cmake-4.patch | 22 ---------------------- ports/sentry-native/fix-cmake4.patch | 14 ++++++-------- versions/s-/sentry-native.json | 2 +- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 ports/sentry-native/fix-cmake-4.patch diff --git a/ports/sentry-native/fix-cmake-4.patch b/ports/sentry-native/fix-cmake-4.patch deleted file mode 100644 index b68d773fc0058d..00000000000000 --- a/ports/sentry-native/fix-cmake-4.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/external/crashpad/util/CMakeLists.txt b/external/crashpad/util/CMakeLists.txt -index f60da7d..b512fc8 100644 ---- a/external/crashpad/util/CMakeLists.txt -+++ b/external/crashpad/util/CMakeLists.txt -@@ -428,7 +428,7 @@ if(APPLE) - ) - endif() - foreach(x ${def_relative_files}) -- set(full_path "${CMAKE_OSX_SYSROOT}/usr/include/mach/${x}") -+ set(full_path "${_CMAKE_OSX_SYSROOT_PATH}/usr/include/mach/${x}") - if(NOT EXISTS "${full_path}") - message(FATAL_ERROR "File not found: ${full_path}") - endif() -@@ -460,7 +460,7 @@ if(APPLE) - list(TRANSFORM includes PREPEND "--include=") - - if(CMAKE_OSX_SYSROOT) -- set(sdk --sdk ${CMAKE_OSX_SYSROOT}) -+ set(sdk --sdk ${_CMAKE_OSX_SYSROOT_PATH}) - endif() - - # When building for Xcode, the `CMAKE_OSX_SYSROOT` is not set to a proper diff --git a/ports/sentry-native/fix-cmake4.patch b/ports/sentry-native/fix-cmake4.patch index 74664c2778f40c..b68d773fc0058d 100644 --- a/ports/sentry-native/fix-cmake4.patch +++ b/ports/sentry-native/fix-cmake4.patch @@ -1,23 +1,21 @@ diff --git a/external/crashpad/util/CMakeLists.txt b/external/crashpad/util/CMakeLists.txt -index ef066fb9b1..4a96a8386b 100644 +index f60da7d..b512fc8 100644 --- a/external/crashpad/util/CMakeLists.txt +++ b/external/crashpad/util/CMakeLists.txt -@@ -407,7 +407,7 @@ if(APPLE) +@@ -428,7 +428,7 @@ if(APPLE) + ) + endif() foreach(x ${def_relative_files}) - # CMAKE_OSX_SYSROOT may be empty (e.g. for Makefile generators), - # in this case files will be taken from root. - set(full_path "${CMAKE_OSX_SYSROOT}/usr/include/mach/${x}") + set(full_path "${_CMAKE_OSX_SYSROOT_PATH}/usr/include/mach/${x}") if(NOT EXISTS "${full_path}") message(FATAL_ERROR "File not found: ${full_path}") endif() -@@ -438,8 +438,8 @@ if(APPLE) - endif() +@@ -460,7 +460,7 @@ if(APPLE) list(TRANSFORM includes PREPEND "--include=") -- if(CMAKE_OSX_SYSROOT) + if(CMAKE_OSX_SYSROOT) - set(sdk --sdk ${CMAKE_OSX_SYSROOT}) -+ if(_CMAKE_OSX_SYSROOT_PATH) + set(sdk --sdk ${_CMAKE_OSX_SYSROOT_PATH}) endif() diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 7996f178243489..1a0938c8341e9b 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e53fb9effdfad56fa39ea6677bb1e87f5c7fc7bf", + "git-tree": "1ef09306a15893912e14e54eea8453c66ebf287b", "version": "0.10.0", "port-version": 1 }, From 35fcab494d962a05f4cfc1d7ae4ca4968adf7fcf Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 26 Aug 2025 17:45:23 -0700 Subject: [PATCH 33/58] format-feature-baseline --- scripts/ci.feature.baseline.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index fdf6312bc82461..1d93da6b946581 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1475,11 +1475,11 @@ oatpp-mbedtls:arm64-uwp = cascade oatpp-mbedtls:x64-uwp = cascade oatpp-postgresql:arm64-uwp = cascade oatpp-postgresql:x64-uwp = cascade +ogre:x64-uwp = cascade +ogre[assimp,freeimage,openexr,python]:arm64-uwp = cascade ogre[csharp](windows)=feature-fails # .NET workloads not installed in the build lab ogre[d3d9](windows)=feature-fails # DirectX 9 SDK not installed in the build lab ogre[python]=feature-fails # broken on all test platforms right now -ogre:x64-uwp = cascade -ogre[assimp,freeimage,openexr,python]:arm64-uwp = cascade ogre-next:arm64-uwp = cascade ogre-next:arm64-windows = cascade ogre-next:x64-uwp = cascade From 5dd6d88de289034a9d40fb5985479bc66fb795ec Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 28 Aug 2025 18:09:12 -0700 Subject: [PATCH 34/58] [opencv2] Fix opencv2[core,msmf,openexr] failing to build on current msvc. --- ports/opencv2/0011-msvc-compile-fix.patch | 12 ++++++++++++ ports/opencv2/portfile.cmake | 1 + versions/o-/opencv2.json | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ports/opencv2/0011-msvc-compile-fix.patch diff --git a/ports/opencv2/0011-msvc-compile-fix.patch b/ports/opencv2/0011-msvc-compile-fix.patch new file mode 100644 index 00000000000000..e03935649971c1 --- /dev/null +++ b/ports/opencv2/0011-msvc-compile-fix.patch @@ -0,0 +1,12 @@ +diff --git a/modules/highgui/src/cap_msmf.hpp b/modules/highgui/src/cap_msmf.hpp +index 9ce2a9c..b72c7f4 100644 +--- a/modules/highgui/src/cap_msmf.hpp ++++ b/modules/highgui/src/cap_msmf.hpp +@@ -2312,6 +2312,7 @@ public: + } + + protected: ++ using Node = typename List::Node; + HRESULT InsertAfter(Ptr item, Node *pBefore) + { + // Do not allow nullptr item pointers unless NULLABLE is true. diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index d978fd170b4a7f..7788f282ec5b2a 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( 0008-missing-include.patch 0009-pkgconfig-suffix.patch 0010-fix-cmake4.patch + 0011-msvc-compile-fix.patch ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 974b4f3039e2b6..edc5c7b7bf3cfe 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4be615ddf3239bab9286dce71795294baa6347a2", + "git-tree": "961e8e38afc8a3dbb123619dfdadbea23217b211", "version": "2.4.13.7", "port-version": 25 }, From 3f5a57592a5a49afb73725f6b4858fb5c1a8efc4 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 28 Aug 2025 18:35:35 -0700 Subject: [PATCH 35/58] Mirror clapack skips from ci.baseline.txt into ci.feature.baseline.txt. --- scripts/ci.feature.baseline.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 1d93da6b946581..105823d4dd73c4 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -84,6 +84,17 @@ chromium-base:x64-linux=skip # broken on Linux because chromium-base:x64-osx=skip # broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache because the first attempt to build it fails, but subsequent attempts succeed chromium-base(windows) =skip # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI broken on Windows because it does not yet support VS2022 clamav:arm64-windows=fail +clapack:arm-neon-android=fail +clapack:arm64-android=fail +clapack:arm64-osx=skip +clapack:x64-android=fail +clapack:x64-linux=skip +clapack:x64-osx=skip +clapack:x64-windows-release=skip +clapack:x64-windows-static-md=skip +clapack:x64-windows-static=skip +clapack:x64-windows=skip +clapack:x86-windows=skip clockutils:x64-linux=fail coroutine(uwp)=fail cpp-netlib(uwp)=fail From 10e2c12abee1d487371e6060243cdf76e4be0186 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 28 Aug 2025 18:56:05 -0700 Subject: [PATCH 36/58] Revert clapack changes. --- ports/clapack/FindLAPACK.cmake | 11 ++++++++--- ports/clapack/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/clapack.json | 5 ----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index a65af18e2ea463..8516fc78d42052 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -35,9 +35,14 @@ if(NOT TARGET LAPACK::LAPACK) get_property(LAPACK_INCLUDE_DIR TARGET lapack PROPERTY INTERFACE_INCLUDE_DIRECTORIES) # Doesn't make much sense but ok. select_library_configurations(LAPACK) - get_property(LAPACK_LINKER_FLAGS TARGET lapack PROPERTY INTERFACE_LINK_LIBRARIES) - - set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};${LAPACK_LINKER_FLAGS}") + get_property(LAPACK_LINKER_FLAGS_RELEASE TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) + get_property(LAPACK_LINKER_FLAGS_DEBUG TARGET lapack PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG) + list(TRANSFORM LAPACK_LINKER_FLAGS_DEBUG PREPEND "$<$:") + list(TRANSFORM LAPACK_LINKER_FLAGS_DEBUG APPEND ">") + list(TRANSFORM LAPACK_LINKER_FLAGS_RELEASE PREPEND "$<$>:") + list(TRANSFORM LAPACK_LINKER_FLAGS_RELEASE APPEND ">") + + set(LAPACK_LIBRARIES "${LAPACK_LIBRARIES};${LAPACK_LINKER_FLAGS_DEBUG};${LAPACK_LINKER_FLAGS_RELEASE}") set(LAPACK95_LIBRARIES "${LAPACK_LIBRARIES}") set(LAPACK95_FOUND "TRUE") set(LAPACK_LINKER_FLAGS "${LAPACK_LIBRARIES}") diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index b17edb56d204f7..42091fd81abc06 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 24, + "port-version": 23, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://netlib.org/lapack/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5d1daea10a4749..2f03d750a72c91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1754,7 +1754,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 24 + "port-version": 23 }, "clara": { "baseline": "1.1.5", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index ab4fd29ceb3b7f..fe49646fda3247 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "184a25decba1a211c20e298df2046b34adc9e555", - "version": "3.2.1", - "port-version": 24 - }, { "git-tree": "42a62cb53a007074bab56cc3086796b291428b4b", "version": "3.2.1", From 87d5457489789294b9792c8288951427eb2530c8 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 13:22:23 -0700 Subject: [PATCH 37/58] Revert vcpkg_from_git change. --- scripts/cmake/vcpkg_from_git.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index e994b9913332bf..0b477acb822f09 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -24,7 +24,7 @@ function(vcpkg_from_git) if(DEFINED arg_FETCH_REF AND NOT DEFINED arg_REF) message(FATAL_ERROR "REF must be specified if FETCH_REF is specified") endif() - if(arg_LFS STREQUAL "" AND "LFS" IN_LIST arg_KEYWORDS_MISSING_VALUES) + if(NOT DEFINED arg_LFS AND "LFS" IN_LIST arg_KEYWORDS_MISSING_VALUES) set(arg_LFS "${arg_URL}") endif() From efddfb411acfcb8d9b16111d318e7ccc3bf478a3 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 14:03:33 -0700 Subject: [PATCH 38/58] More feature baseline --- scripts/ci.feature.baseline.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index add15844cb943e..1bdb9b388f9971 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -85,8 +85,6 @@ clapack:arm64-osx=skip clapack:x64-linux=skip clapack:x64-osx=skip clapack:x64-windows-release=skip -clapack:x64-windows-static-md=skip -clapack:x64-windows-static=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack(android)=fail # needs target configuration data @@ -1481,7 +1479,7 @@ oatpp-mbedtls:x64-uwp = cascade oatpp-postgresql:arm64-uwp = cascade oatpp-postgresql:x64-uwp = cascade ogre:x64-uwp = cascade -ogre[assimp,freeimage,openexr,python]:arm64-uwp = cascade +ogre[assimp,freeimage,openexr]:arm64-uwp = cascade ogre[csharp](windows)=feature-fails # .NET workloads not installed in the build lab ogre[d3d9](windows)=feature-fails # DirectX 9 SDK not installed in the build lab ogre[python]=feature-fails # broken on all test platforms right now From f3883baa6d1f53a8cd766185583971dd942ec0e9 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 14:18:03 -0700 Subject: [PATCH 39/58] Again! --- scripts/ci.feature.baseline.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 1bdb9b388f9971..c50dad8368c81e 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -502,8 +502,11 @@ soqt:arm64-windows=fail soqt:x64-uwp=fail soundtouch:arm-uwp=fail soundtouch:x64-uwp=fail -spaceland:arm-uwp=fail +spaceland:arm64-android=fail +spaceland:arm64-uwp=fail +spaceland:arm64-windows-static-md=fail spaceland:arm64-windows=fail +spaceland:x64-android=fail spaceland:x64-uwp=fail spdk:x64-linux=fail spdk-dpdk:arm-uwp=fail @@ -550,8 +553,12 @@ tmxparser:x64-windows-static-md=fail tmxparser:x64-windows-static=fail tmxparser:x64-windows=fail tmxparser:x86-windows=fail -torch-th:arm-uwp=fail +torch-th:arm-neon-android=fail +torch-th:arm64-android=fail +torch-th:arm64-uwp=fail +torch-th:arm64-windows-static-md=fail torch-th:arm64-windows=fail +torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail treehopper:x64-linux=fail From a9a262b78bd1ea8537ca8f9fb9b6084f7f41fa65 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 17:01:04 -0700 Subject: [PATCH 40/58] More feature baseline again. --- scripts/ci.feature.baseline.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index c50dad8368c81e..ed10523bb288e7 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -88,7 +88,9 @@ clapack:x64-windows-release=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack(android)=fail # needs target configuration data -clockutils:x64-linux=fail +clockutils:arm-neon-android=fail +clockutils:arm64-android=fail +clockutils:x64-android=fail coroutine(uwp)=fail cpp-netlib(uwp)=fail cppcoro(uwp | linux | osx)=fail @@ -319,6 +321,9 @@ moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail +msquic:arm-neon-android=fail +msquic:arm64-android=fail +msquic:x64-android=fail munit:arm-uwp=fail munit:arm64-windows=fail munit:x64-uwp=fail @@ -354,6 +359,7 @@ ode:x64-uwp=fail offscale-libetcd-cpp:arm-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogre-next(android)=fail +ois:x64-android=fail opencc:arm64-windows=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected opencc:x64-android=fail opencc(uwp)=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. @@ -580,7 +586,6 @@ workflow:arm-uwp=fail workflow:x64-uwp=fail wxchartdir:x64-osx=fail x265:arm-uwp=fail -x265:arm64-windows=fail x265:x64-uwp=fail xalan-c:arm64-windows=fail xalan-c:x64-windows-static=fail @@ -1894,7 +1899,6 @@ ryml:arm64-windows = cascade ryml:x64-uwp = cascade safetyhook:x64-linux=fail salome-configuration:arm64-uwp = cascade -salome-configuration:arm64-windows = cascade salome-configuration:x64-uwp = cascade salome-med-fichier:arm64-uwp = cascade salome-med-fichier:arm64-windows = cascade From a4d65c9821c053bf05a88d764c6097337ff5d8b8 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 17:11:16 -0700 Subject: [PATCH 41/58] Again :( --- scripts/ci.feature.baseline.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ed10523bb288e7..b8b38a93257473 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -321,9 +321,9 @@ moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail -msquic:arm-neon-android=fail -msquic:arm64-android=fail -msquic:x64-android=fail +msquic:arm-neon-android=cascade +msquic:arm64-android=cascade +msquic:x64-android=cascade munit:arm-uwp=fail munit:arm64-windows=fail munit:x64-uwp=fail @@ -1297,6 +1297,7 @@ libimobiledevice:arm64-uwp = cascade libimobiledevice:x64-uwp = cascade libirecovery:x64-uwp = cascade liblas:x64-uwp = cascade +liblas[tools](android)=feature-fails liblsquic:arm64-uwp = cascade liblsquic:arm64-windows = cascade liblsquic:x64-uwp = cascade From d45bd7204bbf9c5df664fddb850bcb113dd946be Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 17:33:09 -0700 Subject: [PATCH 42/58] sigh --- scripts/ci.feature.baseline.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index b8b38a93257473..ad8203cce5e84b 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -321,9 +321,9 @@ moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail -msquic:arm-neon-android=cascade -msquic:arm64-android=cascade -msquic:x64-android=cascade +msquic:arm-neon-android=fail +msquic:arm64-android=fail +msquic:x64-android=fail munit:arm-uwp=fail munit:arm64-windows=fail munit:x64-uwp=fail From 80ddc496959f1228928a8eae0d6764b984b8fb1f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 17:26:19 -0700 Subject: [PATCH 43/58] Cherry-pick https://github.com/microsoft/vcpkg/pull/47133 --- ports/outcome/portfile.cmake | 7 +++++++ versions/o-/outcome.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index 2dc3e25783ddd7..ca7ab2b1687450 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -15,6 +15,12 @@ # the exact copy of those third party libraries known to # have passed Outcome's CI process. +vcpkg_download_distfile(MISSING_HEADER_FIX + URLS https://github.com/ned14/outcome/commit/d4d38266a0c889be00069600bdbc339456f8f5bd.patch?full_index=1 + FILENAME outcome-missing-swap-d4d38266a0c889be00069600bdbc339456f8f5bd.patch + SHA512 bcc6c050001776b998ff8146b7937ab86811288a0e611b911fad5031b654b0839c41a57196f70ec314c322124e1cb6473a7c5e91472e18b5bb6d35780eaf65f8 +) + if ("polyfill-cxx20" IN_LIST FEATURES) message(WARNING [=[ Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. @@ -29,6 +35,7 @@ vcpkg_from_github( HEAD_REF develop PATCHES fix-status-code-path.patch + "${MISSING_HEADER_FIX}" files-do-not-exist.patch ) diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 8b88ff05558875..2810dcdb1359d2 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "33cf7d851b6a24b72f6a070521dd45486ae84455", + "git-tree": "00658e63a38a294fbecea773b6e66eadd84744c7", "version": "2.2.12", "port-version": 1 }, From cdc2456b766220b7ffb535c01ec85fb2ccf066da Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 17:42:57 -0700 Subject: [PATCH 44/58] :( --- scripts/ci.feature.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ad8203cce5e84b..dd8266353de431 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -324,6 +324,7 @@ moos-essential:x86-windows=fail msquic:arm-neon-android=fail msquic:arm64-android=fail msquic:x64-android=fail +msquic[0-rtt](android)=cascade munit:arm-uwp=fail munit:arm64-windows=fail munit:x64-uwp=fail From ddbb324872c15a650cd54f8e5275dcab44429826 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 19:56:27 -0700 Subject: [PATCH 45/58] More feature baseline --- scripts/ci.feature.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index dd8266353de431..68331a21e3ffb1 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1298,6 +1298,7 @@ libimobiledevice:arm64-uwp = cascade libimobiledevice:x64-uwp = cascade libirecovery:x64-uwp = cascade liblas:x64-uwp = cascade +liblas[tools]:x64-osx=feature-fails liblas[tools](android)=feature-fails liblsquic:arm64-uwp = cascade liblsquic:arm64-windows = cascade From 77f07c5b478281f265b46d517226f4251d2b97b0 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 29 Aug 2025 20:00:12 -0700 Subject: [PATCH 46/58] Version DB --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index b641b6d058eda3..505485b68a92c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7210,7 +7210,7 @@ }, "outcome": { "baseline": "2.2.12", - "port-version": 1 + "port-version": 2 }, "p-ranav-csv": { "baseline": "2019-07-11", From c50576086d252bfc20f6f433c0f2f34351b16450 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 3 Sep 2025 14:15:03 -0700 Subject: [PATCH 47/58] [openmpi] Add -headerpad_max_install_names to fix mpi downstreams --- ports/openmpi/portfile.cmake | 4 ++++ ports/openmpi/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/openmpi.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 9d93818adbcb0b..53fbee15f22484 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -23,6 +23,10 @@ vcpkg_add_to_path(${PERL_PATH}) # VCPKG_CONFIGURE_MAKE_OPTIONS overwrites vcpkg_configure_make overwrites OPTIONS. vcpkg_list(PREPEND VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG [[--datadir=\${prefix}/../tools/openmpi/debug/share]]) vcpkg_list(PREPEND VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE [[--datadir=\${prefix}/tools/openmpi/share]]) +if(VCPKG_TARGET_IS_OSX) + # This ensures that vcpkg-fixup-macho-rpath succeeds + string(APPEND VCPKG_LINKER_FLAGS " -headerpad_max_install_names") +endif() vcpkg_configure_make( COPY_SOURCE diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index dccbfb32eb6168..7399e8bfe78f1d 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,8 @@ { "name": "openmpi", "version": "4.1.7", + "port-version": 1, "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", - "supports": "!(windows | uwp)" + "supports": "!windows" } diff --git a/versions/baseline.json b/versions/baseline.json index 505485b68a92c9..3d7726356ad162 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7082,7 +7082,7 @@ }, "openmpi": { "baseline": "4.1.7", - "port-version": 0 + "port-version": 1 }, "openmvg": { "baseline": "2.1", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index e853869c8fdcdb..14d0ef908f020e 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db5c85ac5ccd1096800a5e499002f9a42a3d18d1", + "version": "4.1.7", + "port-version": 1 + }, { "git-tree": "6d7ff2cbf30f0e7770cb74beb44de9e2618cfe39", "version": "4.1.7", From ea96d22821c76de1deb5693656195fe2d8eadb73 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 3 Sep 2025 14:44:23 -0700 Subject: [PATCH 48/58] [openmpi] Replicate ci.baseline.txt -> ci.feature.baseline.txt --- scripts/ci.feature.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 68331a21e3ffb1..11d3c138785a68 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -387,6 +387,9 @@ openmama:x64-windows-static-md=fail openmesh:arm-uwp=fail openmesh:arm64-windows=fail openmesh:x64-uwp=fail +openmpi:arm-neon-android=fail +openmpi:arm64-android=fail +openmpi:x64-android=fail openslide(windows & native)=fail # g_auto* using __attribute__((cleanup)) # Incorrect use of arm64 intrinsics in in VS 2022 17.13 broke these with -Zc:arm64-aliased-neon-types- openvino:arm64-windows-static-md=fail From 2ac33e1257c6ca32ccd12308a68685e0074c433f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 5 Sep 2025 11:11:41 -0700 Subject: [PATCH 49/58] [vtk-m] macOS 15.6 fixes. --- ports/vtk-m/fix-macos-15-6.patch | 14 +++++++ ports/vtk-m/portfile.cmake | 19 ++++++---- ports/vtk-m/vcpkg.json | 1 + ...85af319543800398656645327243a29babfb.patch | 38 +++++++++++++++++++ ports/vtk-m/vtkm-macos-fix-pr-3272.patch | 35 +++++++++++++++++ versions/baseline.json | 2 +- versions/v-/vtk-m.json | 5 +++ 7 files changed, 105 insertions(+), 9 deletions(-) create mode 100644 ports/vtk-m/fix-macos-15-6.patch create mode 100644 ports/vtk-m/vtkm-macos-fix-commit-48e385af319543800398656645327243a29babfb.patch create mode 100644 ports/vtk-m/vtkm-macos-fix-pr-3272.patch diff --git a/ports/vtk-m/fix-macos-15-6.patch b/ports/vtk-m/fix-macos-15-6.patch new file mode 100644 index 00000000000000..ecf7fa76929e03 --- /dev/null +++ b/ports/vtk-m/fix-macos-15-6.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/VTKmCompilerFlags.cmake b/CMake/VTKmCompilerFlags.cmake +index 2a7f484..6644468 100644 +--- a/CMake/VTKmCompilerFlags.cmake ++++ b/CMake/VTKmCompilerFlags.cmake +@@ -136,6 +136,9 @@ elseif(VTKM_COMPILER_IS_ICC) + elseif(VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG) + set(cxx_flags -Wall -Wcast-align -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused -fno-common -Wno-unused-function) + set(cuda_flags -Xcompiler=-Wall,-Wcast-align,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-fno-common,-Wunused,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-function) ++ if(APPLE) ++ list(APPEND cxx_flags -Wno-missing-template-arg-list-after-template-kw) ++ endif() + + #Clang does not support the -Wchar-subscripts flag for warning if an array + #subscript has a char type. diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index 81bec1152ca35c..bd76af4ed8287e 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -51,15 +51,18 @@ list(APPEND OPTIONS list(APPEND OPTIONS -DBUILD_TESTING=OFF) vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" - OUT_SOURCE_PATH SOURCE_PATH - REPO vtk/vtk-m - REF a057f62e756efc43095e72c5813aaaf2dea36ebb # v2.1.0 Upgrading will most likely break the VTK build - - SHA512 fa08bd597e1918d10e7fed9f6b9667fd53f4a14589580e68691aad3cfb240f7de80fa0c5001712f100911c2262b5af3105b8f21da21b945a88e1204ea82b92a6 - PATCHES - omp.patch - fix-build.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO vtk/vtk-m + REF a057f62e756efc43095e72c5813aaaf2dea36ebb # v2.1.0 Upgrading will most likely break the VTK build + SHA512 fa08bd597e1918d10e7fed9f6b9667fd53f4a14589580e68691aad3cfb240f7de80fa0c5001712f100911c2262b5af3105b8f21da21b945a88e1204ea82b92a6 + PATCHES + omp.patch + fix-build.patch + fix-macos-15-6.patch + vtkm-macos-fix-pr-3272.patch + vtkm-macos-fix-commit-48e385af319543800398656645327243a29babfb.patch ) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json index 02a0877bf532b7..abc10f26c4e003 100644 --- a/ports/vtk-m/vcpkg.json +++ b/ports/vtk-m/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vtk-m", "version": "2.1.0", + "port-version": 1, "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", "license": null, diff --git a/ports/vtk-m/vtkm-macos-fix-commit-48e385af319543800398656645327243a29babfb.patch b/ports/vtk-m/vtkm-macos-fix-commit-48e385af319543800398656645327243a29babfb.patch new file mode 100644 index 00000000000000..7d2aecabd15745 --- /dev/null +++ b/ports/vtk-m/vtkm-macos-fix-commit-48e385af319543800398656645327243a29babfb.patch @@ -0,0 +1,38 @@ +From 48e385af319543800398656645327243a29babfb Mon Sep 17 00:00:00 2001 +From: Kenneth Moreland +Date: Tue, 15 Oct 2024 12:01:34 -0400 +Subject: [PATCH] Fix compile error for contour tree print + +A print for one of the contour tree objects was referencing members of +itself that don't seem to exist. This causes the Intel compiler to fail +to compile it. I'm at a loss about how any other compiler does not error +out, but at any rate this should be correct. +--- + .../worklet/contourtree_distributed/HierarchicalContourTree.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h b/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h +index a996d42928..e40d5f4f15 100644 +--- a/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h ++++ b/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h +@@ -663,7 +663,7 @@ std::string HierarchicalContourTree::PrintDotSuperStructure(const cha + auto hyperarcsPortal = this->Hyperarcs.ReadPortal(); + auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal(); + auto whichIterationPortal = this->WhichIteration.ReadPortal(); +- auto whichRoundPortal = this->whichRound.ReadPortal(); ++ auto whichRoundPortal = this->WhichRound.ReadPortal(); + auto superarcsPortal = this->Superarcs.ReadPortal(); + auto superparentsPortal = this->Superparents.ReadPortal(); + for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++) +@@ -708,7 +708,7 @@ std::string HierarchicalContourTree::PrintDotSuperStructure(const cha + if (contourtree_augmented::NoSuchElement(superarcTo)) + { // no superarc + // if it occurred on the final round, it's the global root and is shown as the NULL node +- if (whichRoundPortal.Get(superarcFrom) == this->NRounds) ++ if (whichRoundPortal.Get(superarcFrom) == this->NumRounds) + { // root node + outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc + << " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n"; +-- +GitLab + diff --git a/ports/vtk-m/vtkm-macos-fix-pr-3272.patch b/ports/vtk-m/vtkm-macos-fix-pr-3272.patch new file mode 100644 index 00000000000000..98f5193cd0fc56 --- /dev/null +++ b/ports/vtk-m/vtkm-macos-fix-pr-3272.patch @@ -0,0 +1,35 @@ +From c805a6039ea500cb96158cfc11271987c9f67aa4 Mon Sep 17 00:00:00 2001 +From: Kenneth Moreland +Date: Tue, 15 Oct 2024 13:06:36 -0400 +Subject: [PATCH] Remove unused method from MIR tables + +The implementation of this method was incorrect as it referenced a class +member that does not exist. Many compilers allowed it in a templated +class when the method was never used, but other compilers attempt to +compile the inlined method regardless. + +Since the method clearly is not needed, the easy solution is to remove +it. +--- + vtkm/filter/contour/worklet/mir/MIRTables.h | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/vtkm/filter/contour/worklet/mir/MIRTables.h b/vtkm/filter/contour/worklet/mir/MIRTables.h +index 3dff3329eb..a6f4d4f1fd 100644 +--- a/vtkm/filter/contour/worklet/mir/MIRTables.h ++++ b/vtkm/filter/contour/worklet/mir/MIRTables.h +@@ -11400,11 +11400,6 @@ public: + return FacesLookup[shape]; + } + +- VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const +- { +- return this->CellFacePortal.Get(pointIndex); +- } +- + private: + typename vtkm::cont::ArrayHandle::ReadPortalType MIRTablesDataPortal; + typename vtkm::cont::ArrayHandle::ReadPortalType MIRTablesIndicesPortal; +-- +GitLab + diff --git a/versions/baseline.json b/versions/baseline.json index 3d7726356ad162..85cf9a953fb77d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10162,7 +10162,7 @@ }, "vtk-m": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "vulkan": { "baseline": "2023-12-17", diff --git a/versions/v-/vtk-m.json b/versions/v-/vtk-m.json index b5236ae5839c77..f7488a7bfd5a0d 100644 --- a/versions/v-/vtk-m.json +++ b/versions/v-/vtk-m.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9989fcaca8943a1a6846c1a2994d71b98557d4e0", + "version": "2.1.0", + "port-version": 1 + }, { "git-tree": "3dff65b6415effb270b42e8d744689f35559abbc", "version": "2.1.0", From 344c46026b833a1de0ff992e7598de92b21d22b4 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 5 Sep 2025 11:25:06 -0700 Subject: [PATCH 50/58] [pangolin] Avoid VLAs --- ports/pangolin/avoid-vlas.diff | 35 ++++++++++++++++++++++++++++++++++ ports/pangolin/portfile.cmake | 3 ++- ports/pangolin/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pangolin.json | 5 +++++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 ports/pangolin/avoid-vlas.diff diff --git a/ports/pangolin/avoid-vlas.diff b/ports/pangolin/avoid-vlas.diff new file mode 100644 index 00000000000000..6ddceebf332b90 --- /dev/null +++ b/ports/pangolin/avoid-vlas.diff @@ -0,0 +1,35 @@ +diff --git a/components/pango_display/src/view.cpp b/components/pango_display/src/view.cpp +index d378bad..7b0b60e 100644 +--- a/components/pango_display/src/view.cpp ++++ b/components/pango_display/src/view.cpp +@@ -302,26 +302,17 @@ void View::ActivateIdentity() const + GLfloat View::GetClosestDepth([[maybe_unused]] int x, [[maybe_unused]] int y, int radius) const + { + // TODO: Get to work on android +- +-#ifdef _MSC_VER +- // MSVC Requires fixed sized arrays on stack +- radius = 5; +- const int zl = (5*2+1); +-#else + const int zl = (radius*2+1); +-#endif +- +- const int zsize = zl*zl; +- GLfloat zs[zsize]; ++ std::vector zs(zl*zl); + + #ifndef HAVE_GLES + glReadBuffer(GL_FRONT); +- glReadPixels(x-radius,y-radius,zl,zl,GL_DEPTH_COMPONENT,GL_FLOAT,zs); ++ glReadPixels(x-radius,y-radius,zl,zl,GL_DEPTH_COMPONENT,GL_FLOAT,zs.data()); + #else +- std::fill(zs,zs+zsize, 0.8); ++ std::fill(zs.begin(), zs.end(), 0.8); + #endif + +- const GLfloat mindepth = *(std::min_element(zs,zs+zsize)); ++ const GLfloat mindepth = *(std::min_element(zs.begin(),zs.end())); + return mindepth; + } + diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index 277b4d28f2ca28..ee2bc52eeeb386 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -16,7 +16,8 @@ vcpkg_from_github( HEAD_REF master PATCHES devendor-palsigslot.patch - ${INITIALISE_PAD_PATCH} + "${INITIALISE_PAD_PATCH}" + avoid-vlas.diff # Adapted from https://github.com/stevenlovegrove/Pangolin/commit/b91d462442ab3b392ac62e76ac5eef243971a530.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json index ccd5d4080bed4f..986ee2627c85bc 100644 --- a/ports/pangolin/vcpkg.json +++ b/ports/pangolin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pangolin", "version": "0.9.3", - "port-version": 2, + "port-version": 3, "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 85cf9a953fb77d..e6d0419e58804b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7246,7 +7246,7 @@ }, "pangolin": { "baseline": "0.9.3", - "port-version": 2 + "port-version": 3 }, "pangomm": { "baseline": "2.56.1", diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json index a8f47b92c87d3b..2c333939b13255 100644 --- a/versions/p-/pangolin.json +++ b/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572c9721b7984932bf0e4c9f5b3b210623197d37", + "version": "0.9.3", + "port-version": 3 + }, { "git-tree": "613bfe2671489172c512a46766bd04e916f58836", "version": "0.9.3", From 0f93179ca8c6fe56e3e976d92b16757e82a3f7bd Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 8 Sep 2025 11:22:15 -0700 Subject: [PATCH 51/58] Fix feature baseline --- scripts/ci.feature.baseline.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 69a530176d87c9..90519d439c37e8 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1617,8 +1617,17 @@ pango:arm64-uwp = cascade pango:x64-uwp = cascade pangolin[openni2]:arm64-osx = cascade pangolin[openni2]:x64-linux = cascade -pangolin[openni2,pybind11,realsense,uvc]:arm64-windows = cascade +pangolin[openni2,realsense,uvc]:arm64-windows = cascade pangolin[openni2,uvc]:x64-windows-static = cascade +pangolin[pybind11]:arm64-osx=feature-fails +pangolin[pybind11]:arm64-windows-static-md=feature-fails +pangolin[pybind11]:arm64-windows=feature-fails +pangolin[pybind11]:x64-linux=feature-fails +pangolin[pybind11]:x64-osx=feature-fails +pangolin[pybind11]:x64-windows-release=feature-fails +pangolin[pybind11]:x64-windows-static-md=feature-fails +pangolin[pybind11]:x64-windows=feature-fails +pangolin[pybind11]:x86-windows=feature-fails pangolin[uvc]:x64-windows = cascade pangolin[uvc]:x64-windows-static-md = cascade pangolin[uvc]:x86-windows = cascade @@ -2030,7 +2039,12 @@ vtk[vtkm](arm64 & windows) = cascade # vtk-m[core] only supports !x86 & !uwp & ! vtk-dicom:arm64-uwp = cascade vtk-dicom:arm64-windows = cascade vtk-dicom:x64-uwp = cascade +vtk-m[cuda]:x64-linux=feature-fails vtk-m[cuda](osx) = cascade +vtk-m[omp,cuda]:x64-windows-release=feature-fails +vtk-m[omp,cuda]:x64-windows-static-md=feature-fails +vtk-m[omp,cuda]:x64-windows-static=feature-fails +vtk-m[omp,cuda]:x64-windows=feature-fails vtk(uwp) = cascade # hdf5[core] only supports !uwp vulkan[tools](osx) = cascade vulkan-sdk-components[tools]( osx | staticcrt) = cascade From d9b63245e442c3fc865ad7b8fad036eec428d416 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 8 Sep 2025 12:05:32 -0700 Subject: [PATCH 52/58] Fix feature baseline harder --- scripts/ci.feature.baseline.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 90519d439c37e8..05baba2459792c 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -2225,7 +2225,8 @@ openscap[python](!windows) = feature-fails # CI image lacks swig opentelemetry-cpp[otlp](uwp) = feature-fails # --grpc_out: protoc-gen-grpc: The system cannot find the file specified. See https://github.com/microsoft/vcpkg/issues/34847 orange-math(linux) = fail # requires gcc15 or later osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains -pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,pybind11,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304 +pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304 +pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,tiff,tools,uvc,vars,video,zstd]:arm64-osx=combination-fails pcl[opengl](android) = feature-fails poco[core,mariadb,mysql] = options # You can not install mariadb and mysql at the same time ppqsort[openmp](osx) = feature-fails # No openmp on osx From aa29575307c573f3c1ba93543f9c1f59ef5a048d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 8 Sep 2025 12:22:48 -0700 Subject: [PATCH 53/58] More pangolin combinations --- scripts/ci.feature.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 05baba2459792c..bf9ed4f14765da 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -2227,6 +2227,8 @@ orange-math(linux) = fail # requires gcc15 or later osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304 pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,tiff,tools,uvc,vars,video,zstd]:arm64-osx=combination-fails +pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,tiff,tools,uvc,vars,video,zstd]:x64-linux=combination-fails +pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,openni2,png,realsense,tiff,tools,vars,video,zstd]:x64-windows-static-md=combination-fails pcl[opengl](android) = feature-fails poco[core,mariadb,mysql] = options # You can not install mariadb and mysql at the same time ppqsort[openmp](osx) = feature-fails # No openmp on osx From 5795c11fbdba4254089044fcc87f1000e4f1ee2d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 8 Sep 2025 12:29:15 -0700 Subject: [PATCH 54/58] format-feature-baseline --- scripts/ci.feature.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index bf9ed4f14765da..57e5e22b808d68 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -2225,10 +2225,10 @@ openscap[python](!windows) = feature-fails # CI image lacks swig opentelemetry-cpp[otlp](uwp) = feature-fails # --grpc_out: protoc-gen-grpc: The system cannot find the file specified. See https://github.com/microsoft/vcpkg/issues/34847 orange-math(linux) = fail # requires gcc15 or later osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains +pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,openni2,png,realsense,tiff,tools,vars,video,zstd]:x64-windows-static-md=combination-fails pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304 pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,tiff,tools,uvc,vars,video,zstd]:arm64-osx=combination-fails pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,tiff,tools,uvc,vars,video,zstd]:x64-linux=combination-fails -pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,openni2,png,realsense,tiff,tools,vars,video,zstd]:x64-windows-static-md=combination-fails pcl[opengl](android) = feature-fails poco[core,mariadb,mysql] = options # You can not install mariadb and mysql at the same time ppqsort[openmp](osx) = feature-fails # No openmp on osx From 08dff877ad4f09b3a123b7c86e33c564757cc676 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 8 Sep 2025 13:35:16 -0700 Subject: [PATCH 55/58] format-feature-baseline --- scripts/ci.baseline.txt | 240 ++++++++++++++++++++-------------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 70c381807cc359..7b9f5463e791ef 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -59,9 +59,9 @@ azure-identity-cpp:arm-neon-android=fail azure-identity-cpp:arm64-android=fail azure-identity-cpp:x64-android=fail # C++20 conformant compiler required -atliac-minitest:x64-linux=fail -atliac-minitest:arm64-uwp=fail atliac-minitest:arm64-osx=fail +atliac-minitest:arm64-uwp=fail +atliac-minitest:x64-linux=fail atliac-minitest:x64-osx=fail atliac-minitest:x64-uwp=fail backward-cpp:arm-neon-android=fail @@ -77,27 +77,27 @@ bit7z:arm-neon-android=fail ################################################################ # # These skips need to match the decision tree for which backends we use; see ports/blas/portfile.cmake -blas-test:x86-windows=pass # openblas -lapack-test:x86-windows=pass # lapack-reference[noblas] -blas-test:x64-windows=pass # openblas -lapack-test:x64-windows=pass # lapack-reference[noblas] -blas-test:x64-windows-static=pass # lapack-reference[blas] -lapack-test:x64-windows-static=pass # lapack-reference[blas] -blas-test:x64-windows-static-md=pass # lapack-reference[blas] -lapack-test:x64-windows-static-md=pass # lapack-reference[blas] -blas-test:x64-uwp=pass # openblas -lapack-test:x64-uwp=pass # clapack -blas-test:arm64-windows=pass # openblas -lapack-test:arm64-windows=pass # clapack +blas-test:arm64-android=pass # openblas +blas-test:arm64-osx=pass # accelerate framework blas-test:arm64-uwp=pass # openblas -lapack-test:arm64-uwp=pass # clapack +blas-test:arm64-windows=pass # openblas +blas-test:x64-linux=pass # openblas blas-test:x64-osx=pass # accelerate framework -lapack-test:x64-osx=pass # accelerate framework -blas-test:arm64-osx=pass # accelerate framework +blas-test:x64-uwp=pass # openblas +blas-test:x64-windows-static-md=pass # lapack-reference[blas] +blas-test:x64-windows-static=pass # lapack-reference[blas] +blas-test:x64-windows=pass # openblas +blas-test:x86-windows=pass # openblas lapack-test:arm64-osx=pass # accelerate framework -blas-test:x64-linux=pass # openblas +lapack-test:arm64-uwp=pass # clapack +lapack-test:arm64-windows=pass # clapack lapack-test:x64-linux=pass # lapack-reference[noblas] -blas-test:arm64-android=pass # openblas +lapack-test:x64-osx=pass # accelerate framework +lapack-test:x64-uwp=pass # clapack +lapack-test:x64-windows-static-md=pass # lapack-reference[blas] +lapack-test:x64-windows-static=pass # lapack-reference[blas] +lapack-test:x64-windows=pass # lapack-reference[noblas] +lapack-test:x86-windows=pass # lapack-reference[noblas] clapack:arm64-android=fail clapack:arm64-osx=skip @@ -132,22 +132,22 @@ bond:x64-osx=fail # Conflicts with openssl boringssl:arm-neon-android=skip boringssl:arm64-android=skip -boringssl:arm64-windows=skip +boringssl:arm64-osx=skip boringssl:arm64-uwp=skip +boringssl:arm64-windows=skip boringssl:x64-android=skip boringssl:x64-linux=skip boringssl:x64-osx=skip -boringssl:arm64-osx=skip boringssl:x64-uwp=skip -boringssl:x64-windows=skip -boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip +boringssl:x64-windows-static=skip +boringssl:x64-windows=skip boringssl:x86-windows=skip brpc:x64-android=fail buck-yeh-bux-mariadb-client:x86-windows=fail caf:arm-neon-android=fail -caf:arm64-uwp=fail caf:arm64-android=fail +caf:arm64-uwp=fail caf:x64-android=fail caf:x64-uwp=fail casclib:arm64-uwp=fail @@ -171,27 +171,27 @@ clrng:arm-neon-android=fail coin-or-ipopt:x64-linux=fail coroutine:arm-neon-android=fail coroutine:arm64-android=fail +coroutine:arm64-osx=fail coroutine:x64-android=fail coroutine:x64-osx=fail -coroutine:arm64-osx=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail cpp-ipc:x64-android=fail # Requires full C++20 support, currently absent from CI for these triplets. -cppslippi:x64-linux=fail cppcoro:arm-neon-android=fail cppcoro:arm64-android=fail cppcoro:arm64-osx=fail cppcoro:x64-android=fail cppcoro:x64-linux=fail cppcoro:x64-osx=fail +cppslippi:x64-linux=fail cpputest:arm-neon-android=fail crashpad:x64-linux=fail #Compilation failed due to the lack of Clang++ compiler. cserialport:arm-neon-android=fail cserialport:arm64-android=fail cserialport:x64-android=fail -ctbench:x64-osx=fail ctbench:arm64-osx=fail +ctbench:x64-osx=fail # Needs android-28 (hidden before NDK r26) cyclonedds:arm-neon-android=fail cyclonedds:arm64-android=fail @@ -209,8 +209,8 @@ dbg-macro:x64-android=skip dbghelp:arm64-uwp=skip dbghelp:arm64-windows=skip dbghelp:x64-uwp=skip -dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip +dbghelp:x64-windows-static=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip # Cross builds depend on try_run results @@ -219,10 +219,10 @@ dcmtk:arm64-android=fail dcmtk:arm64-windows=fail dcmtk:x64-android=fail # legacy directxsdk which conflicts with dxsdk-d3dx -directxsdk:x86-windows=skip -directxsdk:x64-windows=skip -directxsdk:x64-windows-static=skip directxsdk:x64-windows-static-md=skip +directxsdk:x64-windows-static=skip +directxsdk:x64-windows=skip +directxsdk:x86-windows=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail discordcoreapi:x64-linux=skip # cause linux CI to hang https://github.com/microsoft/vcpkg/pull/40229 @@ -238,9 +238,9 @@ elfio:x64-android=fail # Checks for gnu extension so only works with gcc. elfutils:arm-neon-android=fail elfutils:arm64-android=fail +elfutils:arm64-osx=fail elfutils:x64-android=fail elfutils:x64-osx=fail -elfutils:arm64-osx=fail epsilon:arm64-uwp=fail epsilon:x64-uwp=fail evpp:arm-neon-android=fail @@ -265,14 +265,14 @@ fltk:arm64-android=fail fltk:x64-android=fail # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because # fluidlite has no dependencies and thus is less likely to be broken by another package. +fluidlite:arm64-osx=skip fluidlite:arm64-uwp=skip fluidlite:arm64-windows=skip fluidlite:x64-linux=skip fluidlite:x64-osx=skip -fluidlite:arm64-osx=skip fluidlite:x64-uwp=skip -fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip +fluidlite:x64-windows-static=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip fmem:arm-neon-android=fail @@ -288,8 +288,8 @@ freeglut:arm-neon-android=fail freeglut:arm64-android=fail freeglut:x64-android=fail # Needs XQuartz -freeglut:x64-osx=fail freeglut:arm64-osx=fail +freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm-neon-android=fail freeopcua:arm64-android=fail @@ -317,10 +317,10 @@ gamenetworkingsockets:x64-android=fail # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 # gazebo is broken due it depend on old ports that already in the new versions. # There is an open PR that try to fix that. -gazebo:x64-windows=fail +gazebo:x64-linux=fail gazebo:x64-windows-static-md=fail +gazebo:x64-windows=fail gazebo:x86-windows=fail -gazebo:x64-linux=fail gdk-pixbuf:arm-neon-android=fail gdk-pixbuf:arm64-android=fail gdk-pixbuf:x64-android=fail @@ -331,8 +331,8 @@ gherkin-c:arm-neon-android=fail gherkin-c:arm64-android=fail gherkin-c:x64-android=fail # Conflicts with libevent -gherkin-c:arm64-windows = skip gherkin-c:arm64-uwp = skip +gherkin-c:arm64-windows = skip gherkin-c:x64-linux = skip gherkin-c:x64-osx = skip gherkin-c:x64-uwp = skip @@ -344,8 +344,8 @@ gl3w:arm-neon-android=fail gl3w:arm64-android=fail gl3w:x64-android=fail glfw3:arm-neon-android=fail -glfw3:arm64-uwp=fail glfw3:arm64-android=fail +glfw3:arm64-uwp=fail glfw3:x64-android=fail glfw3:x64-uwp=fail glibmm:x64-windows-static-md=fail @@ -355,9 +355,9 @@ graphicsmagick:x64-uwp=fail # gsoap does not offer stable public source downloads gsoap:x64-android=fail gsoap:x64-windows = skip -gsoap:x86-windows = skip gsoap:x64-windows-static = skip gsoap:x64-windows-static-md = skip +gsoap:x86-windows = skip gstreamer:arm-neon-android=fail gstreamer:arm64-android=fail gstreamer:x64-android=fail @@ -368,10 +368,10 @@ gul14:arm-neon-android=fail gul14:arm64-android=fail gul14:x64-android=fail # see ignition skips below +gz-gui7:x64-osx=fail gz-tools2:arm-neon-android=fail -gz-tools2:x64-android=fail gz-tools2:arm64-android=fail -gz-gui7:x64-osx=fail +gz-tools2:x64-android=fail halide:x64-windows-static=fail hexl:x64-android=fail highs:arm-neon-android=fail @@ -382,13 +382,13 @@ hwloc:arm-neon-android=fail hwloc:arm64-android=fail hwloc:x64-android=fail hyperscan:x64-android=fail -iceoryx:x64-android=fail -iceoryx:arm64-android=fail iceoryx:arm-neon-android=fail +iceoryx:arm64-android=fail +iceoryx:x64-android=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail -ignition-msgs1:arm64-windows=fail ignition-msgs1:arm64-uwp=fail +ignition-msgs1:arm64-windows=fail ignition-msgs1:x64-android=fail ignition-msgs1:x64-uwp=fail ignition-msgs5:x64-android=fail @@ -414,8 +414,8 @@ jaeger-client-cpp:arm-neon-android=fail jaeger-client-cpp:x64-android=fail jemalloc:arm-neon-android=fail jemalloc:arm64-android=fail -jemalloc:arm64-windows=fail jemalloc:arm64-uwp=fail +jemalloc:arm64-windows=fail jemalloc:x64-android=fail jemalloc:x64-uwp=fail jinja2cpplight:arm-neon-android=fail @@ -425,13 +425,13 @@ kfr:x64-android=fail kfr:x64-uwp=fail # needs android-24 kubazip:arm-neon-android=fail -lcm:x64-windows-static=fail -lcm:x64-windows-static-md=fail lcm:arm-neon-android=fail lcm:arm64-android=fail lcm:x64-android=fail -leptonica:x64-uwp=fail +lcm:x64-windows-static-md=fail +lcm:x64-windows-static=fail leptonica:arm64-uwp=fail +leptonica:x64-uwp=fail libaiff:x64-linux=fail libbson:arm-neon-android=fail libbson:arm64-android=fail @@ -443,8 +443,8 @@ libcaer:x64-android=fail libcanberra:arm-neon-android=fail libcanberra:arm64-android=fail libcanberra:x64-android=fail -libcoro:x64-osx=fail libcoro:arm64-osx=fail +libcoro:x64-osx=fail libcpplocate:arm-neon-android=fail libcpplocate:arm64-android=fail libcpplocate:x64-android=fail @@ -452,8 +452,8 @@ libcrafter:arm-neon-android=fail libcrafter:arm64-android=fail libcrafter:x64-android=fail libdc1394:arm-neon-android=fail -libdc1394:x64-android=fail libdc1394:arm64-android=fail +libdc1394:x64-android=fail # 32-bit needs android-24 libflac:arm-neon-android=fail # error: call to undeclared function 'mktime_z' @@ -461,27 +461,27 @@ libgnutls:arm-neon-android=fail libgnutls:arm64-android=fail libgnutls:x64-android=fail # Fails to build due to incompatible delcaration of select in macOS 14.2 -libgo:x64-osx=fail libgo:x64-android=fail +libgo:x64-osx=fail libgpg-error:arm-neon-android=fail libgpg-error:arm64-android=fail libgpg-error:x64-android=fail # Missing system libraries on linux to run/prepare autoconf -libgpod:x64-linux=fail libfreenect2:arm64-windows=fail libgpod:arm-neon-android=fail libgpod:arm64-android=fail libgpod:x64-android=fail +libgpod:x64-linux=fail libgxps:arm-neon-android=fail libgxps:arm64-android=fail libgxps:x64-android=fail libgxps:x64-windows-static=fail libhdfs3:arm-neon-android=fail libhdfs3:arm64-android=fail +libhdfs3:arm64-osx=fail libhdfs3:x64-android=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail -libhdfs3:arm64-osx=fail # needs android-24 libimobiledevice-glue:arm-neon-android=fail libimobiledevice-glue:arm64-android=fail @@ -489,20 +489,20 @@ libimobiledevice-glue:x64-android=fail # 120 min build time for libjxl arm64-uwp-rel, reason unknown libjxl:arm64-uwp=skip liblo:arm-neon-android=fail -liblo:arm64-uwp=fail liblo:arm64-android=fail +liblo:arm64-uwp=fail liblo:x64-android=fail liblo:x64-uwp=fail # libmariadb conflicts with libmysql +libmariadb:arm64-osx = skip libmariadb:arm64-windows = skip libmariadb:x64-linux = skip libmariadb:x64-osx = skip -libmariadb:arm64-osx = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip -libmaxminddb:arm64-android=fail libmaxminddb:arm-neon-android=fail +libmaxminddb:arm64-android=fail libmaxminddb:x64-android=fail libmikmod:arm-neon-android=fail libmikmod:arm64-android=fail @@ -538,8 +538,8 @@ libtar:arm64-android=fail libtcod:arm-neon-android=fail libtcod:arm64-android=fail libtcod:x64-android=fail -libtomcrypt:arm64-windows=fail libtomcrypt:arm64-uwp=fail +libtomcrypt:arm64-windows=fail libusb-win32:arm64-uwp=fail libusb-win32:x64-uwp=fail # needs android-26 @@ -556,8 +556,8 @@ linenoise-ng:arm64-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail live555:arm-neon-android=fail -live555:arm64-uwp=fail live555:arm64-android=fail +live555:arm64-uwp=fail live555:x64-android=fail live555:x64-uwp=fail llfio:arm-neon-android=fail @@ -582,9 +582,9 @@ memorymodule:arm-neon-android=fail memorymodule:arm64-android=fail memorymodule:x64-android=fail # Missing dependent libraries. +mesa:arm64-osx=fail mesa:x64-linux=fail mesa:x64-osx=fail -mesa:arm64-osx=fail milerius-sfml-imgui:x64-windows-static=fail minifb:arm-neon-android=fail minifb:arm64-android=fail @@ -598,12 +598,6 @@ moos-core:arm64-android=fail moos-core:x64-android=fail mpir:x64-android=fail # ms-gltf require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines -ms-gdkx:x64-windows=fail -ms-gdkx:x64-windows-static=fail -ms-gdkx:x64-windows-static-md=fail -ms-gltf:arm-neon-android=fail -ms-gltf:arm64-android=fail -ms-gltf:x64-android=fail monkeys-audio:arm64-windows=fail monkeys-audio:x64-windows-static=fail moos-core:x64-windows-static=fail @@ -611,15 +605,21 @@ moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail +ms-gdkx:x64-windows-static-md=fail +ms-gdkx:x64-windows-static=fail +ms-gdkx:x64-windows=fail +ms-gltf:arm-neon-android=fail +ms-gltf:arm64-android=fail +ms-gltf:x64-android=fail # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 -mpir:x86-windows=skip -mpir:x64-windows=skip -mpir:x64-windows-static=skip -mpir:x64-windows-static-md=skip mpir:arm64-windows=skip -mpir:x64-osx=skip mpir:x64-linux=skip +mpir:x64-osx=skip +mpir:x64-windows-static-md=skip +mpir:x64-windows-static=skip +mpir:x64-windows=skip +mpir:x86-windows=skip msmpi:arm64-windows=fail munit:x64-android=fail mysql-connector-cpp:arm-neon-android=fail @@ -627,10 +627,10 @@ mysql-connector-cpp:arm64-android=fail mysql-connector-cpp:x64-android=fail nana:arm-neon-android=fail nana:arm64-android=fail +nana:arm64-osx=fail nana:x64-android=fail nana:x64-linux=fail nana:x64-osx=fail -nana:arm64-osx=fail nanodbc:x64-linux=fail netcdf-c:arm-neon-android=fail netcdf-c:arm64-android=fail @@ -650,11 +650,11 @@ ntf-core:x64-windows=fail ntf-core:x86-windows=fail nvtt:x64-android=fail oatpp-libressl:x64-android=fail -octave:x86-windows=fail -octave:x64-windows=fail -octave:x64-windows-static=fail -octave:x64-windows-static-md=fail octave:x64-osx=fail +octave:x64-windows-static-md=fail +octave:x64-windows-static=fail +octave:x64-windows=fail +octave:x86-windows=fail ode:arm64-windows=fail offscale-libetcd-cpp:arm64-uwp=fail offscale-libetcd-cpp:x64-uwp=fail @@ -674,8 +674,8 @@ ompl:arm64-android=fail ompl:x64-android=fail # failed with FILE_CONFLICTS https://github.com/microsoft/vcpkg/pull/40151 omplapp:arm64-osx=skip -omplapp:x64-osx=skip omplapp:x64-linux=skip +omplapp:x64-osx=skip # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencc:x64-android=fail @@ -687,8 +687,8 @@ openldap:arm-neon-android=fail openldap:arm64-android=fail openldap:x64-android=fail openmama:x64-windows-static-md=fail -openmesh:arm64-windows=fail openmesh:arm64-uwp=fail +openmesh:arm64-windows=fail openmesh:x64-uwp=fail openmpi:arm-neon-android=fail openmpi:arm64-android=fail @@ -696,9 +696,9 @@ openmpi:x64-android=fail openmvg:x64-linux=fail openscap:arm-neon-android=fail openscap:arm64-android=fail +openscap:arm64-osx=fail openscap:x64-android=fail openscap:x64-osx=fail -openscap:arm64-osx=fail openscap:x64-windows-static=fail opensubdiv:x64-android=fail openturns:arm64-windows=fail @@ -728,8 +728,8 @@ plplot:arm64-windows=fail pmdk:x64-android=fail pmdk:x64-osx=fail pmdk:x64-windows-static=fail -popsift:x64-windows-static-md=fail popsift:x64-linux=fail # segfaults :( +popsift:x64-windows-static-md=fail ptex:arm-neon-android=fail ptex:arm64-android=fail ptex:x64-android=fail @@ -740,11 +740,11 @@ python3:arm-neon-android=fail python3:arm64-android=fail python3:x64-android=fail # Not yet ready for these platforms. -qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail +qbittorrent:x64-osx=fail qpid-proton:arm-neon-android=fail -qpid-proton:arm64-uwp=fail qpid-proton:arm64-android=fail +qpid-proton:arm64-uwp=fail qpid-proton:x64-android=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail @@ -753,24 +753,24 @@ qt5-base:arm64-android=fail qt5-base:arm64-windows=fail qt5-base:x64-android=fail # Missing system libraries -qtwayland:x64-osx=skip qtwayland:arm64-osx=skip +qtwayland:x64-osx=skip # Missing system libraries -qt5-x11extras:x64-osx=skip qt5-x11extras:arm64-osx=skip +qt5-x11extras:x64-osx=skip quickfix:arm-neon-android=fail quickfix:arm64-android=fail qwt-qt6:x64-osx=fail rabit:arm-neon-android=fail rabit:arm64-android=fail rabit:x64-android=fail -rapidstring:arm64-windows=fail rapidstring:arm64-uwp=fail +rapidstring:arm64-windows=fail rapidstring:x64-linux=fail rapidstring:x64-uwp=fail -rapidstring:x64-windows=fail -rapidstring:x64-windows-static=fail rapidstring:x64-windows-static-md=fail +rapidstring:x64-windows-static=fail +rapidstring:x64-windows=fail rapidstring:x86-windows=fail # ALooper_pollAll no longer available raylib:arm64-android=fail @@ -782,11 +782,11 @@ replxx:arm-neon-android=fail replxx:arm64-android=fail replxx:x64-android=fail restbed:arm-neon-android=fail -restbed:arm64-uwp=fail restbed:arm64-android=fail +restbed:arm64-uwp=fail restbed:x64-uwp=fail -rpclib:arm64-windows=fail rpclib:arm64-uwp=fail +rpclib:arm64-windows=fail rpclib:x64-uwp=fail rtmidi:arm-neon-android=fail rtmidi:arm64-android=fail @@ -831,8 +831,8 @@ soil:arm64-android=fail soil:x64-android=fail solid3:arm64-android=fail spaceland:arm64-android=fail -spaceland:arm64-windows=fail spaceland:arm64-uwp=fail +spaceland:arm64-windows=fail spaceland:x64-android=fail spaceland:x64-uwp=fail spatialite-tools:arm-neon-android=fail @@ -845,8 +845,8 @@ spscqueue:x64-android=fail stormlib:arm64-uwp=fail stormlib:x64-uwp=fail stxxl:arm-neon-android=fail -systemc:arm64-windows=fail systemc:arm64-uwp=fail +systemc:arm64-windows=fail systemc:x64-uwp=fail teemo:x64-android=fail @@ -862,10 +862,10 @@ tensorflow-cc:x64-windows=fail # tensorflow is broken with system libraries on macOS 13.5 # Also skipping because our macOS machines are relatively underpowered and this saves 8 hours of CI # time for a relatively unpopular library / system combo. -tensorflow:x64-osx=skip tensorflow:arm64-osx =skip -tensorflow-cc:x64-osx=skip +tensorflow:x64-osx=skip tensorflow-cc:arm64-osx =skip +tensorflow-cc:x64-osx=skip thorvg:arm-neon-android=fail tinycthread:arm-neon-android=fail @@ -873,8 +873,8 @@ tinycthread:arm64-android=fail tinycthread:x64-android=fail torch-th:arm-neon-android=fail torch-th:arm64-android=fail -torch-th:arm64-windows=fail torch-th:arm64-uwp=fail +torch-th:arm64-windows=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail @@ -927,8 +927,8 @@ wordnet:arm-neon-android=fail wordnet:arm64-android=fail wordnet:x64-android=fail workflow:arm-neon-android=fail -workflow:arm64-uwp=fail workflow:arm64-android=fail +workflow:arm64-uwp=fail workflow:x64-android=fail workflow:x64-uwp=fail wpilib:arm-neon-android=fail # requires full c++20 support @@ -937,9 +937,9 @@ wpilib:x64-android=fail # requires full c++20 support # No xorg-macros available on osx xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail +xbitmaps:arm64-osx=skip xbitmaps:x64-android=fail xbitmaps:x64-osx=skip -xbitmaps:arm64-osx=skip yajl:arm-neon-android=fail yajl:arm64-android=fail yajl:x64-android=fail @@ -949,12 +949,12 @@ zeroc-ice:x64-android=fail zyre:x64-windows-static-md=fail # Ports which needs to pass in CI -cmake:x64-windows=pass -cmake:x64-windows-static=pass -cmake:x64-windows-static-md=pass cmake:arm64-windows=pass cmake:x64-linux=pass cmake:x64-osx=pass +cmake:x64-windows-static-md=pass +cmake:x64-windows-static=pass +cmake:x64-windows=pass cmake-user:arm64-uwp=pass cmake-user:arm64-windows=pass cmake-user:x64-linux=pass @@ -969,17 +969,17 @@ gtk:x64-osx=pass gtk:x64-windows-static-md=pass gtk:x64-windows=pass gtk:x86-windows=pass -qt:x64-windows=pass qt:x64-windows-static=pass +qt:x64-windows=pass # qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass. qt:arm64-windows=pass qt:x64-linux=pass # qt:x64-osx=pass # gstreamer issues preventing qtmultimedia -vcpkg-ci-arrow:x64-windows=pass -vcpkg-ci-arrow:x64-windows-static=pass -vcpkg-ci-arrow:x64-windows-static-md=pass -vcpkg-ci-arrow:x64-osx=pass vcpkg-ci-arrow:x64-linux=pass +vcpkg-ci-arrow:x64-osx=pass +vcpkg-ci-arrow:x64-windows-static-md=pass +vcpkg-ci-arrow:x64-windows-static=pass +vcpkg-ci-arrow:x64-windows=pass vcpkg-ci-boost:arm-neon-android=pass vcpkg-ci-boost:arm64-android=pass vcpkg-ci-boost:arm64-uwp=pass @@ -994,11 +994,11 @@ vcpkg-ci-boost:x64-windows=pass vcpkg-ci-boost:x86-windows=pass vcpkg-ci-curl:arm-neon-android=pass vcpkg-ci-curl:arm64-android=pass +vcpkg-ci-curl:arm64-osx=pass +vcpkg-ci-curl:arm64-windows=pass vcpkg-ci-curl:x64-android=pass vcpkg-ci-curl:x64-linux=pass -vcpkg-ci-curl:arm64-osx=pass vcpkg-ci-curl:x64-osx=pass -vcpkg-ci-curl:arm64-windows=pass vcpkg-ci-curl:x64-windows-static-md=pass vcpkg-ci-curl:x64-windows-static=pass vcpkg-ci-curl:x64-windows=pass @@ -1037,9 +1037,9 @@ vcpkg-ci-gdal:x86-windows=pass vcpkg-ci-itk:arm64-osx=pass vcpkg-ci-itk:x64-linux=pass vcpkg-ci-itk:x64-osx=pass -vcpkg-ci-itk:x64-windows=pass -vcpkg-ci-itk:x64-windows-static=pass vcpkg-ci-itk:x64-windows-static-md=pass +vcpkg-ci-itk:x64-windows-static=pass +vcpkg-ci-itk:x64-windows=pass vcpkg-ci-itk:x86-windows=pass vcpkg-ci-llvm:x64-linux=pass vcpkg-ci-llvm:x64-osx=pass @@ -1049,9 +1049,9 @@ vcpkg-ci-llvm:x64-windows=pass vcpkg-ci-llvm:x86-windows=pass vcpkg-ci-mathgl:x64-linux=pass vcpkg-ci-mathgl:x64-osx=pass -vcpkg-ci-mathgl:x64-windows=pass -vcpkg-ci-mathgl:x64-windows-static=pass vcpkg-ci-mathgl:x64-windows-static-md=pass +vcpkg-ci-mathgl:x64-windows-static=pass +vcpkg-ci-mathgl:x64-windows=pass vcpkg-ci-mathgl:x86-windows=pass vcpkg-ci-opencv:arm-neon-android=pass vcpkg-ci-opencv:arm64-android=pass @@ -1066,15 +1066,15 @@ vcpkg-ci-opencv:x64-windows-static-md=pass vcpkg-ci-opencv:x64-windows-static=pass vcpkg-ci-opencv:x64-windows=pass vcpkg-ci-opencv:x86-windows=pass -vcpkg-ci-openimageio:x86-windows=pass -vcpkg-ci-openimageio:x64-windows=pass -vcpkg-ci-openimageio:x64-windows-static=pass -vcpkg-ci-openimageio:x64-windows-static-md=pass -vcpkg-ci-openimageio:x64-osx=pass vcpkg-ci-openimageio:x64-linux=pass +vcpkg-ci-openimageio:x64-osx=pass +vcpkg-ci-openimageio:x64-windows-static-md=pass +vcpkg-ci-openimageio:x64-windows-static=pass +vcpkg-ci-openimageio:x64-windows=pass +vcpkg-ci-openimageio:x86-windows=pass +vcpkg-ci-paraview:arm64-osx=pass vcpkg-ci-paraview:x64-linux=pass vcpkg-ci-paraview:x64-osx=pass -vcpkg-ci-paraview:arm64-osx=pass vcpkg-ci-paraview:x64-windows-static-md=pass vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass @@ -1093,9 +1093,9 @@ vcpkg-ci-skia:x64-windows=pass vcpkg-ci-skia:x86-windows=pass vcpkg-ci-soci:x64-linux=pass vcpkg-ci-soci:x64-osx=pass -vcpkg-ci-soci:x64-windows=pass -vcpkg-ci-soci:x64-windows-static=pass vcpkg-ci-soci:x64-windows-static-md=pass +vcpkg-ci-soci:x64-windows-static=pass +vcpkg-ci-soci:x64-windows=pass vcpkg-ci-sqlpp11:arm-neon-android=pass vcpkg-ci-sqlpp11:arm64-android=pass vcpkg-ci-sqlpp11:arm64-osx=pass @@ -1116,9 +1116,9 @@ vcpkg-ci-vxl:arm64-windows=pass vcpkg-ci-vxl:x64-android=pass vcpkg-ci-vxl:x64-linux=pass vcpkg-ci-vxl:x64-osx=pass -vcpkg-ci-vxl:x64-windows=pass -vcpkg-ci-vxl:x64-windows-static=pass vcpkg-ci-vxl:x64-windows-static-md=pass +vcpkg-ci-vxl:x64-windows-static=pass +vcpkg-ci-vxl:x64-windows=pass vcpkg-ci-vxl:x86-windows=pass vcpkg-ci-wxwidgets:arm64-windows=pass vcpkg-ci-wxwidgets:x64-linux=pass From 3bbc4bf66d6027ebc5360e1097f62a23e6c17f14 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 8 Sep 2025 15:16:34 -0700 Subject: [PATCH 56/58] Revert macOS upgrade --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 2c2cdfcae24ebd..fe6de219e79258 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -69,14 +69,14 @@ jobs: - template: osx/azure-pipelines.yml parameters: jobName: x64_osx - poolName: 'PrOsx-2025-08-12' + poolName: 'PrOsx-2025-01-24' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} - template: osx/azure-pipelines.yml parameters: jobName: arm64_osx - poolName: 'PrOsx-2025-08-12-arm64' + poolName: 'PrOsx-2025-01-24-arm64' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} From 1f92c6b677b03b7e5fb713940bfae2535b09ced1 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 10 Sep 2025 12:30:50 -0700 Subject: [PATCH 57/58] Most-merge fixes. --- ports/libqcow/CMakeLists.txt | 83 ++++++++++++ ports/libqcow/Config.cmake.in | 4 + ports/libqcow/macos_fixes.patch | 38 ++++++ ports/libqcow/portfile.cmake | 35 +++++ ports/libqcow/vcpkg.json | 22 +++ ports/mecab/CMakeLists.txt | 67 ++++++++++ ports/mecab/Config.cmake.in | 4 + ports/mecab/fix-missing-functional.patch | 12 ++ ports/mecab/fix_wpath_unsigned.patch | 40 ++++++ ports/mecab/portfile.cmake | 31 +++++ ports/mecab/vcpkg.json | 17 +++ scripts/ci.baseline.txt | 163 ----------------------- scripts/ci.feature.baseline.txt | 23 ---- versions/baseline.json | 64 --------- 14 files changed, 353 insertions(+), 250 deletions(-) create mode 100644 ports/libqcow/CMakeLists.txt create mode 100644 ports/libqcow/Config.cmake.in create mode 100644 ports/libqcow/macos_fixes.patch create mode 100644 ports/libqcow/portfile.cmake create mode 100644 ports/libqcow/vcpkg.json create mode 100644 ports/mecab/CMakeLists.txt create mode 100644 ports/mecab/Config.cmake.in create mode 100644 ports/mecab/fix-missing-functional.patch create mode 100644 ports/mecab/fix_wpath_unsigned.patch create mode 100644 ports/mecab/portfile.cmake create mode 100644 ports/mecab/vcpkg.json diff --git a/ports/libqcow/CMakeLists.txt b/ports/libqcow/CMakeLists.txt new file mode 100644 index 00000000000000..ac199f48fe9ccf --- /dev/null +++ b/ports/libqcow/CMakeLists.txt @@ -0,0 +1,83 @@ +cmake_minimum_required(VERSION 3.12) + +project(libqcow C) + +find_package(OpenSSL) +find_package(ZLIB REQUIRED) + +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) + add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_compile_definitions(HAVE_LOCAL_LIBCAES) +add_compile_definitions(HAVE_LOCAL_LIBCERROR) +add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) +add_compile_definitions(HAVE_LOCAL_LIBCDATA) +add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) +add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) +add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) +add_compile_definitions(HAVE_LOCAL_LIBCFILE) +add_compile_definitions(HAVE_LOCAL_LIBCPATH) +add_compile_definitions(HAVE_LOCAL_LIBUNA) +add_compile_definitions(HAVE_LOCAL_LIBBFIO) +add_compile_definitions(HAVE_LOCAL_LIBFCACHE) +add_compile_definitions(HAVE_LOCAL_LIBFDATA) +add_compile_definitions(ZLIB_DLL) + +if(UNIX) + configure_file(common/config.h.in common/config.h) + add_compile_definitions(HAVE_CONFIG_H) + add_compile_definitions(LOCALEDIR="/usr/share/locale") +endif() + +if(MSVC) + add_compile_definitions(LIBQCOW_DLL_EXPORT) + set(LIB_RC libqcow/libqcow.rc) +endif() + + +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) + +# Add CMake find_package() integration +set(PROJECT_TARGET_NAME "${PROJECT_NAME}") +set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") +set(NAMESPACE "libqcow::") + +# Source files +file(GLOB LIB_SRC lib*/*.c) + +# Headers +file(GLOB LIB_INST_HEADERS include/libqcow/*.h) + +add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) + +target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) +target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcaes ./libcdata ./libcerror ./libcfile ./libclocale) +target_include_directories(${PROJECT_NAME} PRIVATE ./libcnotify ./libcpath ./libcsplit ./libcthreads) +target_include_directories(${PROJECT_NAME} PRIVATE ./libfcache ./libfdata ./libuna) + +target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB OpenSSL::Crypto) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + +install(FILES ${LIB_INST_HEADERS} DESTINATION include/libqcow) +install(FILES include/libqcow.h DESTINATION include) + + +# Generate and install libqcowConfig.cmake +configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") + +# Generate and install libqcowTargets*.cmake +install(EXPORT ${TARGETS_EXPORT_NAME} + NAMESPACE ${NAMESPACE} + DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/ports/libqcow/Config.cmake.in b/ports/libqcow/Config.cmake.in new file mode 100644 index 00000000000000..bd6bd4532b6282 --- /dev/null +++ b/ports/libqcow/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/libqcow/macos_fixes.patch b/ports/libqcow/macos_fixes.patch new file mode 100644 index 00000000000000..4e3061c22050de --- /dev/null +++ b/ports/libqcow/macos_fixes.patch @@ -0,0 +1,38 @@ +diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c +index a618083..5299c77 100644 +--- a/libcfile/libcfile_file.c ++++ b/libcfile/libcfile_file.c +@@ -56,7 +56,7 @@ + #elif defined( HAVE_CYGWIN_FS_H ) + #include + +-#elif defined( HAVE_LINUX_FS_H ) ++#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H ) + /* Required for Linux platforms that use a sizeof( u64 ) + * in linux/fs.h but have no typedef of it + */ +@@ -4128,6 +4128,11 @@ ssize_t libcfile_internal_file_io_control_read_with_error_code( + #error Missing file IO control with data function + #endif + ++// Force disable on Darwin, it can be erroneously defined ++#if defined ( __APPLE__ ) ++#undef HAVE_POSIX_FADVISE ++#endif ++ + /* Read data from a device file using IO control + * Returns the number of bytes read if successful or -1 on error + */ +diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c +index 96d1a31..621e748 100644 +--- a/libqcow/libqcow_i18n.c ++++ b/libqcow/libqcow_i18n.c +@@ -40,7 +40,7 @@ int libqcow_i18n_initialize( + + if( libqcow_i18n_initialized == 0 ) + { +-#if defined( HAVE_BINDTEXTDOMAIN ) ++#if !defined( __APPLE__ ) && defined( HAVE_BINDTEXTDOMAIN ) + if( bindtextdomain( + "libqcow", + LOCALEDIR ) == NULL ) diff --git a/ports/libqcow/portfile.cmake b/ports/libqcow/portfile.cmake new file mode 100644 index 00000000000000..35bb881d66cb15 --- /dev/null +++ b/ports/libqcow/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(LIB_VERSION 20221124) +set(LIB_FILENAME libqcow-alpha-${LIB_VERSION}.tar.gz) + +# Release distribution file contains configured sources, while the source code in the repository does not. +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/libyal/libqcow/releases/download/${LIB_VERSION}/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 5e48491ec8951473b8791fd6058d35b2d3c00b0206d4ca4fc69b6d42c26ba0a775efe41974989a3965a6a17f4361dd01f874aadef08fe5d80be75d9e6aea6450 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE ${ARCHIVE} + SOURCE_BASE ${LIB_VERSION} + PATCHES macos_fixes.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libqcow") + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# License and man +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libqcow/vcpkg.json b/ports/libqcow/vcpkg.json new file mode 100644 index 00000000000000..007db5163b6df8 --- /dev/null +++ b/ports/libqcow/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libqcow", + "version": "20221124", + "port-version": 1, + "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", + "homepage": "https://github.com/libyal/libqcow", + "license": "LGPL-3.0-or-later", + "supports": "!uwp & !xbox", + "dependencies": [ + "gettext", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/ports/mecab/CMakeLists.txt b/ports/mecab/CMakeLists.txt new file mode 100644 index 00000000000000..9ebf42ee121f3a --- /dev/null +++ b/ports/mecab/CMakeLists.txt @@ -0,0 +1,67 @@ +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) + +PROJECT(mecab VERSION 1.0) + +file(GLOB SOURCE_FILE + "*.cpp" + "*.c" +) +file(GLOB HEADERS_FILE + "*.h" +) + +message(STATUS "current cmake path: ${CMAKE_CURRENT_SOURCE_DIR}") +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-cost-train.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-dict-gen.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-dict-index.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-system-eval.cpp) +list(REMOVE_ITEM SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mecab-test-gen.cpp) +#list(REMOVE_ITEM SOURCE_FILE "mecab-cost-train.cpp" "mecab-dict-gen.cpp" "mecab-dict-index.cpp" "mecab-system-eval.cpp" "mecab-test-gen.cpp") + +add_library (mecab ${SOURCE_FILE}) +target_include_directories(mecab PUBLIC + $ + $) + +if(UNIX) + target_compile_definitions(mecab PUBLIC -DHAVE_UNISTD_H -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H -DHAVE_SYS_STAT_H -DHAVE_DIRENT_H -DDIC_VERSION=102 -DVERSION="@VERSION@" -DPACKAGE="mecab" -DMECAB_DEFAULT_RC="./mecabrc") +endif(UNIX) +if(WIN32) + target_compile_definitions(mecab PUBLIC -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 -DVERSION="@VERSION@" -DPACKAGE="mecab" -DUNICODE -D_UNICODE -DMECAB_DEFAULT_RC="mecabrc") +endif(WIN32) + + +include (GNUInstallDirs) +include(CMakePackageConfigHelpers) + +set (mecab_CMAKE_DIR share/mecab CACHE STRING "Installation dir") +set (targets_export_name mecabTargets CACHE INTERNAL "") + +install(TARGETS mecab + EXPORT ${targets_export_name} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +install(FILES ${HEADERS_FILE} DESTINATION include/mecab CONFIGURATIONS Release) + +install(EXPORT ${targets_export_name} + NAMESPACE mecab:: + DESTINATION ${mecab_CMAKE_DIR}) + +configure_package_config_file( + "${PROJECT_SOURCE_DIR}/Config.cmake.in" + "${PROJECT_BINARY_DIR}/mecabConfig.cmake" + INSTALL_DESTINATION ${mecab_CMAKE_DIR}) + + +write_basic_package_version_file( + ${PROJECT_BINARY_DIR}/mecabConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion ) + +install(FILES + ${PROJECT_BINARY_DIR}/mecabConfig.cmake + ${PROJECT_BINARY_DIR}/mecabConfigVersion.cmake + DESTINATION ${mecab_CMAKE_DIR}) diff --git a/ports/mecab/Config.cmake.in b/ports/mecab/Config.cmake.in new file mode 100644 index 00000000000000..927b3637b5a1f4 --- /dev/null +++ b/ports/mecab/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") +check_required_components(mecab) \ No newline at end of file diff --git a/ports/mecab/fix-missing-functional.patch b/ports/mecab/fix-missing-functional.patch new file mode 100644 index 00000000000000..773429ccc68208 --- /dev/null +++ b/ports/mecab/fix-missing-functional.patch @@ -0,0 +1,12 @@ +diff --git a/mecab/src/dictionary.h b/mecab/src/dictionary.h +index 7046023..32ad358 100644 +--- a/mecab/src/dictionary.h ++++ b/mecab/src/dictionary.h +@@ -10,6 +10,7 @@ + #include "mmap.h" + #include "darts.h" + #include "char_property.h" ++#include + + namespace MeCab { + diff --git a/ports/mecab/fix_wpath_unsigned.patch b/ports/mecab/fix_wpath_unsigned.patch new file mode 100644 index 00000000000000..d8dcf15099d228 --- /dev/null +++ b/ports/mecab/fix_wpath_unsigned.patch @@ -0,0 +1,40 @@ +diff --git a/mecab/src/common.h b/mecab/src/common.h +index d1fc459..2951d5a 100644 +--- a/mecab/src/common.h ++++ b/mecab/src/common.h +@@ -86,7 +86,8 @@ + #define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) + #define WPATH(path) (path) + #else +-#define WPATH(path) WPATH_FORCE(path) ++#define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) ++#define WPATH(path) (path) + #endif + #else + #define WPATH_FORCE(path) (path) +diff --git a/mecab/src/feature_index.cpp b/mecab/src/feature_index.cpp +index 051bdf8..fdd0145 100644 +--- a/mecab/src/feature_index.cpp ++++ b/mecab/src/feature_index.cpp +@@ -353,7 +353,7 @@ bool FeatureIndex::buildUnigramFeature(LearnerPath *path, + if (!r) goto NEXT; + os_ << r; + } break; +- case 't': os_ << (size_t)path->rnode->char_type; break; ++ case 't': os_ << (int)(size_t)path->rnode->char_type; break; + case 'u': os_ << ufeature; break; + case 'w': + if (path->rnode->stat == MECAB_NOR_NODE) { +diff --git a/mecab/src/writer.cpp b/mecab/src/writer.cpp +index 0ef6975..f068fa3 100644 +--- a/mecab/src/writer.cpp ++++ b/mecab/src/writer.cpp +@@ -257,7 +257,7 @@ bool Writer::writeNode(Lattice *lattice, + // input sentence + case 'S': os->write(lattice->sentence(), lattice->size()); break; + // sentence length +- case 'L': *os << lattice->size(); break; ++ case 'L': *os << (int)lattice->size(); break; + // morph + case 'm': os->write(node->surface, node->length); break; + case 'M': os->write(reinterpret_cast diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake new file mode 100644 index 00000000000000..83dc2cd8925025 --- /dev/null +++ b/ports/mecab/portfile.cmake @@ -0,0 +1,31 @@ +if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "arm64-windows" OR VCPKG_TARGET_TRIPLET STREQUAL "arm-uwp") + message(FATAL_ERROR "mecab does not support on this platform") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO taku910/mecab + REF 3a07c4eefaffb4e7a0690a7f4e5e0263d3ddb8a3 + SHA512 d3288cca7207daf66df4349819b64fc9cc069c775512cf0607ca855e9e5512509c36b0e2bb0e955478acae13ff0c35df7442f18a8458fab0ed664d62854c0b25 + HEAD_REF master + PATCHES + fix_wpath_unsigned.patch + fix-missing-functional.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/mecab/src") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}/mecab/src") +file(COPY "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${SOURCE_PATH}/mecab/src") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/mecab/src" + WINDOWS_USE_MSBUILD + OPTIONS + -DCMAKE_CXX_STANDARD=11 # 17 does not allow 'register' +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/mecab/COPYING") diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json new file mode 100644 index 00000000000000..ff532e5d69b687 --- /dev/null +++ b/ports/mecab/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mecab", + "version-date": "2019-09-25", + "port-version": 6, + "description": "A morphological analysis engine based on CRF", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 49cabba2262639..658ff9357e143e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -165,51 +165,12 @@ caf:arm64-android=fail caf:arm64-uwp=fail caf:x64-android=fail caf:x64-uwp=fail -# file conflict with dbg-macro -c-dbg-macro:arm64-osx=skip -c-dbg-macro:arm64-uwp=skip -c-dbg-macro:arm64-windows-static-md=skip -c-dbg-macro:arm64-windows=skip -c-dbg-macro:x64-linux=skip -c-dbg-macro:x64-osx=skip -c-dbg-macro:x64-uwp=skip -c-dbg-macro:x64-windows-release=skip -c-dbg-macro:x64-windows-static-md=skip -c-dbg-macro:x64-windows-static=skip -c-dbg-macro:x64-windows=skip -c-dbg-macro:x86-windows=skip casclib:arm64-uwp=fail casclib:x64-uwp=fail -catch-classic:arm-neon-android=skip -catch-classic:arm64-android=skip -catch-classic:arm64-osx=skip -catch-classic:arm64-uwp=skip -catch-classic:arm64-windows-static-md=skip -catch-classic:arm64-windows=skip -catch-classic:x64-android=skip -catch-classic:x64-linux=skip -catch-classic:x64-osx=skip -catch-classic:x64-uwp=skip -catch-classic:x64-windows-release=skip -catch-classic:x64-windows-static-md=skip -catch-classic:x64-windows-static=skip -catch-classic:x64-windows=skip -catch-classic:x86-windows=skip cctag:x64-windows-static-md=fail cello:arm64-uwp=fail cello:x64-uwp=fail chakracore:x64-linux=skip -# chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI -# broken on Windows because it does not yet support VS2022 -chromium-base:x64-windows-release=skip -chromium-base:x64-windows-static-md=skip -chromium-base:x64-windows-static=skip -chromium-base:x64-windows=skip -# broken on Linux because -chromium-base:x64-linux=skip -# broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache -# because the first attempt to build it fails, but subsequent attempts succeed -chromium-base:x64-osx=skip clamav:arm64-windows=fail clblas:arm-neon-android=fail clblas:arm64-android=fail @@ -257,9 +218,6 @@ czmq:x64-android=fail darknet:arm-neon-android=fail darknet:arm64-android=fail darknet:x64-android=fail -dbg-macro:arm-neon-android=skip -dbg-macro:arm64-android=skip -dbg-macro:x64-android=skip # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm64-uwp=skip dbghelp:arm64-windows-static-md=skip @@ -427,21 +385,6 @@ hyperscan:x64-android=fail iceoryx:arm-neon-android=fail iceoryx:arm64-android=fail iceoryx:x64-android=fail -ijg-libjpeg:arm-neon-android=skip -ijg-libjpeg:arm64-android=skip -ijg-libjpeg:arm64-osx=skip -ijg-libjpeg:arm64-uwp=skip -ijg-libjpeg:arm64-windows-static-md=skip -ijg-libjpeg:arm64-windows=skip -ijg-libjpeg:x64-android=skip -ijg-libjpeg:x64-linux=skip -ijg-libjpeg:x64-osx=skip -ijg-libjpeg:x64-uwp=skip -ijg-libjpeg:x64-windows-release=skip -ijg-libjpeg:x64-windows-static-md=fail -ijg-libjpeg:x64-windows-static=skip -ijg-libjpeg:x64-windows=skip -ijg-libjpeg:x86-windows=skip imgui-sfml:arm-neon-android=fail imgui-sfml:arm64-android=fail imgui-sfml:x64-android=fail @@ -525,8 +468,6 @@ libmariadb:x64-windows=skip libmaxminddb:arm-neon-android=fail libmaxminddb:arm64-android=fail libmaxminddb:x64-android=fail -# libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) -libmesh:x64-linux=skip libmikmod:arm-neon-android=fail libmikmod:arm64-android=fail libmikmod:x64-android=fail @@ -578,24 +519,9 @@ libtcod:x64-android=fail libtomcrypt:arm64-uwp=fail libtomcrypt:arm64-windows-static-md=fail libtomcrypt:arm64-windows=fail -# upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253 -libvmdk:arm-neon-android=skip -libvmdk:arm64-android=skip -libvmdk:arm64-osx=skip -libvmdk:arm64-windows-static-md=skip -libvmdk:arm64-windows=skip -libvmdk:x64-android=skip -libvmdk:x64-linux=skip -libvmdk:x64-osx=skip -libvmdk:x64-windows-release=skip -libvmdk:x64-windows-static-md=skip -libvmdk:x64-windows-static=skip -libvmdk:x64-windows=skip -libvmdk:x86-windows=skip libwandio:arm-neon-android=fail libwandio:arm64-android=fail libwandio:x64-android=fail -libxaw:x64-windows-static=skip # Clang 19 thinks inline asm in this port is malformed: libxt:x64-windows-release=fail libxt:x64-windows=fail @@ -669,22 +595,6 @@ ms-gdkx:x64-windows-release=fail ms-gdkx:x64-windows-static-md=fail ms-gdkx:x64-windows-static=fail ms-gdkx:x64-windows=fail -# Conflicts with libjpeg-turbo -mozjpeg:arm-neon-android=fail -mozjpeg:arm64-android=fail -mozjpeg:arm64-osx=skip -mozjpeg:arm64-uwp=skip -mozjpeg:arm64-windows-static-md=skip -mozjpeg:arm64-windows=skip -mozjpeg:x64-android=fail -mozjpeg:x64-linux=skip -mozjpeg:x64-osx=skip -mozjpeg:x64-uwp=skip -mozjpeg:x64-windows-release=skip -mozjpeg:x64-windows-static-md=skip -mozjpeg:x64-windows-static=skip -mozjpeg:x64-windows=skip -mozjpeg:x86-windows=skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 mpir:arm64-windows-static-md=skip @@ -753,22 +663,6 @@ openvino:arm64-osx=skip # conflicts with kleidiai openvino:arm64-windows-static-md=fail openvino:arm64-windows=fail openvr:x64-windows-static=fail -# Conflicts with optional-lite, by the same author -optional-bare:arm-neon-android=skip -optional-bare:arm64-android=skip -optional-bare:arm64-osx=skip -optional-bare:arm64-uwp=skip -optional-bare:arm64-windows-static-md=skip -optional-bare:arm64-windows=skip -optional-bare:x64-android=skip -optional-bare:x64-linux=skip -optional-bare:x64-osx=skip -optional-bare:x64-uwp=skip -optional-bare:x64-windows-release=skip -optional-bare:x64-windows-static-md=skip -optional-bare:x64-windows-static=skip -optional-bare:x64-windows=skip -optional-bare:x86-windows=skip orange-math:x64-linux=fail orc:arm-neon-android=fail orc:arm64-android=fail @@ -803,16 +697,6 @@ qt5-base:arm64-android=fail qt5-base:arm64-windows-static-md=fail qt5-base:arm64-windows=fail qt5-base:x64-android=fail -# Skip deprecated Qt module -# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) -qt5-canvas3d:arm64-osx=skip -qt5-canvas3d:x64-linux=skip -qt5-canvas3d:x64-osx=skip -qt5-canvas3d:x64-windows-release=skip -qt5-canvas3d:x64-windows-static-md=skip -qt5-canvas3d:x64-windows-static=skip -qt5-canvas3d:x64-windows=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-release=skip @@ -835,21 +719,6 @@ qtwayland:x64-osx=skip quickfix:arm-neon-android=fail quickfix:arm64-android=fail qwt-qt6:x64-osx=fail -range-v3-vs2015:arm-neon-android=skip -range-v3-vs2015:arm64-android=skip -range-v3-vs2015:arm64-osx=skip -range-v3-vs2015:arm64-uwp=skip -range-v3-vs2015:arm64-windows-static-md=skip -range-v3-vs2015:arm64-windows=skip -range-v3-vs2015:x64-android=skip -range-v3-vs2015:x64-linux=skip -range-v3-vs2015:x64-osx=skip -range-v3-vs2015:x64-uwp=skip -range-v3-vs2015:x64-windows-release=skip -range-v3-vs2015:x64-windows-static-md=skip -range-v3-vs2015:x64-windows-static=skip -range-v3-vs2015:x64-windows=skip -range-v3-vs2015:x86-windows=skip rapidstring:arm64-uwp=fail rapidstring:arm64-windows-static-md=fail rapidstring:arm64-windows=fail @@ -864,17 +733,6 @@ rapidstring:x86-windows=fail rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail -rbdl-orb:arm64-uwp=skip -rbdl-orb:arm64-windows-static-md=skip -rbdl-orb:arm64-windows=skip -rbdl-orb:x64-linux=skip -rbdl-orb:x64-osx=skip -rbdl-orb:x64-uwp=skip -rbdl-orb:x64-windows-release=skip -rbdl-orb:x64-windows-static-md=skip -rbdl-orb:x64-windows-static=skip -rbdl-orb:x64-windows=skip -rbdl-orb:x86-windows=skip restbed:arm-neon-android=fail restbed:arm64-android=fail restbed:arm64-uwp=fail @@ -891,21 +749,6 @@ salome-medcoupling:x64-linux=fail saucer:arm64-osx=fail # std::move_only_function is not supported saucer:x64-linux=fail # requires gcc14 or later saucer:x64-osx=fail # std::move_only_function is not supported -sciter:arm-neon-android=fail -sciter:arm64-android=fail -sciter:arm64-osx=skip -sciter:arm64-uwp=skip -sciter:arm64-windows-static-md=skip -sciter:arm64-windows=skip -sciter:x64-android=fail -sciter:x64-linux=skip -sciter:x64-osx=skip -sciter:x64-uwp=skip -sciter:x64-windows-release=skip -sciter:x64-windows-static-md=skip -sciter:x64-windows-static=skip -sciter:x64-windows=skip -sciter:x86-windows=skip septag-sx:x64-android=fail sfgui:arm-neon-android=fail sfgui:arm64-android=fail @@ -959,12 +802,6 @@ spaceland:x64-uwp=fail spatialite-tools:arm-neon-android=fail spatialite-tools:arm64-android=fail spatialite-tools:x64-android=fail -spdk:x64-linux=fail -spdk-isal:arm-neon-android=fail -spdk-isal:arm64-android=fail -spdk-isal:x64-android=fail -# Conflict with isal, and "internal" dep of spdk:x64-linux=fail -spdk-isal:x64-linux=skip spscqueue:arm-neon-android=fail spscqueue:arm64-android=fail spscqueue:x64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ecbed4d25c5300..50b61cac1d4202 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -77,9 +77,6 @@ cctag:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail chartdir=skip # chartdir does not offer stable download URLs -chromium-base:x64-linux=skip # broken on Linux because -chromium-base:x64-osx=skip # broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache because the first attempt to build it fails, but subsequent attempts succeed -chromium-base(windows) =skip # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI broken on Windows because it does not yet support VS2022 clamav:arm64-windows=fail clapack:arm64-osx=skip clapack:x64-linux=skip @@ -255,7 +252,6 @@ libusbmuxd:x64-osx=fail libusbmuxd:x64-uwp=fail libuv:arm-uwp=fail libuv:x64-uwp=fail -libvmdk=skip #Skip detection to avoid upstream remove older releases libwandio:arm-uwp=fail libwandio:arm64-windows=fail libwandio:x64-uwp=fail @@ -428,7 +424,6 @@ qbittorrent:x64-osx=fail # Not yet ready for these platforms. qt-advanced-docking-system(android)=fail # qt5-base: no cross builds qt5-base(arm & windows & !uwp)=fail -qt5-canvas3d=skip # Skip deprecated Qt module (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-wayland:x64-osx=fail # Missing system libraries qt5-webengine(!(arm & windows) & !uwp) = fail # Missing prerequisites for CI success qt5-x11extras(osx)=fail # Missing system libraries @@ -513,23 +508,6 @@ spaceland:arm64-windows-static-md=fail spaceland:arm64-windows=fail spaceland:x64-android=fail spaceland:x64-uwp=fail -spdk:x64-linux=fail -spdk-dpdk:arm-uwp=fail -spdk-dpdk:arm64-windows=fail -spdk-dpdk:x64-osx=fail -spdk-dpdk:x64-uwp=fail -spdk-dpdk:x64-windows-static-md=fail -spdk-dpdk:x64-windows-static=fail -spdk-dpdk:x64-windows=fail -spdk-dpdk:x86-windows=fail -spdk-ipsec:arm-uwp=fail -spdk-ipsec:arm64-windows=fail -spdk-ipsec:x64-osx=fail -spdk-ipsec:x64-uwp=fail -spdk-ipsec:x64-windows-static-md=fail -spdk-ipsec:x64-windows-static=fail -spdk-ipsec:x64-windows=fail -spdk-ipsec:x86-windows=fail stormlib:arm-uwp=fail stormlib:x64-uwp=fail stxxl:arm-uwp=fail @@ -2307,7 +2285,6 @@ qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](osx) = skip # no x11 in CI, qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](windows) = skip # no x11 in CI qtwebengine = skip # Takes too long to feature test at ~3 hours per feature s2n = skip # builds too slow -sciter = skip # The sciter port is deprecated by upstream and conflicts with upstream's replacement. vtk[atlmfc,cgns,cuda,geojson,ioocct,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,paraview,proj,python,qt,seacas,sql,tbb,utf8,vtkm]:x64-windows-static-md = skip vtk[atlmfc,cgns,geojson,ioocct,libharu,libtheora,mpi,netcdf,opengl,openmp,openvr,proj,python,qt,seacas,sql,tbb,utf8,vtkm]:x64-linux = skip winpcap = skip # Broken and merked for removal. See https://github.com/microsoft/vcpkg/pull/33215 diff --git a/versions/baseline.json b/versions/baseline.json index ff902b8b927894..8be6fcf25a9e38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1528,10 +1528,6 @@ "baseline": "1.34.5", "port-version": 1 }, - "c-dbg-macro": { - "baseline": "2020-02-29", - "port-version": 0 - }, "c4core": { "baseline": "0.2.6", "port-version": 0 @@ -1596,10 +1592,6 @@ "baseline": "alias", "port-version": 1 }, - "catch-classic": { - "baseline": "1.12.2", - "port-version": 2 - }, "catch2": { "baseline": "3.10.0", "port-version": 0 @@ -1708,10 +1700,6 @@ "baseline": "1.5.1", "port-version": 1 }, - "chromium-base": { - "baseline": "86.0.4199.1", - "port-version": 6 - }, "chronoengine": { "baseline": "8.0.0", "port-version": 1 @@ -3848,10 +3836,6 @@ "baseline": "1.10.0", "port-version": 0 }, - "ijg-libjpeg": { - "baseline": "9f", - "port-version": 0 - }, "im3d": { "baseline": "2022-10-11", "port-version": 0 @@ -5056,10 +5040,6 @@ "baseline": "5.0.5", "port-version": 0 }, - "libmesh": { - "baseline": "1.5.0", - "port-version": 6 - }, "libmicrodns": { "baseline": "0.2.0", "port-version": 2 @@ -5608,10 +5588,6 @@ "baseline": "3.0.0", "port-version": 0 }, - "libvmdk": { - "baseline": "20221124", - "port-version": 1 - }, "libvorbis": { "baseline": "1.3.7", "port-version": 4 @@ -6400,10 +6376,6 @@ "baseline": "2.0.22", "port-version": 1 }, - "mozjpeg": { - "baseline": "4.1.5", - "port-version": 1 - }, "mp-units": { "baseline": "2.4.0", "port-version": 1 @@ -7152,10 +7124,6 @@ "baseline": "0.3.0", "port-version": 0 }, - "optional-bare": { - "baseline": "1.1.0", - "port-version": 3 - }, "optional-lite": { "baseline": "3.6.0", "port-version": 0 @@ -7800,10 +7768,6 @@ "baseline": "5.15.17", "port-version": 2 }, - "qt5-canvas3d": { - "baseline": "0", - "port-version": 3 - }, "qt5-charts": { "baseline": "5.15.17", "port-version": 0 @@ -8220,10 +8184,6 @@ "baseline": "0.12.0", "port-version": 4 }, - "range-v3-vs2015": { - "baseline": "20151130-vcpkg5", - "port-version": 4 - }, "rapidcheck": { "baseline": "2023-12-14", "port-version": 0 @@ -8272,10 +8232,6 @@ "baseline": "3.3.0", "port-version": 7 }, - "rbdl-orb": { - "baseline": "3.2.0", - "port-version": 2 - }, "re2": { "baseline": "2025-08-12", "port-version": 0 @@ -8624,10 +8580,6 @@ "baseline": "0.3.1", "port-version": 1 }, - "sciter": { - "baseline": "0", - "port-version": 1 - }, "sciter-js": { "baseline": "6.0.1.3", "port-version": 0 @@ -9064,22 +9016,6 @@ "baseline": "5.1.0-a", "port-version": 0 }, - "spdk": { - "baseline": "24.01", - "port-version": 1 - }, - "spdk-dpdk": { - "baseline": "2018-11-24", - "port-version": 3 - }, - "spdk-ipsec": { - "baseline": "2018-07-11", - "port-version": 3 - }, - "spdk-isal": { - "baseline": "2018-10-06", - "port-version": 3 - }, "spdlog": { "baseline": "1.15.3", "port-version": 0 From c772f3eda74c2760e30bb72d0802bd15e94d19bc Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 10 Sep 2025 12:36:02 -0700 Subject: [PATCH 58/58] signalrclient was deleted from ports but not from baselines. --- scripts/ci.baseline.txt | 16 ---------------- scripts/ci.feature.baseline.txt | 1 - versions/baseline.json | 4 ---- 3 files changed, 21 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 658ff9357e143e..f71795db1352a5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -753,22 +753,6 @@ septag-sx:x64-android=fail sfgui:arm-neon-android=fail sfgui:arm64-android=fail sfgui:x64-android=fail -# "Obsolete" and conflicts with microsoft-signalr -signalrclient:arm-neon-android=skip -signalrclient:arm64-android=skip -signalrclient:arm64-osx=skip -signalrclient:arm64-uwp=skip -signalrclient:arm64-windows-static-md=skip -signalrclient:arm64-windows=skip -signalrclient:x64-android=skip -signalrclient:x64-linux=skip -signalrclient:x64-osx=skip -signalrclient:x64-uwp=skip -signalrclient:x64-windows-release=skip -signalrclient:x64-windows-static-md=skip -signalrclient:x64-windows-static=skip -signalrclient:x64-windows=skip -signalrclient:x86-windows=skip simbody:arm64-windows-static-md=fail simbody:arm64-windows=fail simd:arm-neon-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 50b61cac1d4202..254c405d1653cd 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -486,7 +486,6 @@ shiva-sfml:x64-linux=fail shiva-sfml:x64-osx=fail shiva-sfml:x64-windows=fail shiva-sfml:x86-windows=fail -signalrclient:arm-uwp=fail simbody:arm64-windows=fail simd(android)=fail sleef:x86-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 8be6fcf25a9e38..98c7178b2a12fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8800,10 +8800,6 @@ "baseline": "0.2.0", "port-version": 0 }, - "signalrclient": { - "baseline": "1.0.0-beta1-9", - "port-version": 6 - }, "signalsmith-dsp": { "baseline": "1.6.2", "port-version": 0