From 948a53de078fb234af953699c3f7eb0c5676ed66 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 1 Nov 2022 13:23:23 -0700 Subject: [PATCH] When @BillyONeal started being the on-call vcpkg maintainer on 2022-10-17, he started applying use of the "embedded VERSION" feature https://github.com/microsoft/vcpkg-tool/pull/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. https://github.com/microsoft/vcpkg/pull/27561 No VERSION https://github.com/microsoft/vcpkg/pull/27525 No VERSION https://github.com/microsoft/vcpkg/pull/27554 Already has vcpkg_minimum_required https://github.com/microsoft/vcpkg/pull/27536 No VERSION https://github.com/microsoft/vcpkg/pull/27562 No VERSION https://github.com/microsoft/vcpkg/pull/24914 Fixed here https://github.com/microsoft/vcpkg/pull/27547 No VERSION https://github.com/microsoft/vcpkg/pull/27502 No VERSION https://github.com/microsoft/vcpkg/pull/27497 No VERSION https://github.com/microsoft/vcpkg/pull/27317 No VERSION https://github.com/microsoft/vcpkg/pull/27288 No VERSION https://github.com/microsoft/vcpkg/pull/27509 No VERSION https://github.com/microsoft/vcpkg/pull/27504 No VERSION https://github.com/microsoft/vcpkg/pull/27514 No VERSION https://github.com/microsoft/vcpkg/pull/27501 No VERSION https://github.com/microsoft/vcpkg/pull/27495 No VERSION https://github.com/microsoft/vcpkg/pull/27488 No VERSION https://github.com/microsoft/vcpkg/pull/27499 No VERSION https://github.com/microsoft/vcpkg/pull/27378 No VERSION https://github.com/microsoft/vcpkg/pull/27376 Fixed here https://github.com/microsoft/vcpkg/pull/27373 No VERSION https://github.com/microsoft/vcpkg/pull/27045 No VERSION https://github.com/microsoft/vcpkg/pull/27521 No VERSION https://github.com/microsoft/vcpkg/pull/27453 No VERSION https://github.com/microsoft/vcpkg/pull/27481 No VERSION https://github.com/microsoft/vcpkg/pull/27511 No VERSION https://github.com/microsoft/vcpkg/pull/27490 No VERSION https://github.com/microsoft/vcpkg/pull/27510 No VERSION https://github.com/microsoft/vcpkg/pull/27496 No VERSION https://github.com/microsoft/vcpkg/pull/27503 No VERSION https://github.com/microsoft/vcpkg/pull/27485 No VERSION https://github.com/microsoft/vcpkg/pull/27484 No VERSION https://github.com/microsoft/vcpkg/pull/27483 No VERSION https://github.com/microsoft/vcpkg/pull/27459 No VERSION https://github.com/microsoft/vcpkg/pull/27369 No VERSION https://github.com/microsoft/vcpkg/pull/27489 No VERSION https://github.com/microsoft/vcpkg/pull/26594 No VERSION https://github.com/microsoft/vcpkg/pull/27465 No VERSION https://github.com/microsoft/vcpkg/pull/27456 No VERSION https://github.com/microsoft/vcpkg/pull/27425 No VERSION https://github.com/microsoft/vcpkg/pull/27464 Fixed here https://github.com/microsoft/vcpkg/pull/27406 No VERSION https://github.com/microsoft/vcpkg/pull/27398 No VERSION https://github.com/microsoft/vcpkg/pull/27240 No VERSION https://github.com/microsoft/vcpkg/pull/27450 No VERSION https://github.com/microsoft/vcpkg/pull/27463 No VERSION https://github.com/microsoft/vcpkg/pull/27462 No VERSION https://github.com/microsoft/vcpkg/pull/27448 No VERSION https://github.com/microsoft/vcpkg/pull/27440 No VERSION https://github.com/microsoft/vcpkg/pull/27435 No VERSION https://github.com/microsoft/vcpkg/pull/27424 No VERSION https://github.com/microsoft/vcpkg/pull/27414 No VERSION https://github.com/microsoft/vcpkg/pull/27412 No VERSION https://github.com/microsoft/vcpkg/pull/27380 No VERSION https://github.com/microsoft/vcpkg/pull/27343 No VERSION https://github.com/microsoft/vcpkg/pull/27342 No VERSION https://github.com/microsoft/vcpkg/pull/27367 No VERSION https://github.com/microsoft/vcpkg/pull/27226 No VERSION https://github.com/microsoft/vcpkg/pull/27320 No VERSION https://github.com/microsoft/vcpkg/pull/26923 No VERSION https://github.com/microsoft/vcpkg/pull/27284 No VERSION https://github.com/microsoft/vcpkg/pull/27433 No VERSION https://github.com/microsoft/vcpkg/pull/27314 VERSION got *removed* https://github.com/microsoft/vcpkg/pull/27335 No VERSION https://github.com/microsoft/vcpkg/pull/27370 No VERSION https://github.com/microsoft/vcpkg/pull/27324 No VERSION https://github.com/microsoft/vcpkg/pull/27391 No VERSION https://github.com/microsoft/vcpkg/pull/27388 No VERSION https://github.com/microsoft/vcpkg/pull/27396 No VERSION https://github.com/microsoft/vcpkg/pull/27404 No VERSION https://github.com/microsoft/vcpkg/pull/27413 No VERSION https://github.com/microsoft/vcpkg/pull/27417 No VERSION https://github.com/microsoft/vcpkg/pull/27427 No VERSION https://github.com/microsoft/vcpkg/pull/27428 No VERSION https://github.com/microsoft/vcpkg/pull/27368 No VERSION https://github.com/microsoft/vcpkg/pull/27307 No VERSION https://github.com/microsoft/vcpkg/pull/27415 Fixed here. https://github.com/microsoft/vcpkg/pull/27371 Fixed here. https://github.com/microsoft/vcpkg/pull/27323 No VERSION https://github.com/microsoft/vcpkg/pull/27352 No VERSION https://github.com/microsoft/vcpkg/pull/27347 No VERSION https://github.com/microsoft/vcpkg/pull/27366 No VERSION https://github.com/microsoft/vcpkg/pull/27361 No VERSION https://github.com/microsoft/vcpkg/pull/27359 No VERSION https://github.com/microsoft/vcpkg/pull/27358 No VERSION https://github.com/microsoft/vcpkg/pull/27355 No VERSION https://github.com/microsoft/vcpkg/pull/27331 No VERSION https://github.com/microsoft/vcpkg/pull/24615 No VERSION https://github.com/microsoft/vcpkg/pull/27325 No VERSION https://github.com/microsoft/vcpkg/pull/24861 No VERSION https://github.com/microsoft/vcpkg/pull/27354 No VERSION https://github.com/microsoft/vcpkg/pull/27346 No VERSION https://github.com/microsoft/vcpkg/pull/27345 No VERSION https://github.com/microsoft/vcpkg/pull/27218 No VERSION https://github.com/microsoft/vcpkg/pull/27329 No VERSION https://github.com/microsoft/vcpkg/pull/27326 No VERSION https://github.com/microsoft/vcpkg/pull/27321 No VERSION https://github.com/microsoft/vcpkg/pull/27312 No VERSION https://github.com/microsoft/vcpkg/pull/27297 No VERSION https://github.com/microsoft/vcpkg/pull/27336 No VERSION https://github.com/microsoft/vcpkg/pull/27225 No VERSION https://github.com/microsoft/vcpkg/pull/27339 No VERSION https://github.com/microsoft/vcpkg/pull/27302 No VERSION https://github.com/microsoft/vcpkg/pull/27295 No VERSION https://github.com/microsoft/vcpkg/pull/27233 No VERSION https://github.com/microsoft/vcpkg/pull/27313 No VERSION https://github.com/microsoft/vcpkg/pull/27237 No VERSION https://github.com/microsoft/vcpkg/pull/27250 No VERSION https://github.com/microsoft/vcpkg/pull/27263 No VERSION https://github.com/microsoft/vcpkg/pull/27266 No VERSION https://github.com/microsoft/vcpkg/pull/27272 No VERSION https://github.com/microsoft/vcpkg/pull/27287 No VERSION https://github.com/microsoft/vcpkg/pull/27282 No VERSION https://github.com/microsoft/vcpkg/pull/27294 No VERSION https://github.com/microsoft/vcpkg/pull/27228 No VERSION https://github.com/microsoft/vcpkg/pull/27163 No VERSION https://github.com/microsoft/vcpkg/pull/26817 No VERSION https://github.com/microsoft/vcpkg/pull/27286 No VERSION https://github.com/microsoft/vcpkg/pull/27274 No VERSION https://github.com/microsoft/vcpkg/pull/27276 No VERSION https://github.com/microsoft/vcpkg/pull/27232 No VERSION https://github.com/microsoft/vcpkg/pull/27221 No VERSION https://github.com/microsoft/vcpkg/pull/27215 No VERSION https://github.com/microsoft/vcpkg/pull/27166 No VERSION https://github.com/microsoft/vcpkg/pull/27239 No VERSION https://github.com/microsoft/vcpkg/pull/27246 No VERSION https://github.com/microsoft/vcpkg/pull/27268 No VERSION https://github.com/microsoft/vcpkg/pull/27259 No VERSION https://github.com/microsoft/vcpkg/pull/27238 No VERSION https://github.com/microsoft/vcpkg/pull/27224 No VERSION https://github.com/microsoft/vcpkg/pull/27203 No VERSION https://github.com/microsoft/vcpkg/pull/27124 No VERSION --- ports/cairomm/portfile.cmake | 1 + ports/cairomm/vcpkg.json | 1 + ports/gdk-pixbuf/portfile.cmake | 3 ++- ports/gdk-pixbuf/vcpkg.json | 2 +- ports/qt-advanced-docking-system/portfile.cmake | 5 +++-- ports/qt-advanced-docking-system/vcpkg.json | 2 +- ports/shader-slang/portfile.cmake | 1 + ports/shader-slang/vcpkg.json | 1 + ports/vcpkg-tool-nodejs/portfile.cmake | 3 ++- ports/vcpkg-tool-nodejs/vcpkg.json | 1 + versions/baseline.json | 16 ++++++++-------- versions/c-/cairomm.json | 5 +++++ versions/g-/gdk-pixbuf.json | 5 +++++ versions/q-/qt-advanced-docking-system.json | 5 +++++ versions/s-/shader-slang.json | 5 +++++ versions/v-/vcpkg-tool-nodejs.json | 5 +++++ 16 files changed, 47 insertions(+), 14 deletions(-) diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index 17e844b7ca0b77..1613614ed48d0a 100644 --- 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 index c519c8d606a77b..67ead7a4c05441 100644 --- 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 index de638324c9cf12..6479817132ca7f 100644 --- 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 index 049404d0ae8208..8091707e758f31 100644 --- 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 index cf2e6584b7ba0c..ae300ba026f247 100644 --- 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 index c2bb6bd8f14d22..4ce52db41dc703 100644 --- 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 index 0da4972322dceb..44c7a15ebf4c75 100644 --- 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 index ae6b91d05ff4d8..7498a6fac0adc9 100644 --- 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 index 2607cc475dc1d9..171693976f3d1c 100644 --- 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 index b33581cf1c5b62..9a45f82482cf4f 100644 --- 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 index d7c424ff3352fb..5c6a0aa548caa6 100644 --- 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 index 03696b212e9d42..d49ea31b122927 100644 --- 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 index f1bce0a08a8971..7e13e6ef59f3b3 100644 --- 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 index 18d36e0be39bc9..db37199fb36dfc 100644 --- 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 index fcb5bf72bd7178..385f7395c916df 100644 --- 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 index efce62cacc3498..06f393ea2529ce 100644 --- 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",