many-ports: Update supports field (#20053)

* many-ports: Update supports field * Fix several "version-string"s. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2024-12-26 17:41:09 +08:00 · 2021-09-17 17:20:57 +02:00 · 2021-09-17 17:20:57 +02:00 · 66dc12b3fa
commit 66dc12b3fa
parent 8a943f71ff
36 changed files with 140 additions and 50 deletions
--- a/ports/atk/vcpkg.json
+++ b/ports/atk/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "atk",
  "version": "2.36.0",
+  "port-version": 1,
  "description": "GNOME Accessibility Toolkit",
  "homepage": "https://developer.gnome.org/atk/",
-  "supports": "!(osx | arm)",
+  "supports": "!arm",
  "dependencies": [
    "gettext",
    "glib",
--- a/ports/atkmm/vcpkg.json
+++ b/ports/atkmm/vcpkg.json
@ -1,9 +1,9 @@
 {
  "name": "atkmm",
  "version": "2.36.0",
+  "port-version": 1,
  "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.",
  "homepage": "https://www.gtkmm.org",
-  "supports": "!osx",
  "dependencies": [
    "atk",
    "gettext",
--- a/ports/azure-kinect-sensor-sdk/vcpkg.json
+++ b/ports/azure-kinect-sensor-sdk/vcpkg.json
@ -1,10 +1,10 @@
 {
  "name": "azure-kinect-sensor-sdk",
  "version": "1.4.1",
-  "port-version": 2,
+  "port-version": 3,
  "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
  "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
-  "supports": "!osx",
+  "supports": "linux & windows",
  "dependencies": [
    "azure-c-shared-utility",
    "cjson",
--- a/ports/behaviortree-cpp/vcpkg.json
+++ b/ports/behaviortree-cpp/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "behaviortree-cpp",
  "version": "3.5.6",
+  "port-version": 1,
  "description": "Behavior Trees Library in C++.",
  "homepage": "https://www.behaviortree.dev",
-  "supports": "!uwp & !osx",
+  "supports": "!uwp",
  "dependencies": [
    "boost-coroutine2",
    "cppzmq"
--- a/ports/bitserializer/vcpkg.json
+++ b/ports/bitserializer/vcpkg.json
@ -1,10 +1,9 @@
 {
  "name": "bitserializer",
  "version": "0.10",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML",
  "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer",
-  "supports": "!(arm | osx)",
  "default-features": [
    "cpprestjson-archive",
    "pugixml-archive",
--- a/ports/directxsdk/vcpkg.json
+++ b/ports/directxsdk/vcpkg.json
@ -1,10 +1,10 @@
 {
  "name": "directxsdk",
  "version-string": "jun10",
-  "port-version": 2,
+  "port-version": 3,
  "description": "Legacy DirectX SDK",
  "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-",
-  "supports": "windows & !windows",
+  "supports": "windows & !uwp & !arm",
  "features": {
    "xaudio2-7": {
      "description": "Include headers/libs for legacy XAudio 2.7 (prefer use of XAudio2Redist)"
--- a/ports/embree2/portfile.cmake
+++ b/ports/embree2/portfile.cmake
@ -13,10 +13,9 @@ file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake")
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME)

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
    DISABLE_PARALLEL_CONFIGURE
-    PREFER_NINJA
    OPTIONS
        -DEMBREE_ISPC_SUPPORT=OFF
        -DEMBREE_TUTORIALS=OFF
@ -28,7 +27,7 @@ vcpkg_configure_cmake(

 # just wait, the release build of embree is insanely slow in MSVC
 # a single file will took about 2-10 min
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()

 # these cmake files do not seem to contain helpful configuration for find libs, just remove them
@ -36,6 +35,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command")

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
--- a/ports/embree2/vcpkg.json
+++ b/ports/embree2/vcpkg.json
@ -1,11 +1,14 @@
 {
  "name": "embree2",
  "version-semver": "2.17.7",
-  "port-version": 2,
+  "port-version": 3,
  "description": "High Performance Ray Tracing Kernels.",
  "homepage": "https://github.com/embree/embree",
-  "supports": "windows",
  "dependencies": [
-    "tbb"
+    "tbb",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
  ]
 }
--- a/ports/freealut/vcpkg.json
+++ b/ports/freealut/vcpkg.json
@ -1,12 +1,13 @@
 {
  "name": "freealut",
-  "version-string": "1.1.0",
+  "version": "1.1.0",
+  "port-version": 1,
  "description": [
    "FreeALUT is a free implementation of OpenAL's ALUT standard.",
    "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. "
  ],
  "homepage": "https://github.com/vancegroup/freealut",
-  "supports": "!uwp & !arm & !arm64",
+  "supports": "!uwp",
  "dependencies": [
    "openal-soft",
    {
--- a/ports/geotrans/portfile.cmake
+++ b/ports/geotrans/portfile.cmake
@ -1,12 +1,9 @@
 set(VCPKG_LIBRARY_LINKAGE "dynamic")

-message(WARNING "Download ${PORT} may take a several hours to complete!")
-message(WARNING "Port ${PORT} source resides NGA US Government military ftp server with an extremely slow connection.")
-
 # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries
 # which we re-build anyway.  There is no source only package provided or it would be preferred (and smaller).
 vcpkg_download_distfile(ARCHIVE
-    URLS "ftp://ftp.nga.mil/pub2/gandg/website/wgs84/apps/geotrans/current-version/sw/master_version/master.tgz"
+    URLS "https://earth-info.nga.mil/php/download.php?file=wgs-mastertgz"
    FILENAME "geotrans-3.8-master.tgz"
    SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3
 )
--- a/ports/geotrans/vcpkg.json
+++ b/ports/geotrans/vcpkg.json
@ -1,7 +1,8 @@
 {
  "name": "geotrans",
-  "version-string": "3.8",
+  "version": "3.8",
+  "port-version": 1,
  "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.",
  "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home",
-  "supports": "(((x86 | x64) & windows & !static) | ((x86 | x64) & linux)) & !uwp & !arm & !arm64 & !osx & !android"
+  "supports": "!uwp"
 }
--- a/ports/iir1/vcpkg.json
+++ b/ports/iir1/vcpkg.json
@ -1,8 +1,9 @@
 {
  "name": "iir1",
  "version": "1.8.0",
+  "port-version": 1,
  "description": "Realtime C++ filter library",
  "homepage": "https://github.com/berndporr/iir1",
  "license": "MIT",
-  "supports": "!uwp & !osx"
+  "supports": "!uwp"
 }
--- a/ports/libcbor/vcpkg.json
+++ b/ports/libcbor/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "libcbor",
-  "version-string": "0.8.0",
+  "version": "0.8.0",
+  "port-version": 1,
  "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format",
-  "homepage": "https://github.com/PJK/libcbor",
-  "supports": "(x86 | x64) & windows"
+  "homepage": "https://github.com/PJK/libcbor"
 }
--- a/ports/libunifex/vcpkg.json
+++ b/ports/libunifex/vcpkg.json
@ -1,9 +1,9 @@
 {
  "name": "libunifex",
  "version-date": "2021-08-01",
+  "port-version": 1,
  "description": "Unified Executors",
  "homepage": "https://github.com/facebookexperimental/libunifex",
-  "supports": "!osx",
  "dependencies": [
    {
      "name": "liburing",
--- a/ports/libxmlpp/vcpkg.json
+++ b/ports/libxmlpp/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "libxmlpp",
  "version": "5.0.0",
+  "port-version": 1,
  "description": "a C++ wrapper for the libxml XML parser library.",
  "supports": "!(windows & static)",
  "dependencies": [
--- a/ports/matplotplusplus/vcpkg.json
+++ b/ports/matplotplusplus/vcpkg.json
@ -1,11 +1,11 @@
 {
  "name": "matplotplusplus",
  "version-date": "2021-04-11",
-  "port-version": 4,
+  "port-version": 5,
  "description": "A C++ graphics library for data visualization",
  "homepage": "https://alandefreitas.github.io/matplotplusplus/",
  "license": "MIT",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp & !(windows & arm)",
  "dependencies": [
    "cimg",
    {
--- a/ports/portmidi/vcpkg.json
+++ b/ports/portmidi/vcpkg.json
@ -1,10 +1,10 @@
 {
  "name": "portmidi",
-  "version-string": "0.234",
-  "port-version": 2,
+  "version": "0.234",
+  "port-version": 3,
  "description": "Free, cross-platform, open-source I/O library for MIDI",
  "homepage": "https://sourceforge.net/projects/portmedia/",
-  "supports": "!(uwp | arm)",
+  "supports": "!uwp & !linux",
  "dependencies": [
    {
      "name": "vcpkg-cmake",
--- a/ports/xnnpack/vcpkg.json
+++ b/ports/xnnpack/vcpkg.json
@ -1,9 +1,10 @@
 {
  "name": "xnnpack",
  "version-date": "2021-05-17",
+  "port-version": 1,
  "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web",
  "homepage": "https://github.com/google/XNNPACK",
-  "supports": "!arm & !uwp",
+  "supports": "!(arm & windows) & !uwp",
  "dependencies": [
    "cpuinfo",
    "fp16",
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -54,6 +54,9 @@ aubio:arm-uwp=fail
 aubio:x64-uwp=fail
 # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
 bde:x64-linux=fail
+bitserializer:x64-osx=fail
+bitserializer:arm64-windows=fail
+bitserializer:arm-uwp=fail
 blend2d:arm64-windows=fail
 blend2d:arm-uwp=fail
 blend2d:x64-uwp=fail
--- a/versions/a-/atk.json
+++ b/versions/a-/atk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "cf5656ae96a202ad1846f5cb233cc4daf4f3336d",
+      "version": "2.36.0",
+      "port-version": 1
+    },
    {
      "git-tree": "b8ace143cf9715262f419c85a5840fa15a4cf0ce",
      "version": "2.36.0",
--- a/versions/a-/atkmm.json
+++ b/versions/a-/atkmm.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "340ce8d9ccb6154374ecbe6bf6c9a70b83442578",
+      "version": "2.36.0",
+      "port-version": 1
+    },
    {
      "git-tree": "1feae8dc89c99e89b47bb8a028cca2e77d9d4352",
      "version": "2.36.0",
--- a/versions/a-/azure-kinect-sensor-sdk.json
+++ b/versions/a-/azure-kinect-sensor-sdk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "11fbd98a9560da0ad96abf61d8731778db6e5b8b",
+      "version": "1.4.1",
+      "port-version": 3
+    },
    {
      "git-tree": "012a033caf02486f3079b0c42036a807f3a7c4d7",
      "version": "1.4.1",
--- a/versions/b-/behaviortree-cpp.json
+++ b/versions/b-/behaviortree-cpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "96c8331bb642e665bd66a9aa82797d4db84b86fa",
+      "version": "3.5.6",
+      "port-version": 1
+    },
    {
      "git-tree": "32f97d9bfd43e38949f858a9ce271117b0380c85",
      "version": "3.5.6",
--- a/versions/b-/bitserializer.json
+++ b/versions/b-/bitserializer.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ea63e330fbf462f7d5ab3fa119d105501366ea9c",
+      "version": "0.10",
+      "port-version": 2
+    },
    {
      "git-tree": "a840c1d638565cbc8c4fd9a4200c0f54136275d7",
      "version": "0.10",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -198,11 +198,11 @@
    },
    "atk": {
      "baseline": "2.36.0",
-      "port-version": 0
+      "port-version": 1
    },
    "atkmm": {
      "baseline": "2.36.0",
-      "port-version": 0
+      "port-version": 1
    },
    "atlmfc": {
      "baseline": "0",
@ -322,7 +322,7 @@
    },
    "azure-kinect-sensor-sdk": {
      "baseline": "1.4.1",
-      "port-version": 2
+      "port-version": 3
    },
    "azure-macro-utils-c": {
      "baseline": "2020-06-17",
@ -406,7 +406,7 @@
    },
    "behaviortree-cpp": {
      "baseline": "3.5.6",
-      "port-version": 0
+      "port-version": 1
    },
    "benchmark": {
      "baseline": "1.5.5",
@ -446,7 +446,7 @@
    },
    "bitserializer": {
      "baseline": "0.10",
-      "port-version": 1
+      "port-version": 2
    },
    "bitserializer-cpprestjson": {
      "baseline": "alias",
@ -1774,7 +1774,7 @@
    },
    "directxsdk": {
      "baseline": "jun10",
-      "port-version": 2
+      "port-version": 3
    },
    "directxtex": {
      "baseline": "aug2021",
@ -1954,7 +1954,7 @@
    },
    "embree2": {
      "baseline": "2.17.7",
-      "port-version": 2
+      "port-version": 3
    },
    "embree3": {
      "baseline": "3.12.2",
@ -2190,7 +2190,7 @@
    },
    "freealut": {
      "baseline": "1.1.0",
-      "port-version": 0
+      "port-version": 1
    },
    "freeglut": {
      "baseline": "3.2.1",
@ -2334,7 +2334,7 @@
    },
    "geotrans": {
      "baseline": "3.8",
-      "port-version": 0
+      "port-version": 1
    },
    "getdns": {
      "baseline": "1.6.0",
@ -2738,7 +2738,7 @@
    },
    "iir1": {
      "baseline": "1.8.0",
-      "port-version": 0
+      "port-version": 1
    },
    "ijg-libjpeg": {
      "baseline": "9d",
@ -3206,7 +3206,7 @@
    },
    "libcbor": {
      "baseline": "0.8.0",
-      "port-version": 0
+      "port-version": 1
    },
    "libcds": {
      "baseline": "2.3.3",
@ -3826,7 +3826,7 @@
    },
    "libunifex": {
      "baseline": "2021-08-01",
-      "port-version": 0
+      "port-version": 1
    },
    "libunistring": {
      "baseline": "0.9.10",
@ -3906,7 +3906,7 @@
    },
    "libxmlpp": {
      "baseline": "5.0.0",
-      "port-version": 0
+      "port-version": 1
    },
    "libxmp-lite": {
      "baseline": "4.4.1",
@ -4126,7 +4126,7 @@
    },
    "matplotplusplus": {
      "baseline": "2021-04-11",
-      "port-version": 4
+      "port-version": 5
    },
    "matroska": {
      "baseline": "1.6.2",
@ -5174,7 +5174,7 @@
    },
    "portmidi": {
      "baseline": "0.234",
-      "port-version": 2
+      "port-version": 3
    },
    "portsmf": {
      "baseline": "0.238",
@ -7002,7 +7002,7 @@
    },
    "xnnpack": {
      "baseline": "2021-05-17",
-      "port-version": 0
+      "port-version": 1
    },
    "xorstr": {
      "baseline": "2020-11-29",
--- a/versions/d-/directxsdk.json
+++ b/versions/d-/directxsdk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "49dc911dc7c69f6e0eee0279afcf53187d547ae5",
+      "version-string": "jun10",
+      "port-version": 3
+    },
    {
      "git-tree": "1bc75766eb1ace518c8c85f8ffda0c627d714edd",
      "version-string": "jun10",
--- a/versions/e-/embree2.json
+++ b/versions/e-/embree2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "b4048eb6da97d8a23b849a1b5fba7ba93f9c33bf",
+      "version-semver": "2.17.7",
+      "port-version": 3
+    },
    {
      "git-tree": "cc259bcc8185631761c55b23d95afba48e8bae70",
      "version-semver": "2.17.7",
--- a/versions/f-/freealut.json
+++ b/versions/f-/freealut.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ba650aae9b1cf7a21c83ad0303f1bc520a82740b",
+      "version": "1.1.0",
+      "port-version": 1
+    },
    {
      "git-tree": "d4108f61eb91e67aacdfd186074e835f0541676b",
      "version-string": "1.1.0",
--- a/versions/g-/geotrans.json
+++ b/versions/g-/geotrans.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "f9b1a18f0cadf69936ab62911f4d86fdb565c693",
+      "version": "3.8",
+      "port-version": 1
+    },
    {
      "git-tree": "c49a4b2acb6f902afde98571c97ef6c8358d2c89",
      "version-string": "3.8",
--- a/versions/i-/iir1.json
+++ b/versions/i-/iir1.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2cab65e09816beaca2cdc9688f4d61ae448f6877",
+      "version": "1.8.0",
+      "port-version": 1
+    },
    {
      "git-tree": "e41ac2805b2adb0c3e32eba808d75284e8f8c376",
      "version": "1.8.0",
--- a/versions/l-/libcbor.json
+++ b/versions/l-/libcbor.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "02d970a2dac8b0abb941a5b445f7e14afc9c1e49",
+      "version": "0.8.0",
+      "port-version": 1
+    },
    {
      "git-tree": "ef3f79d600e1f00656e522591c6ff7beed247e3a",
      "version-string": "0.8.0",
--- a/versions/l-/libunifex.json
+++ b/versions/l-/libunifex.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f",
+      "version-date": "2021-08-01",
+      "port-version": 1
+    },
    {
      "git-tree": "150573588108677bf5bbcb832d1249bd73f76e36",
      "version-date": "2021-08-01",
--- a/versions/l-/libxmlpp.json
+++ b/versions/l-/libxmlpp.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d3b0562bb045d23c33e6c01ed6d418c8f20f2358",
+      "version": "5.0.0",
+      "port-version": 1
+    },
    {
      "git-tree": "f70632020762c80c63290e7f627e00a0614c0d06",
      "version": "5.0.0",
--- a/versions/m-/matplotplusplus.json
+++ b/versions/m-/matplotplusplus.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e0496a49614d3fc1f77f20f230b3168720140c3b",
+      "version-date": "2021-04-11",
+      "port-version": 5
+    },
    {
      "git-tree": "ee89d0f23b11e362fb9e65670377c47b35ffea6c",
      "version-date": "2021-04-11",
--- a/versions/p-/portmidi.json
+++ b/versions/p-/portmidi.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e4d17cd16212900720faf6d5895734341e5b269d",
+      "version": "0.234",
+      "port-version": 3
+    },
    {
      "git-tree": "70a85d5a9ddc162df4c7296caf7ac8633089d50c",
      "version-string": "0.234",
--- a/versions/x-/xnnpack.json
+++ b/versions/x-/xnnpack.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "d998602ed266e9cf140fb6740fea8625276a48f5",
+      "version-date": "2021-05-17",
+      "port-version": 1
+    },
    {
      "git-tree": "a35b56ac05249424cfcc4ad4727e34d7e1216f25",
      "version-date": "2021-05-17",