Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
it's a maintainance release, see the announcement: https://godotengine.org/article/maintenance-release-godot-3-4-5 While here regen patches and add links to upstream PRs: - "unbreak OS_Unix::get_executable_path() on OpenBSD" godotengine/godot#61540 - "add OpenBSD support" RenderKit/embree#379
- Loading branch information
Showing
7 changed files
with
35 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
SHA256 (godot-3.4.4/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc= | ||
SHA256 (godot-3.4.4/godot-3.4.4-stable.tar.xz) = m7pqixkVAwTyICsB4Eeg9lnFyAh0JN7JyuDpRCtWrdc= | ||
SIZE (godot-3.4.4/g34-s152-gs311.tar.gz) = 197461 | ||
SIZE (godot-3.4.4/godot-3.4.4-stable.tar.xz) = 22417584 | ||
SHA256 (godot-3.4.5/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc= | ||
SHA256 (godot-3.4.5/godot-3.4.5-stable.tar.xz) = GFfMsNSEchFmS5RMj+rtGDLJhFoPHlqohhNt5mEQo4g= | ||
SIZE (godot-3.4.5/g34-s152-gs311.tar.gz) = 197461 | ||
SIZE (godot-3.4.5/godot-3.4.5-stable.tar.xz) = 22630816 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,27 @@ | ||
fix get_executable_path on OpenBSD; backport of | ||
https://github.com/godotengine/godot/pull/61540 | ||
|
||
Index: drivers/unix/os_unix.cpp | ||
--- drivers/unix/os_unix.cpp.orig | ||
+++ drivers/unix/os_unix.cpp | ||
@@ -483,11 +483,7 @@ String OS_Unix::get_executable_path() const { | ||
@@ -482,12 +482,6 @@ String OS_Unix::get_executable_path() const { | ||
return OS::get_executable_path(); | ||
} | ||
return b; | ||
#elif defined(__OpenBSD__) || defined(__NetBSD__) | ||
-#elif defined(__OpenBSD__) || defined(__NetBSD__) | ||
- char resolved_path[MAXPATHLEN]; | ||
- | ||
- realpath(OS::get_executable_path().utf8().get_data(), resolved_path); | ||
- | ||
- return String(resolved_path); | ||
+ return OS::get_executable_path(); | ||
#elif defined(__FreeBSD__) | ||
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; | ||
char buf[MAXPATHLEN]; | ||
@@ -514,7 +508,6 @@ String OS_Unix::get_executable_path() const { | ||
|
||
return path; | ||
#else | ||
- ERR_PRINT("Warning, don't know how to obtain executable path on this OS! Please override this function properly."); | ||
return OS::get_executable_path(); | ||
#endif | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
games/godot/patches/patch-thirdparty_embree_common_sys_sysinfo_cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters