Skip to content

Fix build with SDL_ttf 2.24 #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
gerstrong merged 1 commit into from
May 24, 2025
Merged

Fix build with SDL_ttf 2.24 #376

gerstrong merged 1 commit into from
May 24, 2025

Conversation

@mfrischknecht
Copy link
Contributor

@mfrischknecht mfrischknecht commented May 24, 2025 •
edited
Loading

SDL_ttf v. 2.24 has renamed the internal _TTF_Font struct to TTF_Font 1 (the v3 branch also introduced this in v. 3.1.2 2).

This breaks the build at least for current NixOS iterations; cf. this build output:

[ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsTilemap.cpp.o
[ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsDynColor.cpp.o
[ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/CColorMerge.cpp.o
[ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/CDimDark.cpp.o
In file included from /build/source/GsKit/graphics/GsTrueTypeFont.cpp:5:
/nix/store/8jafv6qwhwyrzpz8f323rqdjxw2qklyz-SDL2_ttf-2.24.0/include/SDL2/SDL_ttf.h:165:16: error: using typedef-name 'TTF_Font' after 'struct'
  165 | typedef struct TTF_Font TTF_Font;
      |                ^~~~~~~~
In file included from /build/source/GsKit/graphics/GsTrueTypeFont.cpp:2:
/build/source/GsKit/graphics/GsTrueTypeFont.h:9:26: note: 'TTF_Font' has a previous declaration here
    9 | typedef struct _TTF_Font TTF_Font;
      |                          ^~~~~~~~
/nix/store/8jafv6qwhwyrzpz8f323rqdjxw2qklyz-SDL2_ttf-2.24.0/include/SDL2/SDL_ttf.h:165:25: error: conflicting declaration 'typedef int TTF_Font'
  165 | typedef struct TTF_Font TTF_Font;
      |                         ^~~~~~~~
/build/source/GsKit/graphics/GsTrueTypeFont.h:9:26: note: previous declaration as 'typedef struct _TTF_Font TTF_Font'
    9 | typedef struct _TTF_Font TTF_Font;
      |                          ^~~~~~~~
make[2]: *** [GsKit/graphics/CMakeFiles/GsKit_graphics.dir/build.make:135: GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsTrueTypeFont.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:937: GsKit/graphics/CMakeFiles/GsKit_graphics.dir/all] Error 2
make: *** [Makefile:156: all] Error 2
error: builder for '/nix/store/rgpapisirhjgpskp66as8wygnr401iyy-commandergenius-3.5.2.drv' failed with exit code 2;
       last 25 log lines:
       > [ 34%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsScrollsurface.cpp.o
       > [ 34%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsFont.cpp.o
       > [ 34%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsPalette.cpp.o
       > [ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsTilemap.cpp.o
       > [ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsDynColor.cpp.o
       > [ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/CColorMerge.cpp.o
       > [ 35%] Building CXX object GsKit/graphics/CMakeFiles/GsKit_graphics.dir/CDimDark.cpp.o
       > In file included from /build/source/GsKit/graphics/GsTrueTypeFont.cpp:5:
       > /nix/store/8jafv6qwhwyrzpz8f323rqdjxw2qklyz-SDL2_ttf-2.24.0/include/SDL2/SDL_ttf.h:165:16: error: using typedef-name 'TTF_Font' after 'struct'
       >   165 | typedef struct TTF_Font TTF_Font;
       >       |                ^~~~~~~~
       > In file included from /build/source/GsKit/graphics/GsTrueTypeFont.cpp:2:
       > /build/source/GsKit/graphics/GsTrueTypeFont.h:9:26: note: 'TTF_Font' has a previous declaration here
       >     9 | typedef struct _TTF_Font TTF_Font;
       >       |                          ^~~~~~~~
       > /nix/store/8jafv6qwhwyrzpz8f323rqdjxw2qklyz-SDL2_ttf-2.24.0/include/SDL2/SDL_ttf.h:165:25: error: conflicting declaration 'typedef int TTF_Font'
       >   165 | typedef struct TTF_Font TTF_Font;
       >       |                         ^~~~~~~~
       > /build/source/GsKit/graphics/GsTrueTypeFont.h:9:26: note: previous declaration as 'typedef struct _TTF_Font TTF_Font'
       >     9 | typedef struct _TTF_Font TTF_Font;
       >       |                          ^~~~~~~~
       > make[2]: *** [GsKit/graphics/CMakeFiles/GsKit_graphics.dir/build.make:135: GsKit/graphics/CMakeFiles/GsKit_graphics.dir/GsTrueTypeFont.cpp.o] Error 1
       > make[2]: *** Waiting for unfinished jobs....
       > make[1]: *** [CMakeFiles/Makefile2:937: GsKit/graphics/CMakeFiles/GsKit_graphics.dir/all] Error 2
       > make: *** [Makefile:156: all] Error 2
       For full logs, run:
         nix log /nix/store/rgpapisirhjgpskp66as8wygnr401iyy-commandergenius-3.5.2.drv

Footnotes

  1. https://github.com/libsdl-org/SDL_ttf/commit/7185085beb39b9e8b17d18685a2a58a14b7c53ef ↩

  2. https://github.com/libsdl-org/SDL_ttf/commit/22347419ee08e49d77411c680f15e314ef870ab7 ↩

@mfrischknecht
Fix build with SDL_ttf 2.24
e8af0d1 
SDL_ttf v. 2.24 has renamed the internal `_TTF_Font` struct to
`TTF_Font` [1] (the v3 branch also introduced this in v. 3.1.2).

[^1]: libsdl-org/SDL_ttf@7185085
[^2]: libsdl-org/SDL_ttf@2234741
@gerstrong gerstrong merged commit e9782c7 into gerstrong:master May 24, 2025
1 check failed
mfrischknecht added a commit to mfrischknecht/nixpkgs that referenced this pull request May 25, 2025
@mfrischknecht
commandergenius: fix broken build due to renamed _TTF_Font struct i…
5cc6a94 
…n SDL_ttf

SDL_ttf renamed the internal `_TTF_Font` struct in v. 2.24 [^1] and
3.2.2 [^2], breaking current builds for commandergenius.

Upstream already merged my pull request fixing the error [^3].
This pulls in the fix temporarily using `fetchpatch`; as soon as
upstreams a new release, we'll likely be able to remove it again.

[^1]: libsdl-org/SDL_ttf@7185085
[^2]: libsdl-org/SDL_ttf@2234741
[^3]: gerstrong/Commander-Genius#376
nixpkgs-ci bot pushed a commit to NixOS/nixpkgs that referenced this pull request May 26, 2025
@mfrischknecht @github-actions
commandergenius: fix broken build due to renamed _TTF_Font struct i…
4214f57 
…n SDL_ttf

SDL_ttf renamed the internal `_TTF_Font` struct in v. 2.24 [^1] and
3.2.2 [^2], breaking current builds for commandergenius.

Upstream already merged my pull request fixing the error [^3].
This pulls in the fix temporarily using `fetchpatch`; as soon as
upstreams a new release, we'll likely be able to remove it again.

[^1]: libsdl-org/SDL_ttf@7185085
[^2]: libsdl-org/SDL_ttf@2234741
[^3]: gerstrong/Commander-Genius#376

(cherry picked from commit 5cc6a94)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mfrischknecht @gerstrong