<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/91749a1a16c4422c3f87825c00d0e90259058bbb">https://github.com/macports/macports-ports/commit/91749a1a16c4422c3f87825c00d0e90259058bbb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 91749a1a16c4422c3f87825c00d0e90259058bbb
</span>Author: Vadym-Valdis Yudaiev <judaew@outlook.de>
AuthorDate: Thu Feb 15 22:09:05 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> vulkan-{tools,validationlayers}: Update to 1.3.275.0
</span>---
graphics/vulkan-tools/Portfile | 20 +++++-----
graphics/vulkan-tools/files/cmake.patch | 65 -------------------------------
graphics/vulkan-validationlayers/Portfile | 18 +++++----
3 files changed, 20 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vulkan-tools/Portfile b/graphics/vulkan-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d66f11482e9..0f659c7a41a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vulkan-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vulkan-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup KhronosGroup Vulkan-Tools 1.3.261.1 sdk-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup KhronosGroup Vulkan-Tools 1.3.275.0 vulkan-sdk-
</span> github.tarball_from archive
name vulkan-tools
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,24 +17,24 @@ description Vulkan tools
</span> long_description Provides vulkaninfo command for checking Vulkan installation configuration status
homepage https://vulkan.lunarg.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:vulkan-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:vulkan-headers port:vulkan-volk
</span> depends_lib-append port:vulkan-loader
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 a1c876a6c2882e365141942641a38e0a7bfa6684a7dcedbb0066a20c06625bd0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ff34cb3ad47ebd52c677a7f912d83017f2f95be5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 755289
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 07543d761b5ae53e380fdf7a3f42bd706f2cf1ad04a310381fcf386fefb814c6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8590f141f6050569d74fa9e4eabf0711d087dd82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 801322
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles cmake.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.12
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
foreach stage {configure build destroot test} {
${stage}.env-append PATH=${frameworks_dir}/Python.framework/Versions/${py_ver}/bin:$env(PATH)
}
depends_build-append port:python${py_ver_nodot}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: cube, icd
</span> configure.args-append \
-DBUILD_CUBE=OFF \
-DBUILD_ICD=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVULKAN_LOADER_INSTALL_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDTOOLS_VULKANINFO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDTOOLS_CODEGEN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVULKAN_LOADER_INSTALL_DIR=${prefix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vulkan-tools/files/cmake.patch b/graphics/vulkan-tools/files/cmake.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 705bd4bdb39..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vulkan-tools/files/cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-01-26 01:34:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-01-28 19:46:38.825860135 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,17 +72,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};${VULKAN_HEADERS_INSTALL_DIR};${VULKAN_LOADER_INSTALL_DIR};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ENV{VULKAN_HEADERS_INSTALL_DIR};$ENV{VULKAN_LOADER_INSTALL_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(MOLTENVK_REPO_ROOT "MOLTENVK-NOTFOUND" CACHE PATH "Absolute path to a MoltenVK repo directory")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT MOLTENVK_REPO_ROOT AND NOT DEFINED ENV{MOLTENVK_REPO_ROOT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "Must define location of MoltenVK repo -- see BUILD.md")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT MOLTENVK_REPO_ROOT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(MOLTENVK_REPO_ROOT $ENV{MOLTENVK_REPO_ROOT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Using MoltenVK repo location at ${MOLTENVK_REPO_ROOT}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Using find_package to locate Vulkan")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Vulkan)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(VulkanHeaders REQUIRED CONFIG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vulkaninfo/CMakeLists.txt.orig 2023-01-26 01:34:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vulkaninfo/CMakeLists.txt 2023-01-28 19:49:56.027358859 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,9 +136,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mac_common.cmake.orig 2023-01-26 01:34:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mac_common.cmake 2023-01-28 19:50:46.331912453 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,28 +20,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Source for the MoltenVK ICD library and JSON file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MOLTENVK_DIR ${MOLTENVK_REPO_ROOT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# MoltenVK JSON File
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Modify the ICD JSON file to adjust the library path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# The ICD JSON file goes in the Resources/vulkan/icd.d directory, so adjust the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# library_path to the relative path to the Frameworks directory in the bundle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# The regex does: substitute ':<whitespace>"<whitespace><all occurences of . and />' with:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ': "../../../Frameworks/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_custom_target(MoltenVK_icd-staging-json ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json > ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VERBATIM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DEPENDS "${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json PROPERTIES GENERATED TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(COCOA NAMES Cocoa)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Locate Interface Builder Tool, needed to build things like Storyboards outside of Xcode.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vulkan-validationlayers/Portfile b/graphics/vulkan-validationlayers/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41627315e16..021d83bad9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vulkan-validationlayers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vulkan-validationlayers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup KhronosGroup Vulkan-ValidationLayers 1.3.261.1 sdk-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup KhronosGroup Vulkan-ValidationLayers 1.3.275.0 vulkan-sdk-
</span> github.tarball_from archive
name vulkan-validationlayers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories graphics
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,20 +20,22 @@ long_description \
</span> use of the Vulkan API
homepage https://vulkan.lunarg.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 1372d522f297bb3fb386802b1aa4b7f885a9e1e969a6a3c6e9b29d381357f21d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8263226af4092e1ff7b5a54a88d34a80042c530d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5005018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 acfd84039109220129624b0ecb69980bbc3a858978c62b556dbe16efd0f26755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 66f68ea33187e34505c6a90871029c5f9d5a3eba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5280585
</span>
depends_build-append \
port:spirv-headers \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vulkan-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vulkan-headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vulkan-volk
</span>
depends_lib-append \
port:glslang \
port:spirv-tools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vulkan-loader
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vulkan-loader \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vulkan-utility-libraries
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.12
</span> set py_ver_nodot [string map {. {}} ${py_ver}]
foreach stage {configure build destroot test} {
${stage}.env-append PATH=${frameworks_dir}/Python.framework/Versions/${py_ver}/bin:$env(PATH)
</pre><pre style='margin:0'>
</pre>