FreeType submodule #1446

illwieckz · 2024-11-19T00:44:46Z

It is written against the Saigo branch:

Early support of the Saigo toolchain #981

There is no submodule yet, one has to clone:

https://gitlab.freedesktop.org/freetype/freetype.git as libs/freetype

When USE_SYSTEM_LIBS is set to ON, system libraries are used instead of submodules.

See also:

Lua and FreeType submodule Unvanquished/Unvanquished#3195

See this issue for the motivation behind it:

Compiling Freetype and Lua as submodules for nexe/wasm cgame/sgame Unvanquished/Unvanquished#3189

…ompiled freetype when building cgame

illwieckz · 2024-12-18T01:28:16Z

If there is no comment about mistakes to fix, I will merge it in two days.

See this comment for the reasons why I want and need FreeType to be a submodule:

Compiling Freetype and Lua as submodules for nexe/wasm cgame/sgame Unvanquished/Unvanquished#3189 (comment)

slipher · 2024-12-18T10:30:31Z

I see that for now, Freetype in the engine would still use the external_deps or system package by default. But what is the future of Freetype in external_deps? Is the plan to remove that and make everyone build it from scratch later?

illwieckz · 2024-12-18T13:30:33Z

I see that for now, Freetype in the engine would still use the external_deps or system package by default. But what is the future of Freetype in external_deps? Is the plan to remove that and make everyone build it from scratch later?

The plan is to never drop the ability to build against system library. Being able to not rebuild Freetype when the system provides it a wanted feature. This is what classic Linux distributions want. If Debian does an unvanquished.deb, they want it to rely on freetype.deb.

illwieckz · 2024-12-18T13:32:37Z

But we may be able to drop FreeType from external_deps at some point, it's just not on topic of that PR. This PR changes nothing on that side. To drop FreeType from the external deps, extra work is required. That extra work would be to replace USE_SYSTEM_LIBS with PREFER_SYSTEM_LIBS and implement cmake code to only use the submodule as a fallback.

I implemented USE_SYSTEM_LIBS first instead of PREFER_SYSTEM_LIBS to not delay this work because of the extra work being required, but in the end, the delay looks to not be technical.

The future looks like we will be able to drop FreeType from the external_deps entirely while still offering to not rebuild it when the system provides it (Linux, macOS with brew, etc.), but this is not planned for now. Because of the AppVeyor CI being very very slow we may keep this prebuilt for a while for MSVC. I don't know yet what to do.

My priority was to be able to build Lua and FreeType from submodules (required for the static cgame) while not enforcing it and still relying on shared libraries when they exist to not extend the engine build time. The external_deps still counts as system libraries for now.

slipher · 2024-12-19T09:40:50Z

CMakeLists.txt

@@ -791,6 +791,8 @@ if (USE_BREAKPAD)
    endif()
 endif()

+option(USE_SYSTEM_LIBS "Tries to use system libs where possible." ON)


This is not a good name since it really means to use any kind of precompiled one. How about inverting the meaning and calling it USE_SOURCE_LIBS? Meaning prefer to build stuff from source.

Reverting it may not be a good idea if I change this to some PREFER_SYSTEM_LIBS with a fallback mechanism.

We can name it USE_EXTERNAL_LIBS, that name will fit both the system libraries and the ones from the external_deps folder.

I implemented PREFER_EXTERNAL_LIBS instead.

.gitmodules

slipher · 2024-12-21T11:33:47Z

freetype.cmake

@@ -0,0 +1,18 @@
+set(FT_DISABLE_BROTLI ON CACHE STRING "Disable Brotli" FORCE)


If you are adding a new cmake file it should go in cmake/. This is small enough that personally I would just put it in the main file.

