-
Notifications
You must be signed in to change notification settings - Fork 87
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.
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
drivers/g15: Always depend on freetype2 #190
Conversation
This is a workaround for an upstream bug. For details see the following issue. (Closes: lcdproc#188) Signed-off-by: Harald Geyer <harald@ccbib.org>
@toams @jwrdegoede please review and test. |
@@ -51,16 +51,14 @@ static inline int g15_send(int sock, char *buf, unsigned int len) { return -1; } | |||
#endif | |||
|
|||
/* | |||
* If we have freetype2, assume libg15render is build with TTF support, | |||
* Workaround for upstream bug: Assume libg15render is build with TTF support, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change build -> built
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Simple spelling correction in comments. Code is fine.
@@ -51,16 +51,14 @@ static inline int g15_send(int sock, char *buf, unsigned int len) { return -1; } | |||
#endif | |||
|
|||
/* | |||
* If we have freetype2, assume libg15render is build with TTF support, | |||
* Workaround for upstream bug: Assume libg15render is build with TTF support, | |||
* the TTF_SUPPORT define makes the size of the g15 struct bigger, if we do | |||
* not set this define while libg15render is build with TTF support we get |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change build->built
AC_MSG_WARN([The g15driver needs libg15render.h]) | ||
]) | ||
else | ||
AC_MSG_WARN([libg15render ist broken without freetype]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo: 's/ist broken/is broken/'
Thank you for doing this, except for the spotted typo the code looks good to me and I've just done a test-build on a Fedora 35 system and the g15 driver still gets properly enabled there (when requested on the ./configure cmdline) |
I got a build error: For some weird reason the includes for freetype aren't found even tough they are installed. The good news is that after fixing the compile issues I don't get the segfault anymore! |
Thanks for the info. Is pkg-config installed on your computer? What's the output of |
|
I guess for some reason FT2_CFLAGS is not defined for your build. Maybe you can check in config.log. However I don't know enough about autoconf, to debug this. |
@toams can you check what the output of If it does not include that then there is something wrong with your freetype installation. |
Do you guys have the freetype2.m4 macro somewhere installed?(try /usr/share/aclocal) Because I did some investigation and I think the problem is that lcdproc's build system uses freetype2.m4 to detect freetypes header files. But freetype2.m4 is obsolete since 2003 or so and its functionality had been replaced by pkg-config. And debian removed freetype2.m4 from the libfreetype-dev package in 2018.
Please note that I am far from an expert on autoconf, I just tried some things I found on google while investigating this problem. Probably an autoconf expert should proof read |
Thanks! I guess that explains everything. I don't think we have an autoconf expert around, so I'd just go with your fix. But we probably need to replace FT2_CFLAGS and FT2_LIBS in all Makefile.am files with the new symbols. Are you up to reworking this PR? Feel free to submit as your own and would be a great first contribution. (Hopefully I don't embarrass myself by missing previous contributions.) |
This is a workaround for an upstream bug. For details see the following
issue. (Closes: #188)
Signed-off-by: Harald Geyer harald@ccbib.org