<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31d180609ad129a25b6f07cdfb4a7e08996a3d76">https://github.com/macports/macports-ports/commit/31d180609ad129a25b6f07cdfb4a7e08996a3d76</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 31d180609ad godot: update to version 3.3 (#10851)
</span>31d180609ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 31d180609ad129a25b6f07cdfb4a7e08996a3d76
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Mon Sep 6 14:45:55 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> godot: update to version 3.3 (#10851)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add new subport for godot-3.2
</span>---
games/godot/Portfile | 127 ++++++++++++++++++++++++++++++++++++---------------
1 file changed, 91 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/Portfile b/games/godot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 532914bdc73..83cd5543c48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/godot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,13 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup godotengine godot 3.2.3 "" -stable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name godot
</span> categories games graphics multimedia
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers @jasonliu-- openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers @jasonliu--
</span>
homepage https://godotengine.org
description cross-platform 2-D and 3-D game development \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,15 +22,47 @@ long_description Godot Engine is a cross-platform game engine for \
</span> (Linux, macOS, Windows), as well as mobile \
(Android, iOS) and web-based (HTML5) platforms.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4ff4f9c4798d67cf6cf4d63c38bed84d400daa8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup godotengine ${name} 3.3 "" -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4719f38a85cf339fa6c66d5849b972cd22c0a1ed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a65e296c900f442e19600853896f8f742a1414cc8864f9f6e45eeabc9c4b3362 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29432959
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Godot fails to build for Xcode Clang < 802,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # but builds fine using MacPorts Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 802}
</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 ${name}-3.2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup godotengine ${name} 3.2.3 "" -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4ff4f9c4798d67cf6cf4d63c38bed84d400daa8e \
</span> sha256 6cd925cc4c23e2c4b0bf36458a83e03484184d8d5311b8eb2339319df7c0c26c \
size 22460848
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles legacy-osx-defines.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\n(Note: Godot ${version} is the last version of \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Godot that is officially supported on macOS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.9-10.11.)
</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;'>+if {${os.platform} eq "darwin" && ${os.major} <= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} @${version} requires macOS 10.8 or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible macOS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build port:scons \
port:yasm
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles legacy-osx-defines.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "/yasm_paths =/a\\
\\ \"${prefix}/bin/yasm\",\\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +70,6 @@ post-patch {
</span> ${worksrcpath}/modules/webm/libvpx/SCsub
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,18 +78,27 @@ build.env-append BUILD_NAME=macports_build
</span> build.target platform=osx arch=${build_arch} target=release_debug
destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "${name}-3.2"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appname "Godot 3.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cliname $subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appname "Godot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cliname ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> copy ${worksrcpath}/misc/dist/osx_tools.app \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Godot.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}/Godot.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/${appname}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
</span> move ${worksrcpath}/bin/godot.osx.opt.tools.${build_arch} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/Godot.app/Contents/MacOS/Godot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${applications_dir}/Godot.app/Contents/MacOS/Godot \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/godot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/${appname}.app/Contents/MacOS/Godot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/${appname}.app/Contents/MacOS/Godot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/$cliname
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://godotengine.org/download/osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex Godot <em>(\\d+\\.\\d+(?:\\.\\d+)*)</em>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex releases/tag/(\\d+\\.\\d+(?:\\.\\d+)*)-stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
### The following code was adapted from the portfiles
### of ports such as openvdb and openimageio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,9 +106,11 @@ livecheck.regex Godot <em>(\\d+\\.\\d+(?:\\.\\d+)*)</em>
</span> # Get major version from version string
proc get_major {version} { return [lindex [split ${version} .] 0] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_versions {5.0 6.0 7.0 8.0 9.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions {5.0 6.0 7.0 8.0 9.0 10 11}
</span> set clang_variants {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v ${clang_versions} { lappend clang_variants clang[get_major ${v}] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${clang_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_variants clang[get_major ${v}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# this default version should stay synchronized with
# the default macports_clang option in the SConstruct
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,38 +118,52 @@ foreach v ${clang_versions} { lappend clang_variants clang[get_major ${v}] }
</span> set sconstruct_default_mp_clang 5
# error: invalid value 'gnu++14' in '-std=gnu++14'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# On older OSX versions use (latest) clang variant by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} <= 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On older macOS versions use (latest) clang variant by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq ${name} && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${os.platform} eq "darwin" && ${os.major} <= 15 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $subport eq "${name}-3.2" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${os.platform} eq "darwin" && ${os.major} <= 13} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span> set has_clang_variant no
foreach v ${clang_versions} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset clang[get_major ${v}] ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset clang[get_major ${v}]]} {
</span> set has_clang_variant yes
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { !${has_clang_variant} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!$has_clang_variant} {
</span> # Use most recent clang by default
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang[get_major [lindex ${clang_versions} end] ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang[get_major [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lindex $clang_versions end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]]
</span> }
}
# Configure the variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach clang_ver ${clang_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clang_ver_major [get_major ${clang_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach clang_ver $clang_versions {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clang_ver_major [get_major $clang_ver]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact ${clang_variants} clang${clang_ver_major}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace ${clang_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact $clang_variants clang$clang_ver_major]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace $clang_variants $i $i]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant clang${clang_ver_major} conflicts {*}${c} description {Build using MacPorts Clang ${clang_ver}} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset clang${clang_ver_major}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set selected_clang_v ${clang_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:clang-${selected_clang_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-${selected_clang_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append macports_clang=${selected_clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant clang$clang_ver_major conflicts {*}${c} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build using MacPorts Clang $clang_ver} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset clang$clang_ver_major]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_clang_v $clang_ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-$selected_clang_v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-$selected_clang_v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append macports_clang=$selected_clang_v
</span> post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [get_major ${selected_clang_v}] != ${sconstruct_default_mp_clang}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|${sconstruct_default_mp_clang}\.0|${selected_clang_v}|g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/SConstruct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[get_major $selected_clang_v] != \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $sconstruct_default_mp_clang} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "${name}-3.2"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f ${worksrcpath}/SConstruct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f ${worksrcpath}/platform/osx/detect.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s|$sconstruct_default_mp_clang\.0|$selected_clang_v|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $f
</span> }
}
}
</pre><pre style='margin:0'>
</pre>