diff --git a/devel/godot/Makefile b/devel/godot/Makefile index 01f95b342bc1..e6d86c10221a 100644 --- a/devel/godot/Makefile +++ b/devel/godot/Makefile @@ -1,120 +1,119 @@ -# Created by: Shane Ambler - PORTNAME= godot -DISTVERSION= 3.2.3 +DISTVERSION= 3.4.2 DISTVERSIONSUFFIX= -stable -PORTREVISION?= 4 +PORTREVISION?= 0 CATEGORIES= devel games MAINTAINER= FreeBSD@Shaneware.biz COMMENT?= Game runtime engine LICENSE= MIT CC-BY-3.0 LICENSE_COMB= multi LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.md LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpcre2-8.so:devel/pcre2 \ libpng.so:graphics/png \ libvpx.so:multimedia/libvpx RUN_DEPENDS= xdg-user-dir:devel/xdg-user-dirs \ xdg-open:devel/xdg-utils \ 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 USE_GITHUB= yes GH_ACCOUNT= godotengine MAKE_ARGS+= platform=x11 builtin_freetype=False \ builtin_libpng=False builtin_libvpx=False \ builtin_pcre2=False builtin_zlib=False verbose=True MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} MAKE_ARGS_clang= use_llvm=True use_lld=True CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}} 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 OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO 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 MONO_LIB_DEPENDS= libinotify.so:devel/libinotify MONO_GH_TUPLE= mono:nuget-binary:ebedbf8:NUGT/nuget-binary MONO_MAKE_ARGS= module_mono_enabled=yes mono_glue=True MONO_USES= gettext-runtime mono:nuget NUGET_DEPENDS= DotNet.Glob=2.1.1 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MAKE_ARGS= pulseaudio=True PULSEAUDIO_MAKE_ARGS_OFF= pulseaudio=False TOOLS_DESC= Include development tools (IDE) TOOLS_MAKE_ARGS= target=release_debug tools=True TOOLS_MAKE_ARGS_OFF= target=release tools=False TOOLS_DESKTOP_ENTRIES= "Godot" "${COMMENT}" "${GODOTFILE}" \ "${GODOTFILE}" "Development;IDE;" "" 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 GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX} PLIST_FILES= bin/${GODOTFILE} .ifmake makesum # Always include optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE= .endif post-patch: @${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \ ${WRKSRC}/methods.py @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \ ${WRKSRC}/platform/x11/os_x11.cpp pre-build-MONO-on: makenuget @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \ target=release_debug tools=True platform=server mono_glue=False) @(cd ${WRKSRC} && ${FIND} ${WRKSRC}/bin -name 'godot*' -exec {} \ --generate-mono-glue modules/mono/glue \; && \ ${FIND} ${WRKSRC}/bin -name 'godot*' -delete) # The official godot binary name reflects options used to compile # We just want a simple name matching the portname # This gives us bin/godot for runtime and bin/godot-tools for the IDE do-install: @${RM} ${WRKSRC}/bin/*.debugsymbols cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \ ${STAGEDIR}/${PREFIX}/bin/${GODOTFILE} do-install-EXAMPLES-on: (cd ${WRKSRC_DEMOS} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \ ${STAGEDIR}${EXAMPLESDIR}) do-install-TOOLS-on: ${INSTALL_DATA} ${WRKSRC}/icon.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.png ${INSTALL_DATA} ${WRKSRC}/icon.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg .include diff --git a/devel/godot/distinfo b/devel/godot/distinfo index b0d139d28b0b..0288135f7fac 100644 --- a/devel/godot/distinfo +++ b/devel/godot/distinfo @@ -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 diff --git a/devel/godot/files/patch-devel_godot_files_patch-platform__x11__detect.py b/devel/godot/files/patch-devel_godot_files_patch-platform__x11__detect.py deleted file mode 100644 index 569d231a5f7f..000000000000 --- a/devel/godot/files/patch-devel_godot_files_patch-platform__x11__detect.py +++ /dev/null @@ -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"]: diff --git a/devel/godot/files/patch-platform_x11_detect.py b/devel/godot/files/patch-platform_x11_detect.py new file mode 100644 index 000000000000..3691baf4270f --- /dev/null +++ b/devel/godot/files/patch-platform_x11_detect.py @@ -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 + diff --git a/devel/godot/files/patch-platform_x11_libudev-so__wrap.c b/devel/godot/files/patch-platform_x11_libudev-so__wrap.c new file mode 100644 index 000000000000..64daca324717 --- /dev/null +++ b/devel/godot/files/patch-platform_x11_libudev-so__wrap.c @@ -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);