Skip to content
Permalink
Browse files

MoltenVK: Update to 1.0.22

  • Loading branch information
ryandesign committed Sep 29, 2018
1 parent 5b313b1 commit 03117e8fe2734c967b74725208ef114da3230de2
Showing with 43 additions and 43 deletions.
  1. +40 −40 graphics/MoltenVK/Portfile
  2. +3 −3 graphics/MoltenVK/files/MoltenVK-scripts-create_dylib_macos.sh.patch
@@ -6,53 +6,53 @@ PortGroup github 1.0
PortGroup xcode 1.0
PortGroup xcodeversion 1.0

github.setup KhronosGroup MoltenVK 1.0.21 v
github.setup KhronosGroup MoltenVK 1.0.22 v
set submodules {
USCiLab cereal 51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4 cereal
KhronosGroup Vulkan-Headers db09f95ac00e44149f3894bf82c918e58277cfdb Vulkan-Headers
KhronosGroup SPIRV-Cross 9ffd4172b46408ab6b03625b0f4f9cfafa5aaa71 SPIRV-Cross
KhronosGroup glslang 1323bf8e39fa17da3e0901a4b1ab5dfd61ee5460 glslang
KhronosGroup SPIRV-Tools 714bf84e58abd9573488fc365707fb8f288ca73c glslang/External/spirv-tools
KhronosGroup SPIRV-Headers ff684ffc6a35d2a58f0f63108877d0064ea33feb glslang/External/spirv-tools/external/spirv-headers
KhronosGroup Vulkan-Tools ca05ec7c9706eb2949e489b4719fe499b0059d36 Vulkan-Tools
LunarG VulkanSamples d5acfc4caff55764ec9a1fd485fef60296da9666 VulkanSamples
KhronosGroup Vulkan-Headers 2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0 Vulkan-Headers
KhronosGroup SPIRV-Cross 2d6ce39bda9af95b78da6bcd8d60fb0ffac4f14d SPIRV-Cross
KhronosGroup glslang a8453d4bc00998049db0d448764784a6a0767539 glslang
KhronosGroup SPIRV-Tools 9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661 glslang/External/spirv-tools
KhronosGroup SPIRV-Headers d5b2e1255f706ce1f88812217e9a554f299848af glslang/External/spirv-tools/external/spirv-headers
KhronosGroup Vulkan-Tools f2c941819838c349fe0cc8eb2dddac294fe012e9 Vulkan-Tools
LunarG VulkanSamples e268a7b7bf799b92410f35f6fea29cedb021bac1 VulkanSamples
}
checksums ${distfiles} \
rmd160 96b71dcda7b73fbfbfa10bf088e3e7584c54a3a4 \
sha256 7e084f00f6fef0d9385d7a44077ca684fbf17e8aaf59793f604e50105b94b568 \
size 1137682 \
rmd160 e9cd9122c3e06a2853bc5640342151cfdf2e3349 \
sha256 ba353a8ccea9d3e2c4d7e6c65e65e466ae1dfa7074a69017082ab5d23b5e4835 \
size 1141850 \
cereal-51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4.tar.gz \
rmd160 33a8f9bd682f36387d3d589410113c6dd1e18bc4 \
sha256 26361b539fe50eee308b564faa2742166d2922a7ab0bd4870ac55708581228c8 \
size 336138 \
Vulkan-Headers-db09f95ac00e44149f3894bf82c918e58277cfdb.tar.gz \
rmd160 8cbf53ffbba79437875b985a7f488044aa615527 \
sha256 1ceeeb89b7659c038d4580aeb145cb41bf6d20c717d4641549890ca409238ebb \
size 473222 \
SPIRV-Cross-9ffd4172b46408ab6b03625b0f4f9cfafa5aaa71.tar.gz \
rmd160 2a739a21511fbb0f1a88b7e4b941ee3c230bb767 \
sha256 b35fb1b1a42fc89cb818ea7eeee8287c2cc260422a9095dfbeb4456bb0dfc9c0 \
size 558507 \
glslang-1323bf8e39fa17da3e0901a4b1ab5dfd61ee5460.tar.gz \
rmd160 da10f16290a446f09b036aaace8c022e678a16e9 \
sha256 6d47ab85c8077ee91a1edbcf836ac48c5abb12964b666aa3ed6f6bda0fd19a20 \
size 2356391 \
SPIRV-Tools-714bf84e58abd9573488fc365707fb8f288ca73c.tar.gz \
rmd160 23b7dc76d60161ec4e704dfaf304a170d9454d8d \
sha256 23cc5f046ce6898aa2b9274334dc76d15a30363d6a6bb5fb554f97b22fa5e7fc \
size 1342560 \
SPIRV-Headers-ff684ffc6a35d2a58f0f63108877d0064ea33feb.tar.gz \
rmd160 5f9738fa8c1f9a0822b85f1fb940a54026a5a162 \
sha256 e36d21ec9e20b2a15aee4a817b6558d85dfa01f2c216adf24eabfc2dff874a39 \
size 281382 \
Vulkan-Tools-ca05ec7c9706eb2949e489b4719fe499b0059d36.tar.gz \
rmd160 0f72e9a831df6aa6fe0c8acafae052bfab651542 \
sha256 bdafcb8ae91c552952f9024a43b7f8f7f4adda8840211b3fdceb76ece16a9608 \
size 342411 \
VulkanSamples-d5acfc4caff55764ec9a1fd485fef60296da9666.tar.gz \
rmd160 7e016c5965e8cd1c4b542a6689871b7bb38ae501 \
sha256 f0f6c857212f362ddaffa0ba0f093639684ac75713a16b7738ac423c4298fb43 \
size 3921216
Vulkan-Headers-2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0.tar.gz \
rmd160 78c61b819d0b84bafad24dbec5fb37a7a30eaf70 \
sha256 073451c821f00509ef1f18b3d672b2ef595bcd49844e0b180e0f2045f9a2f166 \
size 514785 \
SPIRV-Cross-2d6ce39bda9af95b78da6bcd8d60fb0ffac4f14d.tar.gz \
rmd160 b60af056c779ab90c02466dc8c619cd19e5aab8f \
sha256 9a59d96e3b8c4cfb87dc903199c78a534beb6c1a9b441c01cfc806f094b367c2 \
size 574044 \
glslang-a8453d4bc00998049db0d448764784a6a0767539.tar.gz \
rmd160 2e57753226e3a3453430918bdad9d74fe3a34f76 \
sha256 f730d1a44f1929a9815157e4690699dd184511289c15d29ea0927b15c552c041 \
size 2421286 \
SPIRV-Tools-9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661.tar.gz \
rmd160 adbc43257c914ac860c7e6c3d4b12882356bc289 \
sha256 a1fe809e23fa17bff58ef8ff575701838e4046c05fe460cdc2a68c8e6d3d55d9 \
size 1364467 \
SPIRV-Headers-d5b2e1255f706ce1f88812217e9a554f299848af.tar.gz \
rmd160 f10705d841455bbd7962975a9710c0140f8f7e33 \
sha256 ac0dba40509922b3284b90fc896eb1a480d32a503635ea702b003bdff89729e1 \
size 291263 \
Vulkan-Tools-f2c941819838c349fe0cc8eb2dddac294fe012e9.tar.gz \
rmd160 5334ec6fe468b53b221c0d464bf1275f0dd8ce6d \
sha256 fa0665e1f5938053eb5fc3c4af1ccf491d7311978461266dc8b3ac54071b936a \
size 342507 \
VulkanSamples-e268a7b7bf799b92410f35f6fea29cedb021bac1.tar.gz \
rmd160 4ecde32c42e4f3f57e629975b27ec657cdfb6092 \
sha256 80559b35e6f0dde88f404ece50578954da0cd937fab82a7d008f08e773f6b601 \
size 3921408

