When @BillyONeal started being the on-call vcpkg maintainer on 2022-1…

…0-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge. @dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672 This is an audit of everything merged in that time and whether it needs to gain that. microsoft#27561 No VERSION microsoft#27525 No VERSION microsoft#27554 Already has vcpkg_minimum_required microsoft#27536 No VERSION microsoft#27562 No VERSION microsoft#24914 Fixed here microsoft#27547 No VERSION microsoft#27502 No VERSION microsoft#27497 No VERSION microsoft#27317 No VERSION microsoft#27288 No VERSION microsoft#27509 No VERSION microsoft#27504 No VERSION microsoft#27514 No VERSION microsoft#27501 No VERSION microsoft#27495 No VERSION microsoft#27488 No VERSION microsoft#27499 No VERSION microsoft#27378 No VERSION microsoft#27376 Fixed here microsoft#27373 No VERSION microsoft#27045 No VERSION microsoft#27521 No VERSION microsoft#27453 No VERSION microsoft#27481 No VERSION microsoft#27511 No VERSION microsoft#27490 No VERSION microsoft#27510 No VERSION microsoft#27496 No VERSION microsoft#27503 No VERSION microsoft#27485 No VERSION microsoft#27484 No VERSION microsoft#27483 No VERSION microsoft#27459 No VERSION microsoft#27369 No VERSION microsoft#27489 No VERSION microsoft#26594 No VERSION microsoft#27465 No VERSION microsoft#27456 No VERSION microsoft#27425 No VERSION microsoft#27464 Fixed here microsoft#27406 No VERSION microsoft#27398 No VERSION microsoft#27240 No VERSION microsoft#27450 No VERSION microsoft#27463 No VERSION microsoft#27462 No VERSION microsoft#27448 No VERSION microsoft#27440 No VERSION microsoft#27435 No VERSION microsoft#27424 No VERSION microsoft#27414 No VERSION microsoft#27412 No VERSION microsoft#27380 No VERSION microsoft#27343 No VERSION microsoft#27342 No VERSION microsoft#27367 No VERSION microsoft#27226 No VERSION microsoft#27320 No VERSION microsoft#26923 No VERSION microsoft#27284 No VERSION microsoft#27433 No VERSION microsoft#27314 VERSION got *removed* microsoft#27335 No VERSION microsoft#27370 No VERSION microsoft#27324 No VERSION microsoft#27391 No VERSION microsoft#27388 No VERSION microsoft#27396 No VERSION microsoft#27404 No VERSION microsoft#27413 No VERSION microsoft#27417 No VERSION microsoft#27427 No VERSION microsoft#27428 No VERSION microsoft#27368 No VERSION microsoft#27307 No VERSION microsoft#27415 Fixed here. microsoft#27371 Fixed here. microsoft#27323 No VERSION microsoft#27352 No VERSION microsoft#27347 No VERSION microsoft#27366 No VERSION microsoft#27361 No VERSION microsoft#27359 No VERSION microsoft#27358 No VERSION microsoft#27355 No VERSION microsoft#27331 No VERSION microsoft#24615 No VERSION microsoft#27325 No VERSION microsoft#24861 No VERSION microsoft#27354 No VERSION microsoft#27346 No VERSION microsoft#27345 No VERSION microsoft#27218 No VERSION microsoft#27329 No VERSION microsoft#27326 No VERSION microsoft#27321 No VERSION microsoft#27312 No VERSION microsoft#27297 No VERSION microsoft#27336 No VERSION microsoft#27225 No VERSION microsoft#27339 No VERSION microsoft#27302 No VERSION microsoft#27295 No VERSION microsoft#27233 No VERSION microsoft#27313 No VERSION microsoft#27237 No VERSION microsoft#27250 No VERSION microsoft#27263 No VERSION microsoft#27266 No VERSION microsoft#27272 No VERSION microsoft#27287 No VERSION microsoft#27282 No VERSION microsoft#27294 No VERSION microsoft#27228 No VERSION microsoft#27163 No VERSION microsoft#26817 No VERSION microsoft#27286 No VERSION microsoft#27274 No VERSION microsoft#27276 No VERSION microsoft#27232 No VERSION microsoft#27221 No VERSION microsoft#27215 No VERSION microsoft#27166 No VERSION microsoft#27239 No VERSION microsoft#27246 No VERSION microsoft#27268 No VERSION microsoft#27259 No VERSION microsoft#27238 No VERSION microsoft#27224 No VERSION microsoft#27203 No VERSION microsoft#27124 No VERSION
BillyONeal · Nov 1, 2022 · 948a53d · 948a53d
1 parent fcfda3c
commit 948a53d
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 14 deletions.
diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake
@@ -1,3 +1,4 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cairographics.org/releases/cairomm-${VERSION}.tar.xz"
     FILENAME "cairomm-${VERSION}.tar.xz"

diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cairomm",
   "version": "1.16.2",
+  "port-version": 1,
   "description": "A C++ wrapper for the cairo graphics library",
   "homepage": "https://www.cairographics.org",
   "license": "LGPL-2.0-only",

diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake
@@ -1,3 +1,4 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.gnome.org/
     OUT_SOURCE_PATH SOURCE_PATH
@@ -42,7 +43,7 @@ endif()
 vcpkg_fixup_pkgconfig()
 
 set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders)
