Skip to content

Commit

Permalink
devel/godot: update to 4.0
Browse files Browse the repository at this point in the history
ChangeLog: https://godotengine.org/article/godot-4-0-sets-sail/

PR:		269954
Reported by:	[email protected] (maintainer)
  • Loading branch information
Shane authored and fernape committed Mar 8, 2023
1 parent 74b0a17 commit 4b4f01c
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 146 deletions.
42 changes: 14 additions & 28 deletions devel/godot/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= godot
DISTVERSION= 3.4.2
DISTVERSION= 4.0
DISTVERSIONSUFFIX= -stable
PORTREVISION?= 1
PORTREVISION?= 0
CATEGORIES= devel games

MAINTAINER= [email protected]
Expand All @@ -15,14 +15,17 @@ 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++14-lang cpe gl pkgconfig scons xorg
USES= compiler:c++17-lang cpe gl pkgconfig scons xorg
USE_XORG= x11 xcursor xext xi xinerama xrandr xrender
USE_GL= gl glew glu

Expand All @@ -31,15 +34,15 @@ CPE_VENDOR= godotengine
USE_GITHUB= yes
GH_ACCOUNT= godotengine

MAKE_ARGS+= platform=x11 builtin_freetype=False \
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 use_lld=True
MAKE_ARGS_clang= use_llvm=True linker=lld
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 UDEV
# Moved to devel/godot-tools
Expand All @@ -51,22 +54,15 @@ AUDIO_DESC= Audio support
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_MAKE_ARGS= alsa=True
ALSA_MAKE_ARGS_OFF= alsa=False
# tagged 6/11/21 for 3.4
EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:585455e67ca3:DEMOS
# 4.0 head at 3/3
EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:778baf07cc7d: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_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 \
Expand Down Expand Up @@ -96,23 +92,13 @@ MAKE_ARGS+= module_embree_enabled=no \
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* \
cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.linuxbsd* \
${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}

do-install-EXAMPLES-on:
Expand Down
14 changes: 5 additions & 9 deletions devel/godot/distinfo
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
TIMESTAMP = 1640725622
SHA256 (dotnet.glob.2.1.1.nupkg) = 8fa01b1928a9c4b70a4803226dcd2ec942474daf2876b80e35a0380d72f8fc1a
SIZE (dotnet.glob.2.1.1.nupkg) = 73782
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
TIMESTAMP = 1677902012
SHA256 (godotengine-godot-4.0-stable_GH0.tar.gz) = e6cf28411ae4196db0bcd608f77bcafc0c019ea6dd6cc8c750ca3cc3755df547
SIZE (godotengine-godot-4.0-stable_GH0.tar.gz) = 39355782
SHA256 (godotengine-godot-demo-projects-778baf07cc7d_GH0.tar.gz) = 42ad5425fd3685887140e404f7fd8abf15ba4a97f475291200e872a1241913fe
SIZE (godotengine-godot-demo-projects-778baf07cc7d_GH0.tar.gz) = 199997674
11 changes: 11 additions & 0 deletions devel/godot/files/patch-modules_openxr_SCsub
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- 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"])

20 changes: 0 additions & 20 deletions devel/godot/files/patch-platform_x11_detect.py

This file was deleted.

11 changes: 0 additions & 11 deletions devel/godot/files/patch-platform_x11_libudev-so__wrap.c

This file was deleted.

20 changes: 0 additions & 20 deletions devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__codec.h

This file was deleted.

20 changes: 0 additions & 20 deletions devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__decoder.h

This file was deleted.

19 changes: 0 additions & 19 deletions devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__frame__buffer.h

This file was deleted.

19 changes: 0 additions & 19 deletions devel/godot/files/patch-thirdparty_libvpx_vpx_vpx__image.h

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- 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 <poll.h>
#include <errno.h>
#include <stdarg.h>
-#include <endian.h>
+#include <sys/endian.h>

#ifndef __GNUC__
#define __inline__ inline

0 comments on commit 4b4f01c

Please sign in to comment.