Date: Mon, 03 Aug 2026 14:40:57 +0000 From: Yusuf Yaman <nxjoseph@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Shane <FreeBSD@Shaneware.biz> Subject: git: aad97c3275e2 - main - devel/godot: Update 4.6.2 => 4.7 Message-ID: <6a70a879.38a0a.64ca1d5f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=aad97c3275e2d23c1fccbc9fce760d857efc4080 commit aad97c3275e2d23c1fccbc9fce760d857efc4080 Author: Shane <FreeBSD@Shaneware.biz> AuthorDate: 2026-06-26 04:15:13 +0000 Commit: Yusuf Yaman <nxjoseph@FreeBSD.org> CommitDate: 2026-08-03 14:40:46 +0000 devel/godot: Update 4.6.2 => 4.7 While here: - Use built-in harfbuzz and icu4c because system-provided icu4c or harfbuzz cause known issues for GDExtension (see GH-91401 and GH-100301). - Update patch metadata. - Update LICENSE. Release Notes: https://godotengine.org/releases/4.7/ Changelog: https://godotengine.github.io/godot-interactive-changelog/#4.7 PR: 296268 Reported by: Thibault Payet <monwarez@mailoo.org> Approved by: Shane <FreeBSD@ShaneWare.Biz> (maintainer) Approved by: osa, vvd (Mentors, implicit) --- devel/godot/Makefile | 22 +++++++------ devel/godot/distinfo | 10 +++--- ...h-platform_linuxbsd_wayland_wayland__thread.cpp | 37 +++------------------- 3 files changed, 22 insertions(+), 47 deletions(-) diff --git a/devel/godot/Makefile b/devel/godot/Makefile index f1826a7e0b31..b9bd4e727189 100644 --- a/devel/godot/Makefile +++ b/devel/godot/Makefile @@ -1,5 +1,5 @@ PORTNAME= godot -DISTVERSION= 4.6.2 +DISTVERSION= 4.7 DISTVERSIONSUFFIX= -stable PORTREVISION?= 0 CATEGORIES= devel games @@ -8,9 +8,9 @@ MAINTAINER= FreeBSD@Shaneware.biz COMMENT?= Game runtime engine WWW= https://godotengine.org/ -LICENSE= CC-BY-3.0 MIT +LICENSE= CC-BY-4.0 MIT LICENSE_COMB= multi -LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LOGO_LICENSE.txt +LICENSE_FILE_CC-BY-4.0= ${WRKSRC}/misc/logo/LICENSE.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= yasm:devel/yasm @@ -18,8 +18,6 @@ LIB_DEPENDS= libbrotlicommon.so:archivers/brotli \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ - libharfbuzz-icu.so:print/harfbuzz-icu \ - libharfbuzz.so:print/harfbuzz \ libmbedtls.so:security/mbedtls3 \ libminiupnpc.so:net/miniupnpc \ libogg.so:audio/libogg \ @@ -31,6 +29,8 @@ LIB_DEPENDS= libbrotlicommon.so:archivers/brotli \ libwebp.so:graphics/webp \ libwslay_shared.so:www/wslay \ libzstd.so:archivers/zstd +# libharfbuzz-icu.so:print/harfbuzz-icu +# libharfbuzz.so:print/harfbuzz RUN_DEPENDS= xdg-open:devel/xdg-utils \ xdg-user-dir:devel/xdg-user-dirs \ xmessage:x11/xmessage @@ -45,13 +45,15 @@ USE_GL= gl glew glu USE_SDL= sdl3 # enabling builtin_openxr results in an uncaught exception during init +# System-provided icu4c or harfbuzz cause known issues for GDExtension (see GH-91401 and GH-100301) MAKE_ARGS+= platform=linuxbsd \ dbus=True \ brotli=True \ builtin_brotli=False \ builtin_freetype=False \ builtin_graphite=False \ - builtin_harfbuzz=False \ + builtin_harfbuzz=True \ + builtin_icu4c=True \ builtin_libogg=False \ builtin_libpng=False \ builtin_libtheora=False \ @@ -95,8 +97,8 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MAKE_ARGS= alsa=True ALSA_MAKE_ARGS_OFF= alsa=False -# master head at 20/2 - no branch made for 4.6 yet -EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:f228ea632391:DEMOS +# master head at 23/6 - no branch made for 4.7 yet +EXAMPLES_GH_TUPLE= godotengine:godot-demo-projects:939ca55eaad4:DEMOS EXAMPLES_PORTEXAMPLES= * MOLD_BUILD_DEPENDS= mold:devel/mold @@ -164,9 +166,9 @@ do-install-EXAMPLES-on: do-install-TOOLS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_DATA} ${WRKSRC}/icon.png \ + ${INSTALL_DATA} ${WRKSRC}/misc/logo/icon.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/${GODOTFILE}.png - ${INSTALL_DATA} ${WRKSRC}/icon.svg \ + ${INSTALL_DATA} ${WRKSRC}/misc/logo/icon.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${GODOTFILE}.svg .if ${PORT_OPTIONS:MTEST} diff --git a/devel/godot/distinfo b/devel/godot/distinfo index ce30e995617f..660a963dd850 100644 --- a/devel/godot/distinfo +++ b/devel/godot/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1776198747 -SHA256 (godotengine-godot-4.6.2-stable_GH0.tar.gz) = 908b759e7517fec65d687b3d468cd639fd8967d25da1522ef8a2087af638b3fe -SIZE (godotengine-godot-4.6.2-stable_GH0.tar.gz) = 66048870 -SHA256 (godotengine-godot-demo-projects-f228ea632391_GH0.tar.gz) = cc5f71e1e1522b612ccf900bcedf53d5280e10766a6d62a564a74de1e041be29 -SIZE (godotengine-godot-demo-projects-f228ea632391_GH0.tar.gz) = 244558016 +TIMESTAMP = 1782380943 +SHA256 (godotengine-godot-4.7-stable_GH0.tar.gz) = 5960084fce0934dfa68acd26df1103385cf3675d0de2b5124922d3cae602bf1c +SIZE (godotengine-godot-4.7-stable_GH0.tar.gz) = 69926907 +SHA256 (godotengine-godot-demo-projects-939ca55eaad4_GH0.tar.gz) = 08f9d966b7ac6fb8316c48d166af4e0fb4f7ff5314eba95e0d985d4f72bf4df9 +SIZE (godotengine-godot-demo-projects-939ca55eaad4_GH0.tar.gz) = 249778641 diff --git a/devel/godot/files/patch-platform_linuxbsd_wayland_wayland__thread.cpp b/devel/godot/files/patch-platform_linuxbsd_wayland_wayland__thread.cpp index 9222403d3c82..d9da2d5eab7d 100644 --- a/devel/godot/files/patch-platform_linuxbsd_wayland_wayland__thread.cpp +++ b/devel/godot/files/patch-platform_linuxbsd_wayland_wayland__thread.cpp @@ -1,15 +1,6 @@ ---- platform/linuxbsd/wayland/wayland_thread.cpp.orig 2025-10-13 19:05:40 UTC +--- platform/linuxbsd/wayland/wayland_thread.cpp.orig 2026-06-17 18:46:02 UTC +++ platform/linuxbsd/wayland/wayland_thread.cpp -@@ -95,7 +95,7 @@ Vector<uint8_t> WaylandThread::_read_fd(int fd) { - break; - } - -- DEBUG_LOG_WAYLAND_THREAD(vformat("Read chunk of %d bytes.", last_bytes_read)); -+ DEBUG_LOG_WAYLAND_THREAD(vformat("Read chunk of %d bytes.", (uint64_t)last_bytes_read)); - - bytes_read += last_bytes_read; - -@@ -1197,7 +1197,7 @@ void WaylandThread::_wl_surface_on_enter(void *data, s +@@ -1313,7 +1313,7 @@ void WaylandThread::_wl_surface_on_enter(void *data, s WindowState *ws = (WindowState *)data; ERR_FAIL_NULL(ws); @@ -18,7 +9,7 @@ ws->wl_outputs.insert(wl_output); -@@ -1248,7 +1248,7 @@ void WaylandThread::_wl_surface_on_leave(void *data, s +@@ -1353,7 +1353,7 @@ void WaylandThread::_wl_surface_on_leave(void *data, s ws->wl_outputs.erase(wl_output); @@ -27,7 +18,7 @@ } // TODO: Add support to this event. -@@ -1310,7 +1310,7 @@ void WaylandThread::_wl_output_on_done(void *data, str +@@ -1419,7 +1419,7 @@ void WaylandThread::_wl_output_on_done(void *data, str ss->wayland_thread->_update_scale(ss->data.scale); @@ -36,7 +27,7 @@ } void WaylandThread::_wl_output_on_scale(void *data, struct wl_output *wl_output, int32_t factor) { -@@ -1319,7 +1319,7 @@ void WaylandThread::_wl_output_on_scale(void *data, st +@@ -1428,7 +1428,7 @@ void WaylandThread::_wl_output_on_scale(void *data, st ss->pending_data.scale = factor; @@ -45,21 +36,3 @@ } void WaylandThread::_wl_output_on_name(void *data, struct wl_output *wl_output, const char *name) { -@@ -2509,7 +2509,7 @@ void WaylandThread::_wl_data_source_on_send(void *data - } - - if (written_bytes > 0) { -- DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", written_bytes)); -+ DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", (uint64_t)written_bytes)); - } else if (written_bytes == 0) { - DEBUG_LOG_WAYLAND_THREAD("Clipboard: no bytes sent."); - } else { -@@ -2697,7 +2697,7 @@ void WaylandThread::_wp_primary_selection_source_on_se - } - - if (written_bytes > 0) { -- DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", written_bytes)); -+ DEBUG_LOG_WAYLAND_THREAD(vformat("Clipboard: sent %d bytes.", (uint64_t)written_bytes)); - } else if (written_bytes == 0) { - DEBUG_LOG_WAYLAND_THREAD("Clipboard: no bytes sent."); - } else {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a70a879.38a0a.64ca1d5f>