Skip to content

Commit 675ff79

Browse files
christophecvrjudaew
christophecvr
authored and
judaew
committed
spirv-headers: spirv-tools update to 1.3.296.0
 See: https://trac.macports.org/ticket/71081 set to python version 3.12
1 parent 4d71742 commit 675ff79

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

‎graphics/spirv-headers/Portfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PortSystem 1.0
44
PortGroup github 1.0
55
PortGroup cmake 1.1
66

7-
github.setup KhronosGroup SPIRV-Headers 1.3.280.0 vulkan-sdk-
7+
github.setup KhronosGroup SPIRV-Headers 1.3.296.0 vulkan-sdk-
88
github.tarball_from archive
99
name spirv-headers
1010
revision 0
@@ -19,6 +19,6 @@ description SPIR-V Headers
1919
long_description {*}${description}
2020
homepage https://vulkan.lunarg.com
2121

22-
checksums rmd160 a25296a68c7b6e6391c58f9e739c668124b66ad0 \
23-
sha256 a00906b6bddaac1e37192eff2704582f82ce2d971f1aacee4d51d9db33b0f772 \
24-
size 472159
22+
checksums rmd160 e1f8de085e2e8d883dc968da8198501c66677330 \
23+
sha256 1423d58a1171611d5aba2bf6f8c69c72ef9c38a0aca12c3493e4fda64c9b2dc6 \
24+
size 523647

‎graphics/spirv-tools/Portfile

+41-41
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PortGroup github 1.0
55
PortGroup cmake 1.1
66
PortGroup legacysupport 1.1
77

8-
github.setup KhronosGroup SPIRV-Tools 1.3.280.0 vulkan-sdk-
8+
github.setup KhronosGroup SPIRV-Tools 1.3.296.0 vulkan-sdk-
99
name spirv-tools
1010
revision 0
1111

@@ -18,39 +18,44 @@ long_description SPIR-V assembler, binary module parser, \
1818
disassembler, validator, and optimizer
1919
homepage https://vulkan.lunarg.com
2020

21-
# FIXME: Failed to extract spirv-tools: no files matched glob pattern...
21+
# FIXME : main module not extracted in worksrcpath when using multiple sources.
22+
# move extracted main module to worksrcpath
23+
# Move submodules to cmakes expected location in worksrcpath
2224
post-extract {
23-
move ${workpath}/KhronosGroup-SPIRV-Tools-04896c4 ${workpath}/SPIRV-Tools-04896c4
25+
move ${workpath}/KhronosGroup-SPIRV-Tools-6dcc7e3 ${worksrcpath}
26+
foreach {sub_author sub_project sub_commit sub_dest} ${submodules} {
27+
move ${workpath}/${sub_project}-${sub_commit} ${worksrcpath}/${sub_dest}
28+
}
2429
}
2530

26-
checksums SPIRV-Tools-1.3.280.0.tar.gz \
27-
rmd160 f3dfa3cb0eba45a3ce33d92e18ec44c067c0bb4f \
28-
sha256 cb094af38d97b6ea0bb6dd74e2a83ac05959f49f70d9a8434a540dfddcfebf1e \
29-
size 3172115 \
30-
abseil-cpp-79ca5d7aad63973c83a4962a66ab07cd623131ea.tar.gz \
31-
rmd160 0f233213825e23c55820390a3d4e52c97e9e8c10 \
32-
sha256 fb1dc4bf076892aca18d7fd0c228967a451f880df65da53c3af33776ca31f465 \
33-
size 2145278 \
34-
effcee-19b4aa87af25cb4ee779a071409732f34bfc305c.tar.gz \
35-
rmd160 e8c0de0bc279f84317cab175c6d7090fa4095b8c \
36-
sha256 02f98be1426ad1cd7479a1fc4ebfc8495f4fd291cbe6cf1cdb99cb0f401d92b0 \
37-
size 40734 \
38-
googletest-5df0241ea4880e5a846775d3efc8b873f7b36c31.tar.gz \
39-
rmd160 a2b08693a9b4e7a285d301b4a7025e45057c3f7e \
40-
sha256 dd65d71f0e4a17b4ae6fbd2125721eb3d34345ae02381fb1b1a56ddf7f28b4d3 \
41-
size 871797 \
31+
checksums SPIRV-Tools-1.3.296.0.tar.gz \
32+
rmd160 092efc2dbc94aa4472a9b370a3881ff16f6c8c77 \
33+
sha256 a4d0bbb08b8f90d0ec8c8c39b4abc5d67b1b262eff9e2194cb2b885ce000396f \
34+
size 3194709 \
35+
abseil-cpp-lts_2024_07_22.tar.gz \
36+
rmd160 fdf8b9c435036a1d4b9fffed27a44b50709deae7 \
37+
sha256 bc57139b5c08401b2c7b54a7e44e1a771f165db80fd6b88076cc39622d87375f \
38+
size 2242933 \
39+
effcee-2c97e5689ed8d7ab6ae5820f884f03a601ae124b.tar.gz \
40+
rmd160 1f82d7f7369f9b9aeefb93e10679d6223a7cc92f \
41+
sha256 a59e5ac09d4d6f64dd2bb1623512fdc6f737ee2bce14196d1a47ad59a80b7d56 \
42+
size 40080 \
43+
googletest-6dae7eb4a5c3a169f3e298392bff4680224aa94a.tar.gz \
44+
rmd160 33215310600f043a7eae6f8188bb1b0d576fc1d2 \
45+
sha256 0384d11eeccf20e55e8fa81c1a33fa8db25de88bd3336c20c8d48a393aa4f730 \
46+
size 874467 \
4247
protobuf-f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c.tar.gz \
4348
rmd160 a397c44d602407d85eb6ac6b985f9feb792f76e1 \
4449
sha256 d594b561fb41bf243233d8f411c7f2b7d913e5c9c1be4ca439baf7e48384c893 \
4550
size 5146983 \
46-
re2-ed9fc269e2fdb299afe59e912928d31ad3fdcf7d.tar.gz \
47-
rmd160 02059a99af981ee62ba54533cd9a5a59b6adfbad \
48-
sha256 200f661b5c435cd2657248a713481e0297a0ce0f12b6f4e6cb25b9fe9f9d8a1f \
49-
size 388683 \
50-
SPIRV-Headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz \
51-
rmd160 37ee011bebc433d2193a07406de8884a680d885b \
52-
sha256 cfeed5f9a97d12a9761a26e7f5bd10fedb1a8ce92033075151ae3bc7206fc229 \
53-
size 472513
51+
re2-6dcd83d60f7944926bfd308cc13979fc53dd69ca.tar.gz \
52+
rmd160 ded8718bb39f88cef60b869195a885e02afa73bd \
53+
sha256 b26ba918fe9f74c897cd8a247c6c86836275e5af0d198719e4679967dcf68395 \
54+
size 391027 \
55+
SPIRV-Headers-2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801.tar.gz \
56+
rmd160 42dc68dd7bcd347bb42260a2fb6a38119ee21862 \
57+
sha256 1698e1373bd6e59a263acef821c4d955c561b991feb6db8199833ef19ffe8a37 \
58+
size 524052
5459

