Merge pull request #1862 from microsoft/master

Merge from microsoft-master
Jimmy-Hu · Jan 25, 2025 · bd22d62 · bd22d62
2 parents eb13c46 + 57c08a3
commit bd22d62
Show file tree

Hide file tree

Showing 97 changed files with 544 additions and 554 deletions.
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -42,7 +42,6 @@ endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        "zlib"       CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
         "liburing"   WITH_liburing
         "libaio"     WITH_libaio
     INVERTED_FEATURES
@@ -60,6 +59,7 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON
         -DCMAKE_INSTALL_DIR=share/folly
+        -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON
         ${FEATURE_OPTIONS}
     MAYBE_UNUSED_VARIABLES
         MSVC_USE_STATIC_RUNTIME

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "folly",
   "version-string": "2025.01.13.00",
+  "port-version": 1,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",
@@ -38,9 +39,7 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    }
-  ],
-  "default-features": [
+    },
     "zlib"
   ],
   "features": {
@@ -88,12 +87,6 @@
         "snappy"
       ]
     },
-    "zlib": {
-      "description": "Support zlib for compression",
-      "dependencies": [
-        "zlib"
-      ]
-    },
     "zstd": {
       "description": "Support zstd for compression",
       "dependencies": [

diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.10.1",
+  "port-version": 1,
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
@@ -38,7 +39,33 @@
     "zlib"
   ],
   "default-features": [
-    "default-features"
+    "gif",
+    {
+      "name": "hdf5",
+      "platform": "!uwp"
+    },
+    "iconv",
+    "libkml",
+    {
+      "name": "libspatialite",
+      "platform": "!uwp"
+    },
+    "libxml2",
+    "lzma",
+    {
+      "name": "netcdf",
+      "platform": "!uwp & !(windows & arm64) & !android & !ios"
+    },
+    "openjpeg",
+    "openssl",
+    "pcre2",
+    {
+      "name": "postgresql",
+      "platform": "!uwp"
+    },
+    "recommended-features",
+    "webp",
+    "zstd"
   ],
   "features": {
     "archive": {
@@ -71,46 +98,6 @@
         }
       ]
     },
-    "default-features": {
-      "description": "Default set of features, including recommended features",
-      "dependencies": [
-        {
-          "name": "gdal",
-          "default-features": false,
-          "features": [
-            "gif",
-            "iconv",
-            "libkml",
-            "libxml2",
-            "lzma",
-            "openjpeg",
-            "openssl",
-            "pcre2",
-            "recommended-features",
-            "webp",
-            "zstd"
-          ]
-        },
-        {
-          "name": "gdal",
-          "default-features": false,
-          "features": [
-            "libspatialite",
-            "postgresql"
-          ],
-          "platform": "!uwp"
-        },
-        {
-          "name": "gdal",
-          "default-features": false,
-          "features": [
-            "hdf5",
-            "netcdf"
-          ],
-          "platform": "!uwp & !(windows & arm64) & !android & !ios"
-        }
-      ]
-    },
     "expat": {
       "description": "Use EXPAT library",
       "dependencies": [
@@ -193,7 +180,10 @@
     "libxml2": {
       "description": "Use LibXML2 library",
       "dependencies": [
-        "libxml2"
+        {
+          "name": "libxml2",
+          "default-features": false
+        }
       ]
     },
     "lzma": {
@@ -295,17 +285,6 @@
         }
       ]
     },
-    "supported-default-features": {
-      "description": "This feature is an alias for default-features. It is retained for compatibility.",
-      "dependencies": [
-        {
-          "name": "gdal",
-          "features": [
-            "default-features"
-          ]
-        }
-      ]
-    },
     "system-libraries": {
       "$supports": "!windows",
       "description": "This feature does nothing. It is retained for compatibility."

diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "itk",
   "version": "5.4.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
   "homepage": "https://github.com/InsightSoftwareConsortium/ITK",
   "license": "Apache-2.0",
@@ -79,13 +79,7 @@
     "opencv": {
       "description": "Build ITKVideoBridgeOpenCV module.",
       "dependencies": [
-        {
-          "name": "opencv",
-          "default-features": false,
-          "features": [
-            "default-features"
-          ]
-        }
+        "opencv"
       ]
     },
     "python": {

diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "jasper",
   "version": "4.2.4",
+  "port-version": 1,
   "description": "Open source implementation of the JPEG-2000 Part-1 standard",
   "homepage": "https://github.com/jasper-software/jasper",
   "license": null,
@@ -16,22 +17,12 @@
     }
   ],
   "default-features": [
-    "default-features"
+    {
+      "name": "opengl",
+      "platform": "!(windows & arm) & !uwp & !ios"
+    }
   ],
   "features": {
-    "default-features": {
-      "description": "Platform-dependent default features",
-      "dependencies": [
-        {
-          "name": "jasper",
-          "default-features": false,
-          "features": [
-            "opengl"
-          ],
-          "platform": "!(windows & arm) & !uwp & !ios"
-        }
-      ]
-    },
     "opengl": {
       "description": "Enable the use of the OpenGL/GLUT Library",
       "dependencies": [

diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xsco/libdjinterop
     REF "${VERSION}"
-    SHA512 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d
+    SHA512 1666418b202646d920d2928403c7c630872b595f00823e76830e58519a09df251e3bbc26ba31d1d0b573460e08a472b48ace55da67412b1b405d8fa14954b645
     HEAD_REF master
 )
 

diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libdjinterop",
-  "version": "0.22.1",
+  "version": "0.24.2",
   "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases",
   "homepage": "https://github.com/xsco/libdjinterop",
   "license": "LGPL-3.0-or-later",

diff --git a/ports/lunarg-vulkantools/portfile.cmake b/ports/lunarg-vulkantools/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LunarG/VulkanTools
     REF "vulkan-sdk-${VERSION}"
-    SHA512 2d1f5d91aa79b206640e65bba2dadfe881524e9a5e1694df5092e6d59d00f06cd981bd026c0c12528f6b243da7564be98211ce6f6538bd1fd51698f91aa24d47
+    SHA512 3bd23ac331f6560b7a4029628617721c38017d0dc5ffda186cc32802dfe47ae238ea83218e50a4326414ec3621b06646f36f142e4dee7ab00a4b6a8014aa24a1
     HEAD_REF main
 )
 

diff --git a/ports/lunarg-vulkantools/vcpkg.json b/ports/lunarg-vulkantools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lunarg-vulkantools",
-  "version": "1.3.296.0",
+  "version": "1.4.304.0",
   "description": "Tools to aid in Vulkan development",
   "homepage": "https://github.com/LunarG/VulkanTools",
   "license": null,

diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mesa",
   "version": "24.0.7",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Mesa - The 3D Graphics Library",
   "homepage": "https://www.mesa3d.org/",
   "license": "MIT AND BSL-1.0 AND SGI-B-2.0",
@@ -19,30 +19,14 @@
     "zstd"
   ],
   "default-features": [
-    "default-features"
+    "gles1",
+    "gles2",
+    {
+      "name": "llvm",
+      "platform": "x64"
+    }
   ],
   "features": {
-    "default-features": {
-      "description": "Platform dependent default features",
-      "dependencies": [
-        {
-          "name": "mesa",
-          "default-features": false,
-          "features": [
-            "gles1",
-            "gles2"
-          ]
-        },
-        {
-          "name": "mesa",
-          "default-features": false,
-          "features": [
-            "llvm"
-          ],
-          "platform": "x64"
-        }
-      ]
-    },
     "egl": {
       "description": "Build support for EGL platform",
       "dependencies": [