<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a03f281b3f8740477d426cd462ca1d9a701efed6">https://github.com/macports/macports-ports/commit/a03f281b3f8740477d426cd462ca1d9a701efed6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a03f281b3f8 moltenvk: update to 1.1.7
</span>a03f281b3f8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a03f281b3f8740477d426cd462ca1d9a701efed6
</span>Author: Gcenx <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Sat Jan 22 10:50:38 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> moltenvk: update to 1.1.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't compile MoltenVK from source unpacking the VulkanSDK from LunarG. This allows supporting macOS El Capitan and later.
</span>---
graphics/MoltenVK/Portfile | 141 ++++++++++++---------------------------------
1 file changed, 36 insertions(+), 105 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MoltenVK/Portfile b/graphics/MoltenVK/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2e1c25a303..ce4246b0db9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MoltenVK/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MoltenVK/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,63 +2,17 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcode 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup KhronosGroup MoltenVK 1.0.27 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set submodules {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USCiLab cereal 51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4 cereal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KhronosGroup Vulkan-Headers 114c3546e195819bd53a34b39f5194b2989a5b12 Vulkan-Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KhronosGroup SPIRV-Cross ea6bdacd056b77ec1004822482d08b6f31473f25 SPIRV-Cross
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KhronosGroup glslang 1bc601c674aecc2fee0dee8ff7a118db76b4c439 glslang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KhronosGroup SPIRV-Tools a29a9947ac96d811b310f481b24e293f67fedf32 glslang/External/spirv-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KhronosGroup SPIRV-Headers a2c529b5dda18838ab4b52f816acfebd774eaab3 glslang/External/spirv-tools/external/spirv-headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KhronosGroup Vulkan-Tools d74a02234851dfacf6b140c1ab4d81becf704098 Vulkan-Tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LunarG VulkanSamples 1a849458db984f77c9ecfa79041ede550094c2f2 VulkanSamples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distfiles} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bf730c3309e9ffe7a86b51cf12f134bc0408772e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1ea200d81efd22ffdda8f9b4d85d6f0396c6c84359a369fa72bc05b5bb580333 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1141156 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cereal-51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 33a8f9bd682f36387d3d589410113c6dd1e18bc4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26361b539fe50eee308b564faa2742166d2922a7ab0bd4870ac55708581228c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 336138 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Vulkan-Headers-114c3546e195819bd53a34b39f5194b2989a5b12.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 dbc97e37760758f0902faab9ad5185e1115db293 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c95bf023ee271378c340307f079e15b8b54061cdbe051e3a82c80ed08eefd7dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 541278 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SPIRV-Cross-ea6bdacd056b77ec1004822482d08b6f31473f25.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9655067d18c6201cad14bb93d64a7b6257311e24 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21bd2d4a3841c0b492328a9d31044dd29a56d1ef694c2a071f3890231b31ed33 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 612660 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glslang-1bc601c674aecc2fee0dee8ff7a118db76b4c439.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0e87e789a80e270e4fded2d051fc1a1c318c438a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 856b5532cd40585fe5037ce7c33fe4775d37f68cfce0ca09e40f33e1dbc0e5e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2442979 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SPIRV-Tools-a29a9947ac96d811b310f481b24e293f67fedf32.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0a93dad3f73154555361a3d4a46d5a5b833d0393 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3e04ab9623891e571ae65efcc3f18405f3f749d1eece4a89484c28adfdd2f167 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1412706 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SPIRV-Headers-a2c529b5dda18838ab4b52f816acfebd774eaab3.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ec8e6ac15f35273c9e68842378df42991ac88d78 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ff732d21622bb7b2180c794949a5ad2cda71850e2f46cce70b02556d7c789342 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 319089 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Vulkan-Tools-d74a02234851dfacf6b140c1ab4d81becf704098.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c17e293680fc7ad0320a3a119629a6c76f18dcd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f40d3dead03236779f906c80e14bf2356a820d4851c38e9e6510c6ad36d6d2b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 344326 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VulkanSamples-1a849458db984f77c9ecfa79041ede550094c2f2.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0decf1f6db2b337a1f034b6f3222876c2da7d89d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4b435a60259cc188680bbb0c2bf1ad81fe6a3979861fb11b17c73382d86517f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3832089
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup KhronosGroup MoltenVK 1.1.17 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sdkversion 1.3.204.0
</span> categories graphics
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms macosx
</span> license Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# MoltenVK would build for i386, but it uses Metal which only works on x86_64.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MoltenVK would build for i386, but it uses Metal which only works on x86_64 and arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs arm64 x86_64
</span>
description an implementation of Vulkan for Metal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,75 +20,52 @@ long_description ${name} is an implementation of the high-performance, \
</span> industry-standard Vulkan graphics and compute API, that \
runs on Apple's Metal graphics framework.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${master_sites}:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distfiles}:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname vulkansdk-macos-${sdkversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_dmg yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach {sub_author sub_project sub_commit sub_dest} ${submodules} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites-append https://github.com/${sub_author}/${sub_project}/archive/${sub_commit}.tar.gz?dummy=:${sub_project}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append ${sub_project}-${sub_commit}.tar.gz:${sub_project}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# url only works for the latest avalible SDK, older versions will 404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://sdk.lunarg.com/sdk/download/${sdkversion}/mac/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s {*}[glob -directory ${workpath} -tails ${github.author}-${github.project}-*] ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bad_submodule no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {sub_author sub_project sub_commit sub_dest} ${submodules} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit_file ${worksrcpath}/ExternalRevisions/${sub_project}_repo_revision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${commit_file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit_re {^(\S+)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit_file ${worksrcpath}/External/glslang/known_good.json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit_re "\"subrepo\" : \"${sub_author}/${sub_project}\".*?\"commit\" : \"(\[^\"\]+)\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${commit_file} r]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit_file_data [read ${fp}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${fp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regexp ${commit_re} ${commit_file_data} -> commit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${commit} ne ${sub_commit}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bad_submodule yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set submodules [string map "${sub_commit} ${commit}" ${submodules}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir [file dirname ${worksrcpath}/External/${sub_dest}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s {*}[glob ${workpath}/${sub_project}-*] ${worksrcpath}/External/${sub_dest}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${bad_submodule}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "The submodules should be:\n${submodules}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incorrect submodule commit"
</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:#e0ffe0;'>+checksums sha256 476d451930a1a7faf358c5dcf603fe13c608e6b3e6805e7819ea75de88650aa6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 212106347414e738d26922050e518647d384ed96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 265266478
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/cmake:cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:p7zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_skip_archcheck p7zip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args -derivedDataPath ./DerivedData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.configuration Release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.scheme "MoltenVK Package (macOS only)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build_dir ${worksrcpath}/External/glslang/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${build_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${build_dir} "${prefix}/bin/cmake -DCMAKE_BUILD_TYPE=MacPorts -DCMAKE_INSTALL_PREFIX=install -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib -DCMAKE_C_COMPILER=\"${configure.cc}\" -DCMAKE_CXX_COMPILER=\"${configure.cxx}\" -DCMAKE_OSX_ARCHITECTURES=\"[join [get_canonical_archs] \;]\" -DCMAKE_VERBOSE_MAKEFILE=ON .. && make -j${build.jobs} VERBOSE=ON && make install/fast"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bypass the installer that requires macOS 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/7z x -aoa ${worksrcpath}/InstallVulkan.app/Contents/Resources/installer.dat -o${workpath}/VulkanSDK"
</span> }
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set output_dir ${worksrcpath}/build/${xcode.configuration}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${output_dir}/MoltenVKShaderConverter ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${output_dir}/libMoltenVK.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${output_dir}/*.framework] ${destroot}${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set output_dir ${workpath}/VulkanSDK
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-minimum_xcodeversions {16 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode11 and later are required to use "xcframework"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Headers currently break build due to Xcode 12 ProcessXCFramework bug:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://developer.apple.com/forums/thread/651043?answerId=628400022#628400022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${output_dir}/MoltenVK/MoltenVK.xcframework ${destroot}${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${output_dir}/macOS/bin/MoltenVKShaderConverter ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${destroot}${prefix}/bin/MoltenVKShaderConverter -permissions +x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${output_dir}/macOS/lib/libMoltenVK.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # vulkan and vk_video are provided via vulkan-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${output_dir}/MoltenVK/include/MoltenVK ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 15} {
</span> archive_sites
distfiles
depends_build
known_fail yes
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} @${version} requires macOS Sierra or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} @${version} requires OS X El Capitan or later"
</span> return -code error "incompatible OS X version"
}
}
</pre><pre style='margin:0'>
</pre>