diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 771940cfb..e9d3055e3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -36,6 +36,9 @@ jobs: libgraphite2-dev \ libicu-dev \ libpng-dev \ + libglew-dev \ + libglfw3-dev \ + libgl-dev \ pkg-config \ zlib1g-dev \ help2man diff --git a/util/gpu/meson.build b/util/gpu/meson.build index 4616ed83a..913e0530e 100644 --- a/util/gpu/meson.build +++ b/util/gpu/meson.build @@ -48,6 +48,7 @@ gpu_demo_generated += custom_target('default font', capture: true, command: [ hexify, 'static const char default_font[]', '@INPUT@' ]) -glew_dep = dependency('glew', required: true) -glfw_dep = dependency('glfw3', required: true) -gl_dep = dependency('gl', required: true) +glew_dep = dependency('glew', required: false) +glfw_dep = dependency('glfw3', required: false) +gl_dep = dependency('gl', required: false) +have_gpu_demo_deps = glew_dep.found() and glfw_dep.found() and gl_dep.found() diff --git a/util/meson.build b/util/meson.build index e5d6199d0..681397406 100644 --- a/util/meson.build +++ b/util/meson.build @@ -217,12 +217,14 @@ endif if not get_option('gpu').disabled() subdir('gpu') - hb_gpu_util = executable('hb-gpu', - gpu_demo_sources + gpu_demo_generated, - cpp_args: cpp_args, - include_directories: [incconfig, incsrc], - dependencies: [gl_dep, glew_dep, glfw_dep], - link_with: [libharfbuzz, libharfbuzz_gpu], - install: false, - ) + if have_gpu_demo_deps + hb_gpu_util = executable('hb-gpu', + gpu_demo_sources + gpu_demo_generated, + cpp_args: cpp_args, + include_directories: [incconfig, incsrc], + dependencies: [gl_dep, glew_dep, glfw_dep], + link_with: [libharfbuzz, libharfbuzz_gpu], + install: false, + ) + endif endif