Omar Polo <[email protected]> wrote:
> Hello ports,
>
> please find attached a diff to update games/godot to its latest release.
> The announcement is available here:
>
> https://godotengine.org/article/maintenance-release-godot-3-4-3
>
> > As of now, there are no known incompatibilities with the previous
> > Godot 3.4.x releases. We encourage all users to upgrade to 3.4.3.
>
> port wise I've switched it to devel/bullet instead of the bundled copy
> since we finally have a recent version of it.
>
> Quickly tested and seems to work just fine, audio included :)
friendly ping, this time with rcs id removed too
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 23 Dec 2021 02:25:33 -0000 1.31
+++ Makefile 8 Mar 2022 08:59:19 -0000
@@ -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 <[email protected]>
# 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 \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/games/godot/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 23 Dec 2021 02:25:33 -0000 1.12
+++ distinfo 26 Feb 2022 07:36:47 -0000
@@ -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
Index: files/sndio/SCsub
===================================================================
RCS file: /home/cvs/ports/games/godot/files/sndio/SCsub,v
retrieving revision 1.1
diff -u -p -r1.1 SCsub
--- files/sndio/SCsub 6 Sep 2020 10:34:19 -0000 1.1
+++ files/sndio/SCsub 8 Mar 2022 08:59:36 -0000
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# $OpenBSD: SCsub,v 1.1 2020/09/06 10:34:19 thfr Exp $
Import('env')
Index: files/sndio/audio_driver_sndio.cpp
===================================================================
RCS file: /home/cvs/ports/games/godot/files/sndio/audio_driver_sndio.cpp,v
retrieving revision 1.3
diff -u -p -r1.3 audio_driver_sndio.cpp
--- files/sndio/audio_driver_sndio.cpp 10 Nov 2021 13:20:17 -0000 1.3
+++ files/sndio/audio_driver_sndio.cpp 8 Mar 2022 08:59:53 -0000
@@ -1,4 +1,3 @@
-/* $OpenBSD: audio_driver_sndio.cpp,v 1.3 2021/11/10 13:20:17 jca Exp $ */
/*************************************************************************/
/* audio_driver_sndio.cpp */
/*************************************************************************/
Index: files/sndio/audio_driver_sndio.h
===================================================================
RCS file: /home/cvs/ports/games/godot/files/sndio/audio_driver_sndio.h,v
retrieving revision 1.2
diff -u -p -r1.2 audio_driver_sndio.h
--- files/sndio/audio_driver_sndio.h 3 May 2021 19:10:24 -0000 1.2
+++ files/sndio/audio_driver_sndio.h 8 Mar 2022 08:59:51 -0000
@@ -1,4 +1,3 @@
-/* $OpenBSD: audio_driver_sndio.h,v 1.2 2021/05/03 19:10:24 thfr Exp $ */
/*************************************************************************/
/* audio_driver_sndio.h */
/*************************************************************************/
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/godot/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 Dec 2021 11:44:44 -0000 1.3
+++ pkg/PLIST 8 Mar 2022 09:00:03 -0000
@@ -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