Why not. I did it that way because I mimicked how rmlui.cmake is stored in Unvanquished repository, but the Unvanquished repository has no cmake/ folder (maybe it's time to do one there too).

I will keep it that way for now, to be consistent with all other cmake files in both Unvanquished and Daemon repositories for building sources, like src.cmake, srclibs.cmake (and the lua.cmake and rmlui.cmake ones in Unvanquished).

We can define a new convention later and migrate those to a better name later, but for now this is consistent.

slipher · 2024-12-21T11:34:23Z

cmake/DaemonFlags.cmake

 		if (NOT FLAG_GNU89)
-			message(FATAL_ERROR "GNU89 or C99 not supported by compiler")
+			message(FATAL_ERROR "GNU99 is not supported by the compiler")


Test variable's name is now mismatched with the flag

illwieckz · 2024-12-29T22:10:36Z

I implemented PREFER_EXTERNAL_LIBS.

slipher · 2025-01-03T03:27:19Z

CMakeLists.txt

+        find_package(${LIB_NAME})
+
+        if (NOT ${LIB_NAME}_FOUND)
+            message(WARNING "PREFER_EXTERNAL_LIBS is enabled but external ${LIB_NAME} is not found, falling back to vendored FreeType.")


The library name is hard-coded as "FreeType"

slipher · 2025-01-03T05:47:33Z

freetype.cmake

@@ -0,0 +1,18 @@
+set(FT_DISABLE_BROTLI ON CACHE STRING "Disable Brotli" FORCE)
+set(FT_DISABLE_BZIP2 ON CACHE STRING "Disable bzip2" FORCE)
+set(FT_DISABLE_HARFBUZZ ON CACHE STRING "Disable HarfBuzz" FORCE)


The subdirectory stuff showing up in the option list is always annoying. Let's put mark_as_advanced for all those

Done. I have also marked as advanced another one we don't modify.

While I was at it, I modified those lines as option(), and we don't force them anymore, we just set the default value we want, and this takes precedence over FreeTypes's own defaults, but still allow us to tweak them if we want.

The only forced FreeType option is FT_DISABLE_ZLIB (option to use builtin FreeType zlib) because it is always ON with NaCl and we already rely on PREFER_EXTERNAL_LIBS instead when building the engine.

libs: make FreeType a submodule

ff63572

illwieckz marked this pull request as draft November 19, 2024 00:44

illwieckz force-pushed the illwieckz/submodules/sync branch 5 times, most recently from 43c9ea1 to 247ece2 Compare November 19, 2024 22:34

This was referenced Nov 19, 2024

Lua and FreeType submodule Unvanquished/Unvanquished#3195

Open

Migrating NaCl toolchain From PNaCl to Saigo Unvanquished/Unvanquished#3197

Open

Early support of the Saigo toolchain #981

Merged

illwieckz force-pushed the illwieckz/submodules/sync branch 4 times, most recently from efeda01 to a93f12d Compare November 20, 2024 01:15

libs: delete vendored zlib, it was only used by PNaCl because of prec…

51e613b

…ompiled freetype when building cgame

illwieckz mentioned this pull request Nov 20, 2024

Compiling Freetype and Lua as submodules for nexe/wasm cgame/sgame Unvanquished/Unvanquished#3189

Open

illwieckz force-pushed the illwieckz/submodules/sync branch 6 times, most recently from ee22f48 to f0492fc Compare November 23, 2024 21:37

illwieckz changed the title ~~WIP: freetype submodule~~ FreeType submodule Nov 23, 2024

illwieckz marked this pull request as ready for review November 23, 2024 23:17

illwieckz force-pushed the illwieckz/submodules/sync branch from f0492fc to a50d4e0 Compare December 5, 2024 09:19

illwieckz force-pushed the illwieckz/submodules/sync branch from a50d4e0 to 82553f0 Compare December 18, 2024 00:38

slipher reviewed Dec 19, 2024

View reviewed changes

illwieckz added 2 commits December 19, 2024 16:25

cmake: lua requires c99

18615a4

cmake: minor rewording

d238ff3

slipher reviewed Dec 21, 2024

View reviewed changes

illwieckz force-pushed the illwieckz/submodules/sync branch 3 times, most recently from 5f97eb4 to e2a9060 Compare December 29, 2024 22:09

illwieckz force-pushed the illwieckz/submodules/sync branch from e2a9060 to 90f8bb4 Compare December 31, 2024 16:11

slipher reviewed Jan 3, 2025

View reviewed changes

illwieckz force-pushed the illwieckz/submodules/sync branch 2 times, most recently from a38a469 to d238ff3 Compare January 4, 2025 02:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FreeType submodule #1446

FreeType submodule #1446

illwieckz commented Nov 19, 2024 •

edited

Loading

illwieckz commented Dec 18, 2024

slipher commented Dec 18, 2024

illwieckz commented Dec 18, 2024

illwieckz commented Dec 18, 2024 •

edited

Loading

slipher Dec 19, 2024

illwieckz Dec 29, 2024

illwieckz Dec 29, 2024

slipher Dec 21, 2024

illwieckz Dec 29, 2024

illwieckz Dec 29, 2024

slipher Dec 21, 2024

illwieckz Dec 29, 2024

illwieckz commented Dec 29, 2024

slipher Jan 3, 2025

illwieckz Jan 4, 2025

slipher Jan 3, 2025

illwieckz Jan 4, 2025

		@@ -0,0 +1,18 @@
		set(FT_DISABLE_BROTLI ON CACHE STRING "Disable Brotli" FORCE)

FreeType submodule #1446

Are you sure you want to change the base?

FreeType submodule #1446

Conversation

illwieckz commented Nov 19, 2024 • edited Loading

illwieckz commented Dec 18, 2024

slipher commented Dec 18, 2024

illwieckz commented Dec 18, 2024

illwieckz commented Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

illwieckz commented Dec 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

illwieckz commented Nov 19, 2024 •

edited

Loading

illwieckz commented Dec 18, 2024 •

edited

Loading