Skip to content

[ftgl] Download instead of bundle and bump from 2.1.2 to 2.4, and use CMake target#21898

Open
ferdymercury wants to merge 3 commits intoroot-project:masterfrom
ferdymercury:bftgl
Open

[ftgl] Download instead of bundle and bump from 2.1.2 to 2.4, and use CMake target#21898
ferdymercury wants to merge 3 commits intoroot-project:masterfrom
ferdymercury:bftgl

Conversation

@ferdymercury
Copy link
Copy Markdown
Collaborator

No description provided.

@ferdymercury ferdymercury changed the title [ftgl] Download instead of bundle and bump to 2.4, and use CMake target [ftgl] Download instead of bundle and bump from 2.1.2 to 2.4, and use CMake target Apr 12, 2026
@ferdymercury ferdymercury force-pushed the bftgl branch 3 times, most recently from 04392d9 to 20d44ae Compare April 12, 2026 19:57
@ferdymercury ferdymercury force-pushed the bftgl branch 4 times, most recently from eb09a22 to 5c9b702 Compare April 12, 2026 22:53
@ferdymercury ferdymercury added the skip code analysis Skip the code analysis CI steps for this PR, including verifying clang-formatting and running Ruff. label Apr 12, 2026
@ferdymercury ferdymercury marked this pull request as ready for review April 12, 2026 23:24
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 13, 2026

Test Results

    22 files      22 suites   3d 4h 45m 8s ⏱️
 3 833 tests  3 832 ✅  1 💤 0 ❌
75 650 runs  75 632 ✅ 18 💤 0 ❌

Results for commit c9b87bc.

♻️ This comment has been updated with latest results.

Comment thread builtins/ftgl/CMakeLists.txt Outdated
Comment thread builtins/ftgl/0002-fix-type-error.patch Outdated
@@ -0,0 +1,39 @@
diff --git a/src/FTContour.cpp b/src/FTContour.cpp
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@silverweed I got this patch from https://github.com/luadebug/xmake-repo/blob/66321835cb5e940f5997c10de515d50e91aaac47/packages/f/ftgl/patches/2.4.0/fix-type-error.patch

maybe you know of a good way to tune it to include your probably more accurate fixes from a028d13

@ferdymercury ferdymercury requested a review from silverweed April 13, 2026 10:38
Comment thread builtins/ftgl/CMakeLists.txt Outdated
Comment thread builtins/ftgl/CMakeLists.txt Outdated
Comment thread builtins/ftgl/CMakeLists.txt
Comment thread builtins/ftgl/CMakeLists.txt Outdated
Comment thread builtins/ftgl/CMakeLists.txt
Comment thread graf2d/asimage/CMakeLists.txt
Comment thread builtins/freetype/CMakeLists.txt Outdated
… CMake target

[ftgl] try to fix win32 find-package error

[ftgl] patch to fix win32 compilation error

[ftgl] fix win32 static flag

Attempt to fix

     Creating library C:/ROOT-CI/build/lib/libRGL.lib and object C:/ROOT-CI/build/lib/libRGL.exp
TGLFontManager.obj : error LNK2019: unresolved external symbol "__declspec(dllimport) public: void __thiscall FTFont::BBox(char const *,float &,float &,float &,float &,float &,float &)" (__imp_?BBox@FTFont@@QAEXPBDAAM11111@Z) referenced in function "private: void __thiscall TGLFont::RenderHelper<char>(char const *,double,double,double,double)const " (??$RenderHelper@D@TGLFont@@ABEXPBDNNNN@Z) [C:\ROOT-CI\build\graf3d\gl\RGL.vcxproj]
TGLText.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: void __thiscall FTFont::BBox(char const *,float &,float &,float &,float &,float &,float &)" (__imp_?BBox@FTFont@@QAEXPBDAAM11111@Z) [C:\ROOT-CI\build\graf3d\gl\RGL.vcxproj]
TGLFontManager.obj : error LNK2019: unresolved external symbol "__declspec(dllimport) public: void __thiscall FTFont::BBox(wchar_t const *,float &,float &,float &,float &,float &,float &)" (__imp_?BBox@FTFont@@QAEXPB_WAAM11111@Z) referenced in function "private: void __thiscall TGLFont::RenderHelper<wchar_t>(wchar_t const *,double,double,double,double)const " (??$RenderHelper@_W@TGLFont@@ABEXPB_WNNNN@Z) [C:\ROOT-CI\build\graf3d\gl\RGL.vcxproj]
C:\ROOT-CI\build\bin\libRGL.dll : fatal error LNK1120: 2 unresolved externals [C:\ROOT-CI\build\graf3d\gl\RGL.vcxproj]

because FLAG not propagated, they only use local add_definitions (CMake 2.8) rather than target-based

[gl] encapsulate dependency behind CMake target

[cmake] make git command compatible with some local settings
@ferdymercury ferdymercury requested review from hageboeck and linev April 17, 2026 09:57
@dpiparo dpiparo added this to the 6.42.00 milestone Apr 21, 2026
@dpiparo
Copy link
Copy Markdown
Member

dpiparo commented Apr 21, 2026

Thanks for this work. Since this week we are branching v6-40-00-patches, I propose to merge it immediately after on the main branch, so to have it in November for 6.42.00.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr:squash on merge skip code analysis Skip the code analysis CI steps for this PR, including verifying clang-formatting and running Ruff.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants