Hello ports@, please find attached the patch to update godot to the latest release. This is a bugfix release for the major part, with only some small addition.
Here[0] you can find the release notes and here[1] the full changelog. I also dropped the patch to main.cpp: it would print "Failed to attach audio driver. Falling back to dummy driver", but now we have a working sndio driver and audio should "just works". In addition, if the sndio backend fails, Godot will already print and inform the user that it's going to fall back to the dummy driver. Quickly tested on amd64 with a couple of games/demo (dodge the creeps, charge kid, ...) and some personal project: no regression so far. OK? [0]: https://godotengine.org/article/maintenance-release-godot-3-2-3 [1]: https://downloads.tuxfamily.org/godotengine/3.2.3/Godot_v3.2.3-stable_changelog_authors.txt Index: Makefile =================================================================== RCS file: /cvs/ports/games/godot/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 6 Sep 2020 10:34:19 -0000 1.15 +++ Makefile 18 Sep 2020 13:59:15 -0000 @@ -2,11 +2,10 @@ COMMENT = 2D and 3D game engine -V = 3.2.2 +V = 3.2.3 DISTNAME = godot-${V}-stable PKGNAME = godot-${V} CATEGORIES = games -REVISION = 1 HOMEPAGE = https://godotengine.org/ MAINTAINER = Omar Polo <o...@omarpolo.com> Index: distinfo =================================================================== RCS file: /cvs/ports/games/godot/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 19 Jul 2020 13:02:38 -0000 1.4 +++ distinfo 18 Sep 2020 13:59:15 -0000 @@ -1,2 +1,2 @@ -SHA256 (godot-3.2.2-stable.tar.xz) = oZacrxoX/tJQVMtDqXHBQQT9lPWV/Pu8J0XP9HnHPgM= -SIZE (godot-3.2.2-stable.tar.xz) = 14251180 +SHA256 (godot-3.2.3-stable.tar.xz) = hf1z10LMZIhwVqIy+PemIhEueLUfMdTQjbD5guXzoCM= +SIZE (godot-3.2.3-stable.tar.xz) = 14360332 Index: patches/patch-core_project_settings_cpp =================================================================== RCS file: /cvs/ports/games/godot/patches/patch-core_project_settings_cpp,v retrieving revision 1.3 diff -u -p -r1.3 patch-core_project_settings_cpp --- patches/patch-core_project_settings_cpp 19 Jul 2020 13:02:38 -0000 1.3 +++ patches/patch-core_project_settings_cpp 18 Sep 2020 13:59:15 -0000 @@ -9,19 +9,26 @@ based on github issue #17374 Index: core/project_settings.cpp --- core/project_settings.cpp.orig +++ core/project_settings.cpp -@@ -1201,14 +1201,11 @@ ProjectSettings::ProjectSettings() { +@@ -483,9 +483,7 @@ Error ProjectSettings::setup(const String &p_path, con + } + } + // Using GLOBAL_GET on every block for compressing can be slow, so assigning here. +- Compression::zstd_long_distance_matching = GLOBAL_GET("compression/formats/zstd/long_distance_matching"); + Compression::zstd_level = GLOBAL_GET("compression/formats/zstd/compression_level"); +- Compression::zstd_window_log_size = GLOBAL_GET("compression/formats/zstd/window_log_size"); + + Compression::zlib_level = GLOBAL_GET("compression/formats/zlib/compression_level"); + +@@ -1210,12 +1208,8 @@ ProjectSettings::ProjectSettings() { + GLOBAL_DEF("debug/settings/profiler/max_functions", 16384); custom_prop_info["debug/settings/profiler/max_functions"] = PropertyInfo(Variant::INT, "debug/settings/profiler/max_functions", PROPERTY_HINT_RANGE, "128,65535,1"); - //assigning here, because using GLOBAL_GET on every block for compressing can be slow -- Compression::zstd_long_distance_matching = GLOBAL_DEF("compression/formats/zstd/long_distance_matching", false); +- GLOBAL_DEF("compression/formats/zstd/long_distance_matching", Compression::zstd_long_distance_matching); - custom_prop_info["compression/formats/zstd/long_distance_matching"] = PropertyInfo(Variant::BOOL, "compression/formats/zstd/long_distance_matching"); - Compression::zstd_level = GLOBAL_DEF("compression/formats/zstd/compression_level", 3); + GLOBAL_DEF("compression/formats/zstd/compression_level", Compression::zstd_level); custom_prop_info["compression/formats/zstd/compression_level"] = PropertyInfo(Variant::INT, "compression/formats/zstd/compression_level", PROPERTY_HINT_RANGE, "1,22,1"); -- Compression::zstd_window_log_size = GLOBAL_DEF("compression/formats/zstd/window_log_size", 27); +- GLOBAL_DEF("compression/formats/zstd/window_log_size", Compression::zstd_window_log_size); - custom_prop_info["compression/formats/zstd/window_log_size"] = PropertyInfo(Variant::INT, "compression/formats/zstd/window_log_size", PROPERTY_HINT_RANGE, "10,30,1"); - Compression::zlib_level = GLOBAL_DEF("compression/formats/zlib/compression_level", Z_DEFAULT_COMPRESSION); -+ + GLOBAL_DEF("compression/formats/zlib/compression_level", Compression::zlib_level); custom_prop_info["compression/formats/zlib/compression_level"] = PropertyInfo(Variant::INT, "compression/formats/zlib/compression_level", PROPERTY_HINT_RANGE, "-1,9,1"); - - Compression::gzip_level = GLOBAL_DEF("compression/formats/gzip/compression_level", Z_DEFAULT_COMPRESSION); Index: patches/patch-drivers_unix_os_unix_cpp =================================================================== RCS file: /cvs/ports/games/godot/patches/patch-drivers_unix_os_unix_cpp,v retrieving revision 1.4 diff -u -p -r1.4 patch-drivers_unix_os_unix_cpp --- patches/patch-drivers_unix_os_unix_cpp 19 Jul 2020 13:02:38 -0000 1.4 +++ patches/patch-drivers_unix_os_unix_cpp 18 Sep 2020 13:59:15 -0000 @@ -5,7 +5,7 @@ hardcode executable path Index: drivers/unix/os_unix.cpp --- drivers/unix/os_unix.cpp.orig +++ drivers/unix/os_unix.cpp -@@ -510,7 +510,7 @@ String OS_Unix::get_executable_path() const { +@@ -512,7 +512,7 @@ String OS_Unix::get_executable_path() const { #elif defined(__OpenBSD__) char resolved_path[MAXPATHLEN]; Index: patches/patch-main_main_cpp =================================================================== RCS file: patches/patch-main_main_cpp diff -N patches/patch-main_main_cpp --- patches/patch-main_main_cpp 19 Jul 2020 13:02:38 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-main_main_cpp,v 1.2 2020/07/19 13:02:38 thfr Exp $ - -log on falling back to dummy audio driver - -Index: main/main.cpp ---- main/main.cpp.orig -+++ main/main.cpp -@@ -1135,6 +1135,10 @@ Error Main::setup(const char *execpath, int argc, char - audio_driver = GLOBAL_DEF_RST("audio/driver", OS::get_singleton()->get_audio_driver_name(0)); - } - -+ if (audio_driver == "Dummy") { -+ print_line("Failed to attach audio driver. Falling back to dummy driver."); -+ } -+ - for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) { - - if (audio_driver == OS::get_singleton()->get_audio_driver_name(i)) { Index: patches/patch-platform_x11_os_x11_cpp =================================================================== RCS file: /cvs/ports/games/godot/patches/patch-platform_x11_os_x11_cpp,v retrieving revision 1.3 diff -u -p -r1.3 patch-platform_x11_os_x11_cpp --- patches/patch-platform_x11_os_x11_cpp 6 Sep 2020 10:34:19 -0000 1.3 +++ patches/patch-platform_x11_os_x11_cpp 18 Sep 2020 13:59:15 -0000 @@ -5,7 +5,7 @@ fix libXrandr library name and load sndi Index: platform/x11/os_x11.cpp --- platform/x11/os_x11.cpp.orig +++ platform/x11/os_x11.cpp -@@ -163,10 +163,10 @@ Error OS_X11::initialize(const VideoMode &p_desired, i +@@ -160,10 +160,10 @@ Error OS_X11::initialize(const VideoMode &p_desired, i int xrandr_minor = 0; int event_base, error_base; xrandr_ext_ok = XRRQueryExtension(x11_display, &event_base, &error_base); @@ -18,7 +18,7 @@ Index: platform/x11/os_x11.cpp } else { XRRQueryVersion(x11_display, &xrandr_major, &xrandr_minor); if (((xrandr_major << 8) | xrandr_minor) >= 0x0105) { -@@ -3596,6 +3596,10 @@ void OS_X11::update_real_mouse_position() { +@@ -3564,6 +3564,10 @@ void OS_X11::update_real_mouse_position() { } OS_X11::OS_X11() { Index: patches/patch-platform_x11_os_x11_h =================================================================== RCS file: /cvs/ports/games/godot/patches/patch-platform_x11_os_x11_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-platform_x11_os_x11_h --- patches/patch-platform_x11_os_x11_h 6 Sep 2020 10:34:19 -0000 1.1 +++ patches/patch-platform_x11_os_x11_h 18 Sep 2020 13:59:15 -0000 @@ -13,7 +13,7 @@ Index: platform/x11/os_x11.h #include "drivers/pulseaudio/audio_driver_pulseaudio.h" #include "drivers/unix/os_unix.h" #include "joypad_linux.h" -@@ -185,6 +186,10 @@ class OS_X11 : public OS_Unix { +@@ -184,6 +185,10 @@ class OS_X11 : public OS_Unix { #ifdef ALSAMIDI_ENABLED MIDIDriverALSAMidi driver_alsamidi;
