Skip to content
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

drivers/g15: Always depend on freetype2 #190

Closed
wants to merge 1 commit into from
Closed

drivers/g15: Always depend on freetype2 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,25 @@ dnl else
dnl else
AC_MSG_WARN([libg15daemon_client.h not found, the g15 driver will lack g15daemon support])
])
AC_CHECK_HEADERS([libg15render.h],[
AC_CHECK_LIB(g15render, g15r_initCanvas,[
LIBG15="$LIBG15 -lg15render"
DRIVERS="$DRIVERS g15${SO}"
actdrivers=["$actdrivers g15"]
if test "$enable_freetype" = "yes"; then
AC_CHECK_HEADERS([libg15render.h],[
AC_CHECK_LIB(g15render, g15r_initCanvas,[
LIBG15="$LIBG15 -lg15render"
DRIVERS="$DRIVERS g15${SO}"
actdrivers=["$actdrivers g15"]
],[
dnl else
AC_MSG_WARN([the g15 driver needs libg15render])
],
[-lg15render]
)
],[
dnl else
AC_MSG_WARN([the g15 driver needs libg15render])
],
[-lg15render]
)
],[
dnl else
AC_MSG_WARN([The g15driver needs libg15render.h])
])
AC_MSG_WARN([The g15driver needs libg15render.h])
])
else
AC_MSG_WARN([libg15render ist broken without freetype])
Copy link
Contributor

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/'

fi
;;
glcd)
GLCD_DRIVERS=""
Expand Down
4 changes: 1 addition & 3 deletions server/drivers/g15.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Member

Choose a reason for hiding this comment

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

change build -> built

* 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
Copy link
Member

Choose a reason for hiding this comment

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

change build->built

* heap corruption. The other way around does not matter, then we just alloc
* a little bit too much memory (the TTF related variables live at the end
* of the struct).
*/
#ifdef HAVE_FT2
#define TTF_SUPPORT
#endif
#include <libg15render.h>

#include "lcd.h"
Expand Down