devel/godot: update to v3.4.2

ChangeLog: https://github.com/godotengine/godot/blob/3.4.2-stable/CHANGELOG.md

PR:	260858
Reported by:	FreeBSD@ShaneWare.Biz (maintainer)
This commit is contained in:
Shane 2022-01-03 09:25:07 +01:00 committed by Fernando Apesteguía
parent 42ee207cb7
commit f86ca1c8db
5 changed files with 43 additions and 27 deletions

View file

@ -1,9 +1,7 @@
# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
PORTNAME= godot
DISTVERSION= 3.2.3
DISTVERSION= 3.4.2
DISTVERSIONSUFFIX= -stable
PORTREVISION?= 4
PORTREVISION?= 0
CATEGORIES= devel games
MAINTAINER= FreeBSD@Shaneware.biz
@ -24,7 +22,7 @@ RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \
xmessage:x11/xmessage
USES= compiler:c++14-lang cpe gl pkgconfig scons xorg
USE_XORG= x11 xcursor xi xinerama xrandr xrender
USE_XORG= x11 xcursor xext xi xinerama xrandr xrender
USE_GL= gl glew glu
CPE_VENDOR= godotengine
@ -42,7 +40,7 @@ CXXFLAGS_i386_gcc= -march=i586
# option MONO doesn't build (needs 5.12+) so for now leave it out as an option
OPTIONS_DEFINE= EXAMPLES TOOLS UDEV
OPTIONS_DEFAULT= ALSA
OPTIONS_DEFAULT= ALSA UDEV
# Moved to devel/godot-tools
OPTIONS_EXCLUDE?= EXAMPLES TOOLS
OPTIONS_GROUP= AUDIO
@ -52,8 +50,8 @@ AUDIO_DESC= Audio support
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_MAKE_ARGS= alsa=True
ALSA_MAKE_ARGS_OFF= alsa=False
# master at 10/7 tagged for 3.2
EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:8d9d58f112d8:DEMOS
# tagged 6/11/21 for 3.4
EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:585455e67ca3:DEMOS
EXAMPLES_PORTEXAMPLES= *
# mono support doesn't build at present
MONO_BUILD_DEPENDS= msbuild:devel/msbuild
@ -73,6 +71,7 @@ TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \
TOOLS_PLIST_FILES= share/pixmaps/${GODOTFILE}.png \
share/pixmaps/${GODOTFILE}.svg
UDEV_DESC= Libudev support (Joystick)
UDEV_BUILD_DEPENDS= ${PREFIX}/include/linux/input.h:devel/evdev-proto
UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd
UDEV_MAKE_ARGS= udev=True
UDEV_MAKE_ARGS_OFF= udev=False

View file

@ -1,9 +1,9 @@
TIMESTAMP = 1601266507
TIMESTAMP = 1640725622
SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a
SIZE (dotnet.glob.2.1.1.nupkg) = 73782
SHA256 (godotengine-godot-3.2.3-stable_GH0.tar.gz) = 4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae
SIZE (godotengine-godot-3.2.3-stable_GH0.tar.gz) = 22459811
SHA256 (godotengine-godot-demo-projects-8d9d58f112d8_GH0.tar.gz) = b57a0604355bffee9e4fdc037866cd46ed47f120527ce398160c014afd017842
SIZE (godotengine-godot-demo-projects-8d9d58f112d8_GH0.tar.gz) = 162463588
SHA256 (godotengine-godot-3.4.2-stable_GH0.tar.gz) = d9c1af3a7ae4e8b929f03628b31a711fcfe4673fdaf5aea089316a05528792ff
SIZE (godotengine-godot-3.4.2-stable_GH0.tar.gz) = 49648881
SHA256 (godotengine-godot-demo-projects-585455e67ca3_GH0.tar.gz) = 81c9d263a9d3976363f849d4e4cb9388179f8c206406a20e9f8bd81172fda442
SIZE (godotengine-godot-demo-projects-585455e67ca3_GH0.tar.gz) = 158716925
SHA256 (mono-nuget-binary-ebedbf8_GH0.tar.gz) = a0362e65a381c99f222ce141012f5a0663b4a4ae22f27f638198f7414464bf1a
SIZE (mono-nuget-binary-ebedbf8_GH0.tar.gz) = 2778322

View file

@ -1,14 +0,0 @@
--- devel/godot/files/patch-platform_x11_detect.py.orig 2020-12-17 13:47:23 UTC
+++ devel/godot/files/patch-platform_x11_detect.py
@@ -0,0 +1,11 @@
+--- platform/x11/detect.py.orig 2020-10-30 01:48:18 UTC
++++ platform/x11/detect.py
+@@ -311,7 +311,7 @@ def configure(env):
+ else:
+ print("PulseAudio development libraries not found, disabling driver")
+
+- if platform.system() == "Linux":
++ if platform.system() == "FreeBSD":
+ env.Append(CPPDEFINES=["JOYDEV_ENABLED"])
+
+ if env["udev"]:

View file

@ -0,0 +1,20 @@
--- platform/x11/detect.py.orig 2021-12-21 22:27:28 UTC
+++ platform/x11/detect.py
@@ -338,7 +338,7 @@ def configure(env):
else:
print("Warning: PulseAudio development libraries not found. Disabling the PulseAudio audio driver.")
- if platform.system() == "Linux":
+ if platform.system() in ["Linux","FreeBSD"]:
env.Append(CPPDEFINES=["JOYDEV_ENABLED"])
if env["udev"]:
if os.system("pkg-config --exists libudev") == 0: # 0 means found
@@ -365,7 +365,7 @@ def configure(env):
if env["execinfo"]:
env.Append(LIBS=["execinfo"])
- if not env["tools"]:
+ if not env["tools"] and False: # not building templates, just runtime
import subprocess
import re

View file

@ -0,0 +1,11 @@
--- platform/x11/libudev-so_wrap.c.orig 2021-12-29 15:43:04 UTC
+++ platform/x11/libudev-so_wrap.c
@@ -279,7 +279,7 @@ int (*udev_util_encode_string_dylibloader_wrapper_libu
int initialize_libudev() {
void *handle;
char *error;
- handle = dlopen("libudev.so.1", RTLD_LAZY);
+ handle = dlopen("libudev.so.0", RTLD_LAZY);
if (!handle) {
fprintf(stderr, "%s\n", dlerror());
return(1);