Download raw body.
update games/godot4
I updated godot4 to see if I could run a game, it did not but here
is the diff, not much tested
https://godotengine.org/article/maintenance-release-godot-4-2-2-and-4-1-4/
diff --git a/games/godot4/Makefile b/games/godot4/Makefile
index 9a368a86354..763163b9be1 100644
--- a/games/godot4/Makefile
+++ b/games/godot4/Makefile
@@ -3,11 +3,9 @@ BROKEN-powerpc = fails at runtime, the UI is totally blank
COMMENT-main = 2D and 3D game engine
COMMENT-editor= 2D and 3D game engine (with the editor)
-V = 4.2.1pl0
-COMMIT = f77bc872114ebe77f1604db47b81016ff478ce17
+V = 4.2.2
PKGNAME = godot4-${V}
-DIST_TUPLE += github godotengine godot ${COMMIT} .
-REVISION = 0
+DIST_TUPLE += github godotengine godot ${V}-stable .
CATEGORIES = games
diff --git a/games/godot4/distinfo b/games/godot4/distinfo
index f608aa4c7c3..16b2027e96d 100644
--- a/games/godot4/distinfo
+++ b/games/godot4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (godotengine-godot-f77bc872114ebe77f1604db47b81016ff478ce17.tar.gz) = 2d0derwvkQxbNOOZRKOz34rI5ca5Z6rHX4q05nqBCYg=
-SIZE (godotengine-godot-f77bc872114ebe77f1604db47b81016ff478ce17.tar.gz) = 40392981
+SHA256 (godotengine-godot-4.2.2-stable.tar.gz) = mQt7cWZWEiNksWclCMUWyJhJfFAhbXwAxg7q9QdoXA4=
+SIZE (godotengine-godot-4.2.2-stable.tar.gz) = 39246793
diff --git a/games/godot4/patches/patch-SConstruct b/games/godot4/patches/patch-SConstruct
index 35898c3db34..19b577b47cd 100644
--- a/games/godot4/patches/patch-SConstruct
+++ b/games/godot4/patches/patch-SConstruct
@@ -6,7 +6,7 @@ Remove architecture from the program names
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
-@@ -599,7 +599,7 @@ if selected_platform in platform_list:
+@@ -596,7 +596,7 @@ if selected_platform in platform_list:
env.Append(LINKFLAGS=["/OPT:REF"])
elif env["optimize"] == "debug" or env["optimize"] == "none":
env.Append(CCFLAGS=["/Od"])
@@ -15,12 +15,11 @@ Index: SConstruct
if env["debug_symbols"]:
# Adding dwarf-4 explicitly makes stacktraces work with clang builds,
# otherwise addr2line doesn't understand them
-@@ -823,8 +823,6 @@ if selected_platform in platform_list:
-
+@@ -821,7 +821,6 @@ if selected_platform in platform_list:
if env_base["precision"] == "double":
suffix += ".double"
--
+
- suffix += "." + env["arch"]
+ suffix += env.extra_suffix
- if not env["threads"]:
- suffix += ".nothreads"
+ sys.path.remove(tmppath)
diff --git a/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp b/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
index 4fb886bdb52..bf3925aec4f 100644
--- a/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
+++ b/games/godot4/patches/patch-drivers_unix_file_access_unix_cpp
@@ -1,7 +1,7 @@
Index: drivers/unix/file_access_unix.cpp
--- drivers/unix/file_access_unix.cpp.orig
+++ drivers/unix/file_access_unix.cpp
-@@ -395,7 +395,7 @@ Error FileAccessUnix::_set_unix_permissions(const Stri
+@@ -320,7 +320,7 @@ Error FileAccessUnix::_set_unix_permissions(const Stri
}
bool FileAccessUnix::_get_hidden_attribute(const String &p_file) {
@@ -10,7 +10,7 @@ Index: drivers/unix/file_access_unix.cpp
String file = fix_path(p_file);
struct stat st = {};
-@@ -409,7 +409,7 @@ bool FileAccessUnix::_get_hidden_attribute(const Strin
+@@ -334,7 +334,7 @@ bool FileAccessUnix::_get_hidden_attribute(const Strin
}
Error FileAccessUnix::_set_hidden_attribute(const String &p_file, bool p_hidden) {
diff --git a/games/godot4/patches/patch-drivers_unix_os_unix_cpp b/games/godot4/patches/patch-drivers_unix_os_unix_cpp
index d5487a598d8..fac7c473d07 100644
--- a/games/godot4/patches/patch-drivers_unix_os_unix_cpp
+++ b/games/godot4/patches/patch-drivers_unix_os_unix_cpp
@@ -4,7 +4,7 @@ fix get_executable_path(); backport of
Index: drivers/unix/os_unix.cpp
--- drivers/unix/os_unix.cpp.orig
+++ drivers/unix/os_unix.cpp
-@@ -755,12 +755,6 @@ String OS_Unix::get_executable_path() const {
+@@ -751,12 +751,6 @@ String OS_Unix::get_executable_path() const {
return OS::get_executable_path();
}
return b;
@@ -17,7 +17,7 @@ Index: drivers/unix/os_unix.cpp
#elif defined(__NetBSD__)
int mib[4] = { CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME };
char buf[MAXPATHLEN];
-@@ -803,8 +797,43 @@ String OS_Unix::get_executable_path() const {
+@@ -799,8 +793,43 @@ String OS_Unix::get_executable_path() const {
return path;
#else
diff --git a/games/godot4/patches/patch-platform_linuxbsd_detect_py b/games/godot4/patches/patch-platform_linuxbsd_detect_py
index b496f600190..fb045481375 100644
--- a/games/godot4/patches/patch-platform_linuxbsd_detect_py
+++ b/games/godot4/patches/patch-platform_linuxbsd_detect_py
@@ -11,7 +11,7 @@ Index: platform/linuxbsd/detect.py
BoolVariable("dbus", "Use D-Bus to handle screensaver and portal desktop settings", True),
BoolVariable("speechd", "Use Speech Dispatcher for Text-to-Speech support", True),
BoolVariable("fontconfig", "Use fontconfig for system fonts support", True),
-@@ -345,6 +346,12 @@ def configure(env: "SConsEnvironment"):
+@@ -337,6 +338,12 @@ def configure(env: "Environment"):
else:
env.Append(CPPDEFINES=["PULSEAUDIO_ENABLED", "_REENTRANT"])
@@ -24,7 +24,7 @@ Index: platform/linuxbsd/detect.py
if env["dbus"]:
if not env["use_sowrap"]:
if os.system("pkg-config --exists dbus-1") == 0: # 0 means found
-@@ -478,7 +485,7 @@ def configure(env: "SConsEnvironment"):
+@@ -439,7 +446,7 @@ def configure(env: "Environment"):
env.ParseConfig("pkg-config vulkan --cflags --libs")
if not env["builtin_glslang"]:
# No pkgconfig file so far, hardcode expected lib name.
diff --git a/games/godot4/patches/patch-platform_linuxbsd_os_linuxbsd_cpp b/games/godot4/patches/patch-platform_linuxbsd_os_linuxbsd_cpp
index a7f39688f04..43ec8b4a145 100644
--- a/games/godot4/patches/patch-platform_linuxbsd_os_linuxbsd_cpp
+++ b/games/godot4/patches/patch-platform_linuxbsd_os_linuxbsd_cpp
@@ -3,7 +3,7 @@ add sndio driver
Index: platform/linuxbsd/os_linuxbsd.cpp
--- platform/linuxbsd/os_linuxbsd.cpp.orig
+++ platform/linuxbsd/os_linuxbsd.cpp
-@@ -1159,6 +1159,10 @@ String OS_LinuxBSD::get_system_ca_certificates() {
+@@ -1179,6 +1179,10 @@ String OS_LinuxBSD::get_system_ca_certificates() {
OS_LinuxBSD::OS_LinuxBSD() {
main_loop = nullptr;
diff --git a/games/godot4/patches/patch-platform_linuxbsd_x11_display_server_x11_cpp b/games/godot4/patches/patch-platform_linuxbsd_x11_display_server_x11_cpp
index 0a17cf2b176..54a66c679e3 100644
--- a/games/godot4/patches/patch-platform_linuxbsd_x11_display_server_x11_cpp
+++ b/games/godot4/patches/patch-platform_linuxbsd_x11_display_server_x11_cpp
@@ -3,7 +3,7 @@ fix libXrandr (double) loading attempt.
Index: platform/linuxbsd/x11/display_server_x11.cpp
--- platform/linuxbsd/x11/display_server_x11.cpp.orig
+++ platform/linuxbsd/x11/display_server_x11.cpp
-@@ -5989,14 +5989,14 @@ DisplayServerX11::DisplayServerX11(const String &p_ren
+@@ -5936,14 +5936,14 @@ DisplayServerX11::DisplayServerX11(const String &p_ren
int xrandr_minor = 0;
int event_base, error_base;
xrandr_ext_ok = XRRQueryExtension(x11_display, &event_base, &error_base);
update games/godot4