diff --git a/devel/godot/Makefile b/devel/godot/Makefile index 6169fa7bb5b6..4546fdcceb61 100644 --- a/devel/godot/Makefile +++ b/devel/godot/Makefile @@ -1,114 +1,118 @@ PORTNAME= godot -DISTVERSION= 4.2.1 +DISTVERSION= 4.4 DISTVERSIONSUFFIX= -stable -PORTREVISION?= 4 +PORTREVISION?= 0 CATEGORIES= devel games MAINTAINER= FreeBSD@Shaneware.biz COMMENT?= Game runtime engine WWW= https://godotengine.org/ LICENSE= MIT CC-BY-3.0 LICENSE_COMB= multi LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= yasm:devel/yasm LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ 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++17-lang cpe gl pkgconfig scons xorg -USE_XORG= x11 xcursor xext xi xinerama xrandr xrender -USE_GL= gl glew glu - CPE_VENDOR= godotengine - USE_GITHUB= yes GH_ACCOUNT= godotengine +USE_GL= gl glew glu +USE_XORG= x11 xcursor xext xi xinerama xrandr xrender + MAKE_ARGS+= platform=linuxbsd builtin_freetype=False \ builtin_graphite=False builtin_harfbuzz=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 linker=lld CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_i386_gcc= -march=i586 -OPTIONS_DEFINE= EXAMPLES TOOLS UDEV +GODOTFILE= ${PORTNAME}${PKGNAMESUFFIX} +PLIST_FILES= bin/${GODOTFILE} + +OPTIONS_DEFINE= EXAMPLES TEST TOOLS UDEV OPTIONS_DEFAULT= ALSA UDEV -# Moved to devel/godot-tools -OPTIONS_EXCLUDE?= EXAMPLES TOOLS OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO +# Moved to devel/godot-tools +OPTIONS_EXCLUDE?= EXAMPLES TEST TOOLS AUDIO_DESC= Audio support +TOOLS_DESC= Include development tools (IDE) +UDEV_DESC= Libudev support (Joystick) + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MAKE_ARGS= alsa=True ALSA_MAKE_ARGS_OFF= alsa=False -# 4.2 head at 21/3 -EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:98e9176b7310:DEMOS +# master head at 6/3 - no branch made for 4.4 yet +EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:fdb2f50a2088:DEMOS EXAMPLES_PORTEXAMPLES= * PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MAKE_ARGS= pulseaudio=True PULSEAUDIO_MAKE_ARGS_OFF= pulseaudio=False -TOOLS_DESC= Include development tools (IDE) +TEST_MAKE_ARGS= tests=True TOOLS_MAKE_ARGS= target=editor TOOLS_MAKE_ARGS_OFF= target=template_release 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 .include .if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*} MAKE_ARGS+= module_embree_enabled=no \ module_raycast_enabled=no \ module_webm_enabled=no .endif post-patch: @${REINPLACE_CMD} -e 's|custom_build|${OPSYS}_Ports_build|' \ ${WRKSRC}/methods.py # 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.linuxbsd* \ ${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 +do-test: + cd ${TEST_WRKSRC} && bin/godot.linuxbsd* --verbose --test + .include diff --git a/devel/godot/distinfo b/devel/godot/distinfo index fc9c797cca59..ee1637190497 100644 --- a/devel/godot/distinfo +++ b/devel/godot/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1710997182 -SHA256 (godotengine-godot-4.2.1-stable_GH0.tar.gz) = 716cfd489dbfc91b5e04cc0df8be415ba6eec74c5fb471840275d887cb53ff95 -SIZE (godotengine-godot-4.2.1-stable_GH0.tar.gz) = 39148431 -SHA256 (godotengine-godot-demo-projects-98e9176b7310_GH0.tar.gz) = da3f9bc8c172586a79dd084f24da8b85da16fc9370b2c9b2e2eec5e0de861195 -SIZE (godotengine-godot-demo-projects-98e9176b7310_GH0.tar.gz) = 214863392 +TIMESTAMP = 1741217319 +SHA256 (godotengine-godot-4.4-stable_GH0.tar.gz) = 23b36f704a2fe3bfe5fb2d04db40f2d635435cde079c169836a6f89ee7ca1901 +SIZE (godotengine-godot-4.4-stable_GH0.tar.gz) = 53742226 +SHA256 (godotengine-godot-demo-projects-fdb2f50a2088_GH0.tar.gz) = 96faa3844742c9dc6ebc5354df5817c738855b9234931d7057d08ac3c20281f7 +SIZE (godotengine-godot-demo-projects-fdb2f50a2088_GH0.tar.gz) = 215650115 diff --git a/devel/godot/files/patch-modules_openxr_SCsub b/devel/godot/files/patch-modules_openxr_SCsub deleted file mode 100644 index 6787d039b9e8..000000000000 --- a/devel/godot/files/patch-modules_openxr_SCsub +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/openxr/SCsub.orig 2023-03-02 09:55:48 UTC -+++ modules/openxr/SCsub -@@ -34,7 +34,7 @@ elif env["platform"] == "linuxbsd": - env_openxr.AppendUnique(CPPDEFINES=["XR_USE_PLATFORM_XLIB"]) - - # FIXME: Review what needs to be set for Android and macOS. -- env_openxr.AppendUnique(CPPDEFINES=["HAVE_SECURE_GETENV"]) -+ #env_openxr.AppendUnique(CPPDEFINES=["HAVE_SECURE_GETENV"]) - elif env["platform"] == "windows": - env_openxr.AppendUnique(CPPDEFINES=["XR_OS_WINDOWS", "NOMINMAX", "XR_USE_PLATFORM_WIN32"]) - diff --git a/devel/godot/files/patch-thirdparty_linuxbsd__headers_alsa_asoundlib.h b/devel/godot/files/patch-thirdparty_linuxbsd__headers_alsa_asoundlib.h deleted file mode 100644 index 8fd0f0a4f406..000000000000 --- a/devel/godot/files/patch-thirdparty_linuxbsd__headers_alsa_asoundlib.h +++ /dev/null @@ -1,11 +0,0 @@ ---- thirdparty/linuxbsd_headers/alsa/asoundlib.h.orig 2023-03-02 09:54:29 UTC -+++ thirdparty/linuxbsd_headers/alsa/asoundlib.h -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - - #ifndef __GNUC__ - #define __inline__ inline