5560
compiler.cxx_standard 2017
5661
# Need to use MacPorts libc++ on macOS 10.14 Mojave and older, because
@@ -63,36 +68,31 @@ compiler.cxx_standard 2017
6368
legacysupport.newest_darwin_requires_legacy 18
6469
legacysupport.use_mp_libcxx yes
6570

66-
set py_ver 3.11
71+
set py_ver 3.12
6772
set py_ver_nodot [string map {. {}} ${py_ver}]
6873
foreach stage {configure build destroot test} {
6974
${stage}.env-append PATH=${frameworks_dir}/Python.framework/Versions/${py_ver}/bin:$env(PATH)
7075
}
7176
depends_build-append port:python${py_ver_nodot}
7277

7378
# See DEPS file in repo
79+
# Exept abseil changed to lts version.
7480
set submodules {
75-
abseil abseil-cpp 79ca5d7aad63973c83a4962a66ab07cd623131ea external/abseil_cpp
76-
google effcee 19b4aa87af25cb4ee779a071409732f34bfc305c external/effcee
77-
google googletest 5df0241ea4880e5a846775d3efc8b873f7b36c31 external/googletest
81+
abseil abseil-cpp lts_2024_07_22 external/abseil_cpp
82+
google effcee 2c97e5689ed8d7ab6ae5820f884f03a601ae124b external/effcee
83+
google googletest 6dae7eb4a5c3a169f3e298392bff4680224aa94a external/googletest
7884
protocolbuffers protobuf f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c external/protobuf
79-
google re2 ed9fc269e2fdb299afe59e912928d31ad3fdcf7d external/re2
80-
KhronosGroup SPIRV-Headers 8b246ff75c6615ba4532fe4fde20f1be090c3764 external/spirv-headers
85+
google re2 6dcd83d60f7944926bfd308cc13979fc53dd69ca external/re2
86+
KhronosGroup SPIRV-Headers 2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801 external/spirv-headers
8187
}
8288

8389
foreach {sub_author sub_project sub_commit sub_dest} ${submodules} {
8490
master_sites-append https://github.com/${sub_author}/${sub_project}/archive/${sub_commit}.tar.gz?dummy=:${sub_project}
8591
distfiles-append ${sub_project}-${sub_commit}.tar.gz:${sub_project}
8692
}
8793

88-
post-extract {
89-
ln -s {*}[glob -directory ${workpath} -tails ${github.project}-*] ${worksrcpath}
90-
foreach {sub_author sub_project sub_commit sub_dest} ${submodules} {
91-
ln -s {*}[glob ${workpath}/${sub_project}-*] ${worksrcpath}/${sub_dest}
92-
}
93-
}
94-
9594
configure.args-append \
9695
-DSPIRV_WERROR=OFF \
9796
-DBUILD_SHARED_LIBS=ON \
98-
-DSPIRV_TOOLS_BUILD_STATIC=OFF
97+
-DSPIRV_TOOLS_BUILD_STATIC=OFF \
98+
-DCMAKE_INSTALL_PREFIX=${prefix}

0 commit comments

Comments
 (0)