diff --git a/ports/vulkan-loader/portfile.cmake b/ports/vulkan-loader/portfile.cmake index 313a382a78..f2c1dea841 100644 --- a/ports/vulkan-loader/portfile.cmake +++ b/ports/vulkan-loader/portfile.cmake @@ -10,11 +10,20 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xcb BUILD_WSI_XCB_SUPPORT + xlib BUILD_WSI_XLIB_SUPPORT + wayland BUILD_WSI_WAYLAND_SUPPORT + directfb BUILD_WSI_DIRECTFB_SUPPORT +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS:BOOL=OFF -DPython3_EXECUTABLE=${PYTHON3} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() diff --git a/ports/vulkan-loader/vcpkg.json b/ports/vulkan-loader/vcpkg.json index 0e34492f6f..421e497cd5 100644 --- a/ports/vulkan-loader/vcpkg.json +++ b/ports/vulkan-loader/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vulkan-loader", "version": "1.4.309.0", + "port-version": 1, "description": "Vulkan Development Tools", "homepage": "https://github.com/KhronosGroup/Vulkan-Loader", "license": null, @@ -15,5 +16,19 @@ "host": true }, "vulkan-headers" - ] + ], + "features": { + "directfb": { + "description": "Build DirectFB WSI support" + }, + "wayland": { + "description": "Build Wayland WSI support" + }, + "xcb": { + "description": "Build XCB WSI support" + }, + "xlib": { + "description": "Build Xlib WSI support" + } + } } diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ca446bce9d..38d0bf2558 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -2221,6 +2221,7 @@ vtk[all](x64 & windows & !uwp & !staticcrt) = feature-fails vtk[openmp](osx) = feature-fails vtk[paraview](!windows & !android) = feature-fails vtk-m[omp](osx) = feature-fails # fixed by https://github.com/microsoft/vcpkg/pull/30923 +vulkan-loader[directfb](linux) = feature-fails # requires DirectFB on CI build machine wasmedge[aot] = feature-fails # ar: /libzstd.a: No such file or directory. See https://github.com/microsoft/vcpkg/issues/32146 wayland[force-build](native) = feature-fails # error: To build wayland libraries the `force-build` feature must be enabled and the X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES triplet variable must be set. xbitmaps(osx) = fail # error: must install xorg-macros 1.3 or later before running autoconf/autogen diff --git a/versions/baseline.json b/versions/baseline.json index a674b3858d..b14b4f8367 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10190,7 +10190,7 @@ }, "vulkan-loader": { "baseline": "1.4.309.0", - "port-version": 0 + "port-version": 1 }, "vulkan-memory-allocator": { "baseline": "3.3.0", diff --git a/versions/v-/vulkan-loader.json b/versions/v-/vulkan-loader.json index 8d1d94765e..f715e5d6c2 100644 --- a/versions/v-/vulkan-loader.json +++ b/versions/v-/vulkan-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6ba423593d811ee8a3598cd91fd2919a4a41bc4", + "version": "1.4.309.0", + "port-version": 1 + }, { "git-tree": "afb73e0a27223a20bf5b3e59e2bae972a8c3a645", "version": "1.4.309.0",