-# gdk-pixbuf-thumbnailer is not compiled for cross-compiling 
+# gdk-pixbuf-thumbnailer is not compiled for cross-compiling
 # vcpkg-meson cross-build configuration differs from VCPKG_CROSSCOMPILING
 if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/gdk-pixbuf-thumbnailer${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
     list(APPEND TOOL_NAMES gdk-pixbuf-thumbnailer)

diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gdk-pixbuf",
   "version": "2.42.9",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Image loading library.",
   "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
   "license": "LGPL-2.1-or-later",

diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake
@@ -1,8 +1,9 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO githubuser0xFFFF/Qt-Advanced-Docking-System
     REF d5fefaa35fb53e299b7f39b0d8f541954c710d94
-    SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22 
+    SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22
     HEAD_REF master
     PATCHES
         config_changes.patch
@@ -17,7 +18,7 @@ endif()
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         ${_qarg_OPTIONS}
         -DBUILD_EXAMPLES=OFF
         -DADS_VERSION=${VERSION}

diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt-advanced-docking-system",
   "version": "3.8.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio",
   "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
   "license": "LGPL-2.1-only",

diff --git a/ports/shader-slang/portfile.cmake b/ports/shader-slang/portfile.cmake
@@ -1,3 +1,4 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 if (VCPKG_TARGET_IS_WINDOWS)

diff --git a/ports/shader-slang/vcpkg.json b/ports/shader-slang/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "shader-slang",
   "version": "0.23.13",
+  "port-version": 1,
   "description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.",
   "homepage": "https://github.com/shader-slang/slang",
   "license": "MIT",

diff --git a/ports/vcpkg-tool-nodejs/portfile.cmake b/ports/vcpkg-tool-nodejs/portfile.cmake
@@ -1,3 +1,4 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
 set(PROGNAME node)
@@ -55,7 +56,7 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
 message(STATUS "ARCHIVE_PATH: '${ARCHIVE_PATH}'")
 
 vcpkg_execute_in_download_mode(
-    COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}" 
+    COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}"
     WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
 )
 

diff --git a/ports/vcpkg-tool-nodejs/vcpkg.json b/ports/vcpkg-tool-nodejs/vcpkg.json
@@ -1,5 +1,6 @@
 {
   "name": "vcpkg-tool-nodejs",
   "version-semver": "16.18.0",
+  "port-version": 1,
   "supports": "native"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1274,7 +1274,7 @@
     },
     "cairomm": {
       "baseline": "1.16.2",
-      "port-version": 0
+      "port-version": 1
     },
     "calceph": {
       "baseline": "3.5.1",
@@ -2550,7 +2550,7 @@
     },
     "gdk-pixbuf": {
       "baseline": "2.42.9",
-      "port-version": 2
+      "port-version": 3
     },
     "gemmlowp": {
       "baseline": "2021-09-28",
@@ -6014,7 +6014,7 @@
     },
     "qt-advanced-docking-system": {
       "baseline": "3.8.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qt3d": {
       "baseline": "6.3.2",
@@ -6832,6 +6832,10 @@
       "baseline": "1.3.1",
       "port-version": 0
     },
+    "shader-slang": {
+      "baseline": "0.23.13",
+      "port-version": 1
+    },
     "shaderc": {
       "baseline": "2021.1",
       "port-version": 3
@@ -6916,10 +6920,6 @@
       "baseline": "1.13.0",
       "port-version": 2
     },
-    "shader-slang": {
-      "baseline": "0.23.13",
-      "port-version": 0
-    },
     "sleef": {
       "baseline": "3.5.1",
       "port-version": 3
@@ -7778,7 +7778,7 @@
     },
     "vcpkg-tool-nodejs": {
       "baseline": "16.18.0",
-      "port-version": 0
+      "port-version": 1
     },
     "vcpkg-tool-python2": {
       "baseline": "2.7.18",

diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09ffff4bc160350ef161188b000610cbe9cfff8e",
+      "version": "1.16.2",
+      "port-version": 1
+    },
     {
       "git-tree": "07289b1edb75fecd2b706118b1a0919c5903c1c3",
       "version": "1.16.2",

diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1a623b67b4de018a0550b7d8cd60a21569972b0",
+      "version": "2.42.9",
+      "port-version": 3
+    },
     {
       "git-tree": "b42054b8e96faa6387ef8df5870276df1b0902e1",
       "version": "2.42.9",

diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e2298c569112e322898697b9680723c35a55cd5",
+      "version": "3.8.2",
+      "port-version": 2
+    },
     {
       "git-tree": "cdafc879bca2bc737f24557664c1384982bb1fe3",
       "version": "3.8.2",

diff --git a/versions/s-/shader-slang.json b/versions/s-/shader-slang.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "55e34d39bb61d4e1c78131c60561462b0abcdeaa",
+      "version": "0.23.13",
+      "port-version": 1
+    },
     {
       "git-tree": "803e379ae9dedf9c444fe40cc72b83b07d6f7f1c",
       "version": "0.23.13",

diff --git a/versions/v-/vcpkg-tool-nodejs.json b/versions/v-/vcpkg-tool-nodejs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2738f551c277a4ac6650e7d140fc36aa26210a63",
+      "version-semver": "16.18.0",
+      "port-version": 1
+    },
     {
       "git-tree": "4d06168d3fdce7bd667e9cbc44adc453167dfbcc",
       "version-semver": "16.18.0",