Skip to content

Commit 5fb7e5e

Browse files
committed
update games/godot to 3.4.5
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
1 parent 5f37c1d commit 5fb7e5e

7 files changed

+35
-22
lines changed

games/godot/Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@ BROKEN-powerpc = fails at runtime, the UI is totally blank
33
COMMENT-main = 2D and 3D game engine
44
COMMENT-tools= 2D and 3D game engine (with tools)
55

6-
V = 3.4.4
6+
V = 3.4.5
77
GODOTSTEAM_V = g34-s152-gs311
88
DISTNAME = godot-${V}-stable
99
PKGNAME = godot-${V}
10-
REVISION-main = 3
11-
REVISION-tools = 1
1210

1311
CATEGORIES = games
1412

1513
HOMEPAGE = https://godotengine.org/
1614

17-
MAINTAINER = Omar Polo <op@omarpolo.com>
15+
MAINTAINER = Omar Polo <op@openbsd.org>
1816

1917
# MIT
2018
PERMIT_PACKAGE = Yes
2119

2220
MULTI_PACKAGES = -main -tools
2321

2422
WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody
25-
WANTLIB += LinearMath GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
26-
WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
27-
WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora
28-
WANTLIB += theoradec usbhid vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
23+
WANTLIB += GL LinearMath X11 X11-xcb Xau Xcursor Xdmcp Xext Xfixes
24+
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm c drm enet execinfo
25+
WANTLIB += freetype intl m mbedcrypto mbedtls mbedx509 mpcdec
26+
WANTLIB += ogg opus opusfile pcre2-32 png sndio steam_api theora
27+
WANTLIB += theoradec usbhid vorbis vorbisfile vpx webp xcb xcb-dri2
28+
WANTLIB += xcb-glx z zstd
2929

3030
WANTLIB-tools = ${WANTLIB}
3131

@@ -39,7 +39,7 @@ DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
3939
EXTRACT_SUFX = .tar.xz
4040
DIST_SUBDIR = ${PKGNAME}
4141

42-
MODULES = devel/scons
42+
MODULES = devel/scons
4343

4444
# Building with module_mono_enabled requires msbuild and to fix the
4545
# sharedlib_ext in modules/mono/config.py to '.so.1.0'

games/godot/distinfo

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SHA256 (godot-3.4.4/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc=
2-
SHA256 (godot-3.4.4/godot-3.4.4-stable.tar.xz) = m7pqixkVAwTyICsB4Eeg9lnFyAh0JN7JyuDpRCtWrdc=
3-
SIZE (godot-3.4.4/g34-s152-gs311.tar.gz) = 197461
4-
SIZE (godot-3.4.4/godot-3.4.4-stable.tar.xz) = 22417584
1+
SHA256 (godot-3.4.5/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc=
2+
SHA256 (godot-3.4.5/godot-3.4.5-stable.tar.xz) = GFfMsNSEchFmS5RMj+rtGDLJhFoPHlqohhNt5mEQo4g=
3+
SIZE (godot-3.4.5/g34-s152-gs311.tar.gz) = 197461
4+
SIZE (godot-3.4.5/godot-3.4.5-stable.tar.xz) = 22630816
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
1+
fix get_executable_path on OpenBSD; backport of
2+
https://github.com/godotengine/godot/pull/61540
3+
14
Index: drivers/unix/os_unix.cpp
25
--- drivers/unix/os_unix.cpp.orig
36
+++ drivers/unix/os_unix.cpp
4-
@@ -483,11 +483,7 @@ String OS_Unix::get_executable_path() const {
7+
@@ -482,12 +482,6 @@ String OS_Unix::get_executable_path() const {
8+
return OS::get_executable_path();
59
}
610
return b;
7-
#elif defined(__OpenBSD__) || defined(__NetBSD__)
11+
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
812
- char resolved_path[MAXPATHLEN];
913
-
1014
- realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
1115
-
1216
- return String(resolved_path);
13-
+ return OS::get_executable_path();
1417
#elif defined(__FreeBSD__)
1518
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
1619
char buf[MAXPATHLEN];
20+
@@ -514,7 +508,6 @@ String OS_Unix::get_executable_path() const {
21+
22+
return path;
23+
#else
24+
- ERR_PRINT("Warning, don't know how to obtain executable path on this OS! Please override this function properly.");
25+
return OS::get_executable_path();
26+
#endif
27+
}

games/godot/patches/patch-platform_x11_detect_py

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Index: platform/x11/detect.py
3535
-
3636
## Architecture
3737

38-
is64 = sys.maxsize > 2 ** 32
39-
@@ -331,6 +308,10 @@ def configure(env):
38+
is64 = sys.maxsize > 2**32
39+
@@ -332,6 +309,10 @@ def configure(env):
4040
else:
4141
print("Warning: ALSA libraries not found. Disabling the ALSA audio driver.")
4242

@@ -47,7 +47,7 @@ Index: platform/x11/detect.py
4747
if env["pulseaudio"]:
4848
if os.system("pkg-config --exists libpulse") == 0: # 0 means found
4949
env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED"])
50-
@@ -348,6 +329,9 @@ def configure(env):
50+
@@ -350,6 +331,9 @@ def configure(env):
5151
else:
5252
env["udev"] = False # Linux specific
5353

@@ -57,7 +57,7 @@ Index: platform/x11/detect.py
5757
# Linkflags below this line should typically stay the last ones
5858
if not env["builtin_zlib"]:
5959
env.ParseConfig("pkg-config zlib --cflags --libs")
60-
@@ -375,11 +359,6 @@ def configure(env):
60+
@@ -380,11 +364,6 @@ def configure(env):
6161
print(
6262
"Warning: Creating template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold or LLD."
6363
)

games/godot/patches/patch-platform_x11_os_x11_cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Index: platform/x11/os_x11.cpp
2222
#endif
2323

2424
power_manager = memnew(PowerX11);
25-
@@ -4056,6 +4056,11 @@ void OS_X11::update_real_mouse_position() {
25+
@@ -4110,6 +4110,11 @@ void OS_X11::update_real_mouse_position() {
2626
}
2727

2828
OS_X11::OS_X11() {

games/godot/patches/patch-thirdparty_embree_common_math_math_h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
add an implementation for max for long (ssize_t are long typedef'ed).
22
Otherwise it will fail in parallel_partition.h:185 due to an ambiguous
3-
call.
3+
call. Backport of https://github.com/embree/embree/pull/379
44

55
Index: thirdparty/embree/common/math/math.h
66
--- thirdparty/embree/common/math/math.h.orig

games/godot/patches/patch-thirdparty_embree_common_sys_sysinfo_cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Backport of https://github.com/embree/embree/pull/379
2+
13
1. we don't seem to have pthread_getaffinity_np in pthread_np.h; use sysctl
24
like macos and android then.
35
2. just fake getExecutableFileName and get{Virtual,Resident}MemoryBytes

0 commit comments

Comments
 (0)