On Wed, 7 Jan 2026 09:04:41 -0800
Thomas Frohwein <[email protected]> wrote:
> Hi,
>
> The diff below is an update to Godot 3.6.2. Briefly tested with the
> editor and the game "House of Necrosis" and it works as before.
>
> Here the interval update notes:
>
> https://godotengine.org/article/maintenance-release-godot-3-6-1/
> https://godotengine.org/article/maintenance-release-godot-3-6-2/
>
> The tuxfamily.org SITES seems to have been down for a while now, so
> switched to using the tarball hosted on GitHub instead. And godotsteam
> is now hosted on codeberg.
>
> Some WANTLIB disappeared; mostly X11/xcb-related. Their use has
> apparently been removed from the source code.
>
> ok?
*ping*
Since I didn't get any feedback, here is the diff again (attached) in
case someone gets opportunity to take a look.
This is a leaf port and there is more work pending on the godot ports
after this update. If there are no concerns by next week, I'm inclined
to commit this anyway to pave the way for the next steps...
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/godot/Makefile,v
diff -u -p -r1.57 Makefile
--- Makefile 30 Jan 2025 17:09:48 -0000 1.57
+++ Makefile 6 Jan 2026 04:58:07 -0000
@@ -4,11 +4,10 @@ COMMENT-main = 2D and 3D game engine
COMMENT-tools= 2D and 3D game engine (with tools)
COMMENT-sharp= .NET libs for mono/C# module of Godot
-V = 3.6
+V = 3.6.2
SHARPFILES_V = 3.5.2
DISTNAME = godot-${V}-stable
PKGNAME = godot-${V}
-REVISION = 0
CATEGORIES = games
@@ -23,11 +22,11 @@ PERMIT_PACKAGE = Yes
MULTI_PACKAGES = -main -tools -sharp
WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody
-WANTLIB += GL LinearMath X11 X11-xcb Xau Xcursor Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm c drm enet execinfo
+WANTLIB += GL LinearMath X11 Xcursor Xext
+WANTLIB += Xi Xinerama Xrandr Xrender c enet execinfo
WANTLIB += intl m mbedcrypto mbedtls mbedx509 mpcdec ogg opus
-WANTLIB += opusfile pcre2-32 sharpyuv sndio steam_api theora theoradec
-WANTLIB += usbhid vorbis vorbisfile vpx webp xcb xcb-dri2 xcb-glx
+WANTLIB += opusfile pcre2-32 sndio steam_api theora theoradec
+WANTLIB += usbhid vorbis vorbisfile vpx webp
WANTLIB += zstd
WANTLIB-main = ${WANTLIB} Xss
@@ -36,14 +35,14 @@ WANTLIB-tools = ${WANTLIB}
# C++14
COMPILER = base-clang ports-gcc
-SITES = https://downloads.tuxfamily.org/godotengine/${V}/
+SITES = https://github.com/godotengine/godot/releases/download/${V}-stable/
EXTRACT_SUFX = .tar.xz
SITES.sharp = https://thfr.info/distfiles/
DISTFILES.sharp = godot-${SHARPFILES_V}-mono-glue.tar.gz \
godot-${SHARPFILES_V}-nuget-packages.tar.xz
-DIST_TUPLE += github CoaguCo-Industries GodotSteam v3.20 godotsteam # MIT
+DIST_TUPLE += codeberg godotsteam godotsteam v3.20 godotsteam # MIT
MODULES = devel/scons
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/godot/distinfo,v
diff -u -p -r1.24 distinfo
--- distinfo 19 Oct 2024 22:06:58 -0000 1.24
+++ distinfo 6 Jan 2026 04:58:07 -0000
@@ -1,8 +1,8 @@
-SHA256 (CoaguCo-Industries-GodotSteam-v3.20.tar.gz) = FoAl3iZ+1CWwIPXwJZ9S7q3QMn//RslYT06tXkc38QU=
SHA256 (godot-3.5.2-mono-glue.tar.gz) = ezUneQt2JzlsQPF4FvSCcNtJiYbdb3NEY4Lvjj/gz64=
SHA256 (godot-3.5.2-nuget-packages.tar.xz) = RXlTjB1IgjZEP2ZJY05xoGQv8XTRKHxwPaMmiNdduQE=
-SHA256 (godot-3.6-stable.tar.xz) = W+0gpwVtTMPMo0ABdSEJgJrXriAFSOmMe7xq+60Y7ac=
-SIZE (CoaguCo-Industries-GodotSteam-v3.20.tar.gz) = 253832
+SHA256 (godot-3.6.2-stable.tar.xz) = if7uYFIKdokg3Swuhjy0LXNeWpsDn5opIkD0gMH+6Gc=
+SHA256 (godotsteam-godotsteam-v3.20.tar.gz) = fZwctfUdjw1RWg1Zvto7ooJf1H4GAdoEp9TY4KCyIME=
SIZE (godot-3.5.2-mono-glue.tar.gz) = 1094618
SIZE (godot-3.5.2-nuget-packages.tar.xz) = 55742184
-SIZE (godot-3.6-stable.tar.xz) = 24345708
+SIZE (godot-3.6.2-stable.tar.xz) = 26457856
+SIZE (godotsteam-godotsteam-v3.20.tar.gz) = 253809
Index: patches/patch-core_object_cpp
===================================================================
RCS file: /cvs/ports/games/godot/patches/patch-core_object_cpp,v
diff -u -p -r1.2 patch-core_object_cpp
--- patches/patch-core_object_cpp 19 Oct 2024 22:06:58 -0000 1.2
+++ patches/patch-core_object_cpp 6 Jan 2026 04:58:07 -0000
@@ -3,7 +3,7 @@ when building without tools, don't warn
Index: core/object.cpp
--- core/object.cpp.orig
+++ core/object.cpp
-@@ -2071,8 +2071,13 @@ RWLock ObjectDB::rw_lock;
+@@ -2074,8 +2074,13 @@ RWLock ObjectDB::rw_lock;
void ObjectDB::cleanup() {
rw_lock.write_lock();
if (instances.size()) {
Index: patches/patch-thirdparty_embree_kernels_geometry_pointi_h
===================================================================
RCS file: patches/patch-thirdparty_embree_kernels_geometry_pointi_h
diff -N patches/patch-thirdparty_embree_kernels_geometry_pointi_h
--- patches/patch-thirdparty_embree_kernels_geometry_pointi_h 30 Jan 2025 17:09:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d
-
-Index: thirdparty/embree/kernels/geometry/pointi.h
---- thirdparty/embree/kernels/geometry/pointi.h.orig
-+++ thirdparty/embree/kernels/geometry/pointi.h
-@@ -210,9 +210,9 @@ namespace embree
- };
-
- /*! output operator */
-- friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
-+ friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)
- {
-- return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
-+ return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";
- }
-
- public:
Index: patches/patch-thirdparty_embree_kernels_subdiv_bezier_curve_h
===================================================================
RCS file: patches/patch-thirdparty_embree_kernels_subdiv_bezier_curve_h
diff -N patches/patch-thirdparty_embree_kernels_subdiv_bezier_curve_h
--- patches/patch-thirdparty_embree_kernels_subdiv_bezier_curve_h 30 Jan 2025 17:09:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d
-
-Index: thirdparty/embree/kernels/subdiv/bezier_curve.h
---- thirdparty/embree/kernels/subdiv/bezier_curve.h.orig
-+++ thirdparty/embree/kernels/subdiv/bezier_curve.h
-@@ -135,7 +135,7 @@ namespace embree
- }
-
- friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
-- return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
-+ return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
- }
- };
-
