diff --git a/games/godot/Makefile b/games/godot/Makefile index 73d199ef92e..9b5cbbe5ab3 100644 --- a/games/godot/Makefile +++ b/games/godot/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.31 2021/12/23 02:25:33 thfr Exp $ - BROKEN-powerpc = fails at runtime, the UI is totally blank COMMENT = 2D and 3D game engine -V = 3.4.2 +V = 3.4.3 GODOTSTEAM_V = g34-s152-gs311 DISTNAME = godot-${V}-stable PKGNAME = godot-${V} @@ -15,8 +13,8 @@ MAINTAINER = Omar Polo # MIT PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} -WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr +WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody +WANTLIB += LinearMath GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora WANTLIB += theoradec vorbis vorbisfile webp xcb z pcre2-32 vpx zstd @@ -32,7 +30,7 @@ EXTRACT_SUFX = .tar.xz DIST_SUBDIR = ${PKGNAME} MODULES = devel/scons -# Can't disable builtin_bullet until devel/bullet has been updated to 2.88 + # Building with module_mono_enabled requires msbuild and to fix the # sharedlib_ext in modules/mono/config.py to '.so.1.0' MODSCONS_FLAGS = CC="${CC}" \ @@ -40,6 +38,7 @@ MODSCONS_FLAGS = CC="${CC}" \ CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS} -Wno-deprecated-register" \ LINKFLAGS="${LDFLAGS} -lintl -lmpcdec" \ + builtin_bullet=no \ builtin_enet=no \ builtin_freetype=no \ builtin_glew=no \ @@ -73,6 +72,7 @@ LIB_DEPENDS = archivers/zstd \ audio/libvorbis \ audio/musepack \ audio/opusfile \ + devel/bullet \ devel/gettext,-runtime \ devel/pcre2 \ games/goldberg_emulator \ diff --git a/games/godot/distinfo b/games/godot/distinfo index 89c9c54efcd..55b773a4116 100644 --- a/games/godot/distinfo +++ b/games/godot/distinfo @@ -1,4 +1,4 @@ -SHA256 (godot-3.4.2/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc= -SHA256 (godot-3.4.2/godot-3.4.2-stable.tar.xz) = +VfBBxgrq8yqMn4xwlM92Fvx0gLuv2DVbLpSf8KaHlU= -SIZE (godot-3.4.2/g34-s152-gs311.tar.gz) = 197461 -SIZE (godot-3.4.2/godot-3.4.2-stable.tar.xz) = 22399864 +SHA256 (godot-3.4.3/g34-s152-gs311.tar.gz) = hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc= +SHA256 (godot-3.4.3/godot-3.4.3-stable.tar.xz) = ZG56zh93N/52F0xUk52yDC98BQ2NhzYc+BZNQFnmVF0= +SIZE (godot-3.4.3/g34-s152-gs311.tar.gz) = 197461 +SIZE (godot-3.4.3/godot-3.4.3-stable.tar.xz) = 22413508 diff --git a/games/godot/files/sndio/SCsub b/games/godot/files/sndio/SCsub index f958c1ef0b6..28b315ae668 100644 --- a/games/godot/files/sndio/SCsub +++ b/games/godot/files/sndio/SCsub @@ -1,5 +1,4 @@ #!/usr/bin/env python -# $OpenBSD: SCsub,v 1.1 2020/09/06 10:34:19 thfr Exp $ Import('env') diff --git a/games/godot/files/sndio/audio_driver_sndio.cpp b/games/godot/files/sndio/audio_driver_sndio.cpp index 81fd7a2a8c7..f809b5f0e68 100644 --- a/games/godot/files/sndio/audio_driver_sndio.cpp +++ b/games/godot/files/sndio/audio_driver_sndio.cpp @@ -1,4 +1,3 @@ -/* $OpenBSD: audio_driver_sndio.cpp,v 1.3 2021/11/10 13:20:17 jca Exp $ */ /*************************************************************************/ /* audio_driver_sndio.cpp */ /*************************************************************************/ diff --git a/games/godot/files/sndio/audio_driver_sndio.h b/games/godot/files/sndio/audio_driver_sndio.h index e6183ade0b6..48a22088d9f 100644 --- a/games/godot/files/sndio/audio_driver_sndio.h +++ b/games/godot/files/sndio/audio_driver_sndio.h @@ -1,4 +1,3 @@ -/* $OpenBSD: audio_driver_sndio.h,v 1.2 2021/05/03 19:10:24 thfr Exp $ */ /*************************************************************************/ /* audio_driver_sndio.h */ /*************************************************************************/ diff --git a/games/godot/patches/patch-core_project_settings_cpp b/games/godot/patches/patch-core_project_settings_cpp index e41c6fbd3f8..977e16da421 100644 --- a/games/godot/patches/patch-core_project_settings_cpp +++ b/games/godot/patches/patch-core_project_settings_cpp @@ -1,5 +1,3 @@ -$OpenBSD: patch-core_project_settings_cpp,v 1.7 2021/11/10 13:20:17 jca Exp $ - revert long-distance matching in zstd which is based on private functions and doesn't compile if archivers/zstd is installed this is a revert of pertinent parts of commit @@ -19,7 +17,7 @@ Index: core/project_settings.cpp Compression::zlib_level = GLOBAL_GET("compression/formats/zlib/compression_level"); -@@ -1233,12 +1231,8 @@ ProjectSettings::ProjectSettings() { +@@ -1237,12 +1235,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"); diff --git a/games/godot/patches/patch-platform_x11_os_x11_cpp b/games/godot/patches/patch-platform_x11_os_x11_cpp index 761e29e1759..ad4c749a47f 100644 --- a/games/godot/patches/patch-platform_x11_os_x11_cpp +++ b/games/godot/patches/patch-platform_x11_os_x11_cpp @@ -1,5 +1,3 @@ -$OpenBSD: patch-platform_x11_os_x11_cpp,v 1.7 2021/11/10 13:20:17 jca Exp $ - fix libXrandr library name and load sndio Index: platform/x11/os_x11.cpp @@ -14,7 +12,7 @@ Index: platform/x11/os_x11.cpp if (!xrandr_handle) { err = dlerror(); // For some arcane reason, NetBSD now ships libXrandr.so.3 while the rest of the world has libXrandr.so.2... -@@ -4053,6 +4053,11 @@ void OS_X11::update_real_mouse_position() { +@@ -4055,6 +4055,11 @@ void OS_X11::update_real_mouse_position() { } OS_X11::OS_X11() { diff --git a/games/godot/pkg/PLIST b/games/godot/pkg/PLIST index e31f6036bc0..0f686d5c6ba 100644 --- a/games/godot/pkg/PLIST +++ b/games/godot/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.3 2021/12/11 11:44:44 op Exp $ @bin bin/godot @man man/man6/godot.6 share/applications/org.godotengine.Godot.desktop