Created attachment 258316 [details] git -C /usr/ports diff godot bundles embree. this bug was fixed in our embree in PR #281868 so i applied it here also
Seems ok to me
question: the way PATCH_DIST_STRIP=-p1 takes the a/ and b/ off of the --- and +++ in PATCHFILES from PATCH_SITES do/can we have/combine like a PATCH_DIST_PREPEND=thirdparty/embree/ or is there a way to modify the individual CWD's of each PATCHFILES via their :groups? because in the above patch i have chosen to populate files/ instead, unlike PR #281868.
You will find these changes exist in the godot 4.4 release see bug #285132 While the idea of adjusting the patches sounds good, I wouldn't expect too many ports to have third party repos copied into their source tree, so that would make it a low priority change. The solution may be to adjust the patches and host them yourself.
this patch fixes 4.2.1, does NOT depend on #285132 (which updates Godot to 4.4 where the same fix or a newer embree comes from upstream) If deciding to commit this fix prior to that update (#285132) be sure that the later commit also deletes the two patches that this one puts into files/ Otherwise this PR can simply be closed as overcome by events; i've been using the update from #285132 already with success
(In reply to Chad Jacob Milios from comment #4) Putting a dependency on a PR that fixes this one makes sense and helps the committer to close both PRs when commit. As https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=285183#c3 says, update to 4.4 solves this PR.
(In reply to Nuno Teixeira from comment #5) okay i understand your rationale now. Thanks!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbaa706111b8a0819df2af5a444ba17f19c8ffa4 commit cbaa706111b8a0819df2af5a444ba17f19c8ffa4 Author: Tomasz CeDeROM CEDRO <tomek@cedro.info> AuthorDate: 2025-03-19 00:48:03 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2025-03-19 00:50:49 +0000 devel/godot{,-tools}: Update to 4.4 - Unbreak with clang 19 ChangeLog: https://godotengine.github.io/godot-interactive-changelog/#4.4 PR: 285132, 285183 devel/godot/Makefile | 36 ++++++++++++---------- devel/godot/distinfo | 10 +++--- .../godot/files/patch-modules_openxr_SCsub (gone) | 11 ------- ...party_linuxbsd__headers_alsa_asoundlib.h (gone) | 11 ------- 4 files changed, 25 insertions(+), 43 deletions(-)