<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d3307d2098fe8b394406f09a285dbac88db2996">https://github.com/macports/macports-ports/commit/3d3307d2098fe8b394406f09a285dbac88db2996</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 3d3307d2098 godot: update to 3.4.0
</span>3d3307d2098 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d3307d2098fe8b394406f09a285dbac88db2996
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Wed Dec 22 12:33:15 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> godot: update to 3.4.0
</span>---
games/godot/Portfile | 57 ++++++++++++++++------
.../files/patch-available2macro-camera_osx.diff | 23 +++++++++
.../godot/files/patch-available2macro-os_osx.diff | 23 +++++++++
3 files changed, 87 insertions(+), 16 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 d36a4bb232b..7f181e06c1c 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;'>@@ -10,7 +10,7 @@ platforms darwin
</span> license MIT
maintainers @jasonliu--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://godotengine.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://${name}engine.org
</span> description cross-platform 2-D and 3-D game development \
environment
long_description Godot Engine is a cross-platform game engine for \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,12 @@ long_description Godot Engine is a cross-platform game engine for \
</span> if {$subport eq ${name}} {
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup godotengine ${name} 3.3.4 "" -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ${name}engine ${name} 3.4 "" -stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.4.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 51a8af1923589d9154fe877a26f665283ba6c7e9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 94e0d5c986d479e2407af40d40d5ab3fd8d1b36612cc893a5a6449ed281f6944 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 29662410
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b06648c75e9c4c08a0f7163efb575f270cab71d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5abd7fd9e603a4fae55e34f950f0568064a7ec406a12af6c01c218cddb46908 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 50226334
</span>
# Godot fails to build for Xcode Clang < 802,
# but builds fine using MacPorts Clang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,9 +85,7 @@ if {$subport eq "${name}-3.2" && \
</span> patchfiles legacy-osx-defines.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq ${name} && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${os.platform} eq "darwin" && ${os.major} < 15} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq ${name} && ${os.platform} eq "darwin"} {
</span> # On old versions of macOS <= 10.10, the build seems to think that
# the value of the preprocessor macro MAC_OS_X_VERSION_MAX_ALLOWED
# is >= 101200, which is supposed to correspond to macOS 10.12.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +101,33 @@ if {$subport eq ${name} && \
</span> # code. If, in the future, we can discover the real reason why the
# numerical comparison is behaving incorrectly, and find a fix, then
# it might be possible to eliminate the need for this patch file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append macosx-version-log_h-workaround.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append macosx-version-log_h-workaround.diff
</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;'>+ # The upstream source code now uses @available, which was introduced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to Objective-C starting in Xcode 9. It allows code that has been
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compiled on newer systems to run on older systems, but it does not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # have the ability to hide any code from being seen by the compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is causing compiler errors on older macOSes, because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 'NSWorkspaceOpenConfiguration' was introduced in macOS 10.15. So,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if we are trying to build from source on macOS older than 10.15,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we need to modify the upstream source to use a traditional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # availability macro instead of @available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # References:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * python/py-matplotlib/files/patch-v34-src-macosx.m.diff in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # py-matplotlib port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://github.com/macports/macports-ports/commit/b07e0eb6440b1499bfd2157e19db86fc79984471#comments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-available2macro-os_osx.diff
</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;'>+ # Same as the above, except in a different file and for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS < 10.14.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-available2macro-camera_osx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,18 +199,18 @@ build.target platform=osx arch=${build_arch} \
</span>
destroot {
if {$subport eq "${name}-3.2"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set appname "Godot 3.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_name "Godot 3.2"
</span> set cliname $subport
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set appname "Godot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_name "Godot"
</span> set cliname ${name}
}
copy ${worksrcpath}/misc/dist/osx_tools.app \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/${appname}.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}/${appname}.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/bin/godot.osx.opt.tools.${build_arch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/${appname}.app/Contents/MacOS/Godot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${applications_dir}/${appname}.app/Contents/MacOS/Godot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/${app_name}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${applications_dir}/${app_name}.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/bin/${name}.osx.opt.tools.${build_arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/${app_name}.app/Contents/MacOS/Godot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/${app_name}.app/Contents/MacOS/Godot \
</span> ${destroot}${prefix}/bin/$cliname
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/files/patch-available2macro-camera_osx.diff b/games/godot/files/patch-available2macro-camera_osx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3d0c8cd9501
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/files/patch-available2macro-camera_osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/camera/camera_osx.mm.orig 2021-11-04 20:06:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/camera/camera_osx.mm 2021-11-19 21:20:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +257,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Already recording!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Start camera capture, check permission.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status == AVAuthorizationStatusAuthorized) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,9 +270,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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ capture_session = [[MyCaptureSession alloc] initForFeed:this andDevice:device];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</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;'>+ return true;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/files/patch-available2macro-os_osx.diff b/games/godot/files/patch-available2macro-os_osx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e966cd4987a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/files/patch-available2macro-os_osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- platform/osx/os_osx.mm.orig 2021-11-04 20:06:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ platform/osx/os_osx.mm 2021-11-19 19:12:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2956,7 +2956,7 @@
</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;'>+ Error OS_OSX::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool read_stderr, Mutex *p_pipe_mutex) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (@available(macOS 10.15, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // If executable is bundled, always execute editor instances using NSWorkspace to ensure app window is registered and activated correctly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (p_path == get_executable_path() && nsappname != nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3004,9 +3004,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return OS_Unix::execute(p_path, p_arguments, p_blocking, r_child_id, r_pipe, r_exitcode, read_stderr, p_pipe_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return OS_Unix::execute(p_path, p_arguments, p_blocking, r_child_id, r_pipe, r_exitcode, read_stderr, p_pipe_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</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;'>+ // Returns string representation of keys, if they are printable.
</span></pre><pre style='margin:0'>
</pre>