Add vcpkg_minimum_required before using VERSION. (#27598)

* When @BillyONeal started being the on-call vcpkg maintainer on 2022-10-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. #27561 No VERSION #27525 No VERSION #27554 Already has vcpkg_minimum_required #27536 No VERSION #27562 No VERSION #24914 Fixed here #27547 No VERSION #27502 No VERSION #27497 No VERSION #27317 No VERSION #27288 No VERSION #27509 No VERSION #27504 No VERSION #27514 No VERSION #27501 No VERSION #27495 No VERSION #27488 No VERSION #27499 No VERSION #27378 No VERSION #27376 Fixed here #27373 No VERSION #27045 No VERSION #27521 No VERSION #27453 No VERSION #27481 No VERSION #27511 No VERSION #27490 No VERSION #27510 No VERSION #27496 No VERSION #27503 No VERSION #27485 No VERSION #27484 No VERSION #27483 No VERSION #27459 No VERSION #27369 No VERSION #27489 No VERSION #26594 No VERSION #27465 No VERSION #27456 No VERSION #27425 No VERSION #27464 Fixed here #27406 No VERSION #27398 No VERSION #27240 No VERSION #27450 No VERSION #27463 No VERSION #27462 No VERSION #27448 No VERSION #27440 No VERSION #27435 No VERSION #27424 No VERSION #27414 No VERSION #27412 No VERSION #27380 No VERSION #27343 No VERSION #27342 No VERSION #27367 No VERSION #27226 No VERSION #27320 No VERSION #26923 No VERSION #27284 No VERSION #27433 No VERSION #27314 VERSION got *removed* #27335 No VERSION #27370 No VERSION #27324 No VERSION #27391 No VERSION #27388 No VERSION #27396 No VERSION #27404 No VERSION #27413 No VERSION #27417 No VERSION #27427 No VERSION #27428 No VERSION #27368 No VERSION #27307 No VERSION #27415 Fixed here. #27371 Fixed here. #27323 No VERSION #27352 No VERSION #27347 No VERSION #27366 No VERSION #27361 No VERSION #27359 No VERSION #27358 No VERSION #27355 No VERSION #27331 No VERSION #24615 No VERSION #27325 No VERSION #24861 No VERSION #27354 No VERSION #27346 No VERSION #27345 No VERSION #27218 No VERSION #27329 No VERSION #27326 No VERSION #27321 No VERSION #27312 No VERSION #27297 No VERSION #27336 No VERSION #27225 No VERSION #27339 No VERSION #27302 No VERSION #27295 No VERSION #27233 No VERSION #27313 No VERSION #27237 No VERSION #27250 No VERSION #27263 No VERSION #27266 No VERSION #27272 No VERSION #27287 No VERSION #27282 No VERSION #27294 No VERSION #27228 No VERSION #27163 No VERSION #26817 No VERSION #27286 No VERSION #27274 No VERSION #27276 No VERSION #27232 No VERSION #27221 No VERSION #27215 No VERSION #27166 No VERSION #27239 No VERSION #27246 No VERSION #27268 No VERSION #27259 No VERSION #27238 No VERSION #27224 No VERSION #27203 No VERSION #27124 No VERSION * Also add libcanberra
microsoft · Nov 8, 2022 · e79c0d2 · e79c0d2
1 parent 39b028f
commit e79c0d2
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 13 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/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake
@@ -1,3 +1,4 @@
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 if(VCPKG_TARGET_IS_OSX)
     message("${PORT} currently requires the following libraries from the system package manager:\n    automake\n    libtool\n\nThey can be installed with brew install automake libtool")
 else()

diff --git a/ports/libcanberra/vcpkg.json b/ports/libcanberra/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libcanberra",
   "version": "0.30",
-  "port-version": 3,
+  "port-version": 4,
   "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops",
   "homepage": "http://0pointer.de/lennart/projects/libcanberra/",
   "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",
@@ -3594,7 +3594,7 @@
     },
     "libcanberra": {
       "baseline": "0.30",
-      "port-version": 3
+      "port-version": 4
     },
     "libcbor": {
       "baseline": "0.9.0",
@@ -6022,7 +6022,7 @@
     },
     "qt-advanced-docking-system": {
       "baseline": "3.8.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qt3d": {
       "baseline": "6.3.2",
@@ -6842,7 +6842,7 @@
     },
     "shader-slang": {
       "baseline": "0.23.13",
-      "port-version": 0
+      "port-version": 1
     },
     "shaderc": {
       "baseline": "2021.1",
@@ -7786,7 +7786,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/l-/libcanberra.json b/versions/l-/libcanberra.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "22130c2bd67b576a35d31bf27113f3ab96c48d05",
+      "version": "0.30",
+      "port-version": 4
+    },
     {
       "git-tree": "3b2ba637761d93c1a71e356c0249c54933655b09",
       "version": "0.30",

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",