<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c07394e2e0262bb47e76c4db18a205774dd76829">https://github.com/macports/macports-ports/commit/c07394e2e0262bb47e76c4db18a205774dd76829</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 c07394e2e02 MoltenVK: Split into subports
</span>c07394e2e02 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c07394e2e0262bb47e76c4db18a205774dd76829
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Thu May 25 09:51:05 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> MoltenVK: Split into subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> MoltenVK became a stub, MoltenVK-latest & MoltenVK-1.1.9 are subports
</span>---
graphics/MoltenVK/Portfile | 103 ++++++++++++++++++++++++++++++---------------
1 file changed, 68 insertions(+), 35 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 7d2b9685243..35164ac8a05 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;'>@@ -3,14 +3,12 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup KhronosGroup MoltenVK 1.1.9 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup KhronosGroup MoltenVK 1.2.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set sdkversion 1.3.211.0
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@gcenx gmail.com:gcenx83} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {macosx any >= 15}
</span> license Apache-2
# MoltenVK would build for i386, but it uses Metal which only works on x86_64 and arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,29 +20,21 @@ 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;'>-distname vulkansdk-macos-${sdkversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_dmg yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${name}/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname MoltenVK-macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_tar yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# url only works for the latest avalible SDK, older versions will 404
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://sdk.lunarg.com/sdk/download/${sdkversion}/mac/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 bfe654af00030b6e65521f834f0830f15e18c828594226865f15c92a9ea68363 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3674f67b37f7bcc1746d55c3baa975d0cca9dbaa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 275553243
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:p7zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_skip_archcheck p7zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 168462e4b26a31184497ac7c4a6393708fe23ee4d90da347f00372ed09460714 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c5b41ac440db29e524c01063c9f3cf8554ccbc4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 46776320
</span>
variant universal {}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bypass the installer that requires macOS 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/7z x -aoa ${worksrcpath}/InstallVulkan.app/Contents/Resources/installer.dat -o${workpath}/VulkanSDK"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set output_dir ${workpath}/VulkanSDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set output_dir ${workpath}/MoltenVK
</span>
# Xcode11 and later are required to use "xcframework"
# Headers currently break build due to Xcode 12 ProcessXCFramework bug:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,27 +43,70 @@ destroot {
</span> file copy ${output_dir}/MoltenVK/MoltenVK.xcframework ${destroot}${frameworks_dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${output_dir}/macOS/bin/MoltenVKShaderConverter ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/bin/MoltenVKShaderConverter -permissions +x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${output_dir}/macOS/lib/libMoltenVK.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${output_dir}/MoltenVK/dylib/macOS/libMoltenVK.dylib ${destroot}${prefix}/lib
</span>
# vulkan and vk_video are provided via vulkan-headers
file copy ${output_dir}/MoltenVK/include/MoltenVK ${destroot}${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {(![variant_isset universal])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal] || ![variant_exists universal]} {
</span> system -W ${destroot}${prefix}/lib "lipo -thin ${configure.build_arch} libMoltenVK.dylib -o libMoltenVK.dylib 2> /dev/null"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><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:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup stub 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:MoltenVK-1.1.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:MoltenVK-latest
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GitHub artifacts deployment target is 10.13 (Xcode14+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport MoltenVK-latest {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms {macosx any >= 17}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts MoltenVK-1.1.9
</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;'>+subport MoltenVK-1.1.9 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup KhronosGroup MoltenVK 1.1.9 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts MoltenVK-latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdkversion 1.3.211.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+ use_tar no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha256 bfe654af00030b6e65521f834f0830f15e18c828594226865f15c92a9ea68363 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3674f67b37f7bcc1746d55c3baa975d0cca9dbaa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 275553243
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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><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;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set output_dir ${workpath}/VulkanSDK
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal] || ![variant_exists universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/lib "lipo -thin ${configure.build_arch} libMoltenVK.dylib -o libMoltenVK.dylib 2> /dev/null"
</span> }
}
}
</pre><pre style='margin:0'>
</pre>