categories graphics
maintainers {ryandesign @ryandesign} openmaintainer
@@ -111,7 +111,7 @@ patchfiles MoltenVK-scripts-create_dylib_macos.sh.patch
build.pre_args -derivedDataPath ./DerivedData

xcode.configuration Release
xcode.scheme "MoltenVK Package (macOS only) (${xcode.configuration})"
xcode.scheme "MoltenVK Package (${xcode.configuration}) (macOS only)"

pre-build {
set build_dir ${worksrcpath}/External/glslang/build
@@ -1,8 +1,8 @@
Use clang++ instead of clang to create dylib.
Specify C++ stdlib with -stdlib flag not -l flag.
Use archs from Xcode rather than hardcoding.
--- MoltenVK/scripts/create_dylib_macos.sh.orig 2018-09-08 18:45:39.000000000 -0500
+++ MoltenVK/scripts/create_dylib_macos.sh 2018-09-12 20:03:10.000000000 -0500
--- MoltenVK/scripts/create_dylib_macos.sh.orig 2018-09-25 13:22:36.000000000 -0500
+++ MoltenVK/scripts/create_dylib_macos.sh 2018-09-29 03:20:28.000000000 -0500
@@ -8,9 +8,9 @@
export MVK_SYS_FWK_DIR="${SDK_DIR}/System/Library/Frameworks"
export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib"
@@ -17,7 +17,7 @@ Use archs from Xcode rather than hardcoding.
-install_name "@rpath/${MVK_DYLIB_NAME}" \
@@ -19,6 +19,6 @@
-iframework ${MVK_SYS_FWK_DIR} \
-framework Metal -framework IOSurface -framework IOKit -framework QuartzCore -framework Foundation \
-framework Metal -framework IOSurface -framework IOKit -framework QuartzCore -framework AppKit -framework Foundation \
--library-directory ${MVK_USR_LIB_DIR} \
--lSystem -lc++ \
+-lSystem -stdlib=${CLANG_CXX_LIBRARY} \

0 comments on commit 03117e8

Please sign in to comment.
You can’t perform that action at this time.