From 03f0a5f9397b5dae7f5d3e68fbcaae2e63e87ee0 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 24 Jul 2023 09:07:09 +0200 Subject: [PATCH] testcard2 Ubuntu DejaVu path fix DejaVuSansMono.ttf is in /usr/share/fonts/truetype/dejavu in Ubuntu at least since version 14.04. --- src/video_capture/testcard2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/video_capture/testcard2.c b/src/video_capture/testcard2.c index 678f52782..c761b5def 100644 --- a/src/video_capture/testcard2.c +++ b/src/video_capture/testcard2.c @@ -88,8 +88,9 @@ static const char * const font_candidates[] = { "cour.ttf", }; static const char * const font_candidates[] = { "Monaco.ttf", "Geneva.ttf", "Keyboard.ttf", }; #else #define DEFAULT_FONT_DIR "/usr/share/fonts" -static const char * const font_candidates[] = { - "DejaVuSansMono.ttf", "truetype/freefont/FreeMonoBold.ttf", "truetype/DejaVuSansMono.ttf", // Ubuntu +static const char *const font_candidates[] = { + "DejaVuSansMono.ttf", // bundled in AppImage + "truetype/freefont/FreeMonoBold.ttf", "truetype/dejavu/DejaVuSansMono.ttf", // Ubuntu "TTF/DejaVuSansMono.ttf", "liberation/LiberationMono-Regular.ttf", // Arch "liberation-mono/LiberationMono-Regular.ttf", // Fedora }; @@ -99,6 +100,7 @@ static const char * const font_candidates[] = { void * vidcap_testcard2_thread(void *args); struct testcard_state2 { + int count; unsigned char *bg; ///< bars coverted to dest color_spec struct timeval t0;