[ports] replace feature 'default-features' (microsoft#43347)

azure-sdk · Jan 24, 2025 · 4a9af5e · 4a9af5e
1 parent 3530804
commit 4a9af5e
Show file tree

Hide file tree

Showing 38 changed files with 266 additions and 365 deletions.
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/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": [

diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opencv",
   "version": "4.10.0",
+  "port-version": 1,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
@@ -10,9 +11,6 @@
       "default-features": false
     }
   ],
-  "default-features": [
-    "default-features"
-  ],
   "features": {
     "ade": {
       "description": "graph api",
@@ -86,18 +84,6 @@
         }
       ]
     },
-    "default-features": {
-      "description": "Platform-dependent default features",
-      "dependencies": [
-        {
-          "name": "opencv4",
-          "default-features": false,
-          "features": [
-            "default-features"
-          ]
-        }
-      ]
-    },
     "dnn": {
       "description": "Enable dnn module",
       "dependencies": [

diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv2",
   "version": "2.4.13.7",
-  "port-version": 22,
+  "port-version": 23,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
@@ -18,7 +18,14 @@
     "zlib"
   ],
   "default-features": [
-    "default-features"
+    "eigen",
+    "jpeg",
+    {
+      "name": "msmf",
+      "platform": "windows & !mingw"
+    },
+    "png",
+    "tiff"
   ],
   "features": {
     "dc1394": {
@@ -27,29 +34,6 @@
         "libdc1394"
       ]
     },
-    "default-features": {
-      "description": "Platform-dependent default features",
-      "dependencies": [
-        {
-          "name": "opencv2",
-          "default-features": false,
-          "features": [
-            "eigen",
-            "jpeg",
-            "png",
-            "tiff"
-          ]
-        },
-        {
-          "name": "opencv2",
-          "default-features": false,
-          "features": [
-            "msmf"
-          ],
-          "platform": "windows & !mingw"
-        }
-      ]
-    },
     "eigen": {
       "description": "Eigen support for opencv",
       "dependencies": [

diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 17,
+  "port-version": 18,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
@@ -21,7 +21,11 @@
     "zlib"
   ],
   "default-features": [
-    "default-features"
+    "jpeg",
+    "png",
+    "quirc",
+    "tiff",
+    "webp"
   ],
   "features": {
     "bgsegm": {
@@ -54,22 +58,6 @@
         "libdc1394"
       ]
     },
-    "default-features": {
-      "description": "Platform-dependent default features",
-      "dependencies": [
-        {
-          "name": "opencv3",
-          "default-features": false,
-          "features": [
-            "jpeg",
-            "png",
-            "quirc",
-            "tiff",
-            "webp"
-          ]
-        }
-      ]
-    },
     "dnn": {
       "description": "Enable dnn module",
       "supports": "!android",