diff --git a/.ci/build-win.sh b/.ci/build-win.sh index 6ea2c0fbe..167f91f48 100755 --- a/.ci/build-win.sh +++ b/.ci/build-win.sh @@ -34,7 +34,6 @@ meson setup \ -Dgdi=enabled \ -Ddirectwrite=enabled \ -Dgpu=enabled \ - -Dgpu_demo=enabled \ ${BUILD} \ "$@" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8621e1661..843c3b459 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -31,6 +31,8 @@ jobs: freetype \ glib \ gobject-introspection \ + glew \ + glfw \ graphite2 \ icu4c \ libpng \ diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0198ca5ec..2d8186573 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -43,6 +43,8 @@ jobs: libpng-dev \ pkg-config \ zlib1g-dev \ + libglew-dev \ + libglfw3-dev \ bindgen - name: Setup Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/meson_options.txt b/meson_options.txt index cb205869c..1b7b47048 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -39,8 +39,6 @@ option('vector', type: 'feature', value: 'enabled', description: 'Enable HarfBuzz glyph vector drawing library') option('gpu', type: 'feature', value: 'enabled', description: 'Enable HarfBuzz GPU rasterization library') -option('gpu_demo', type: 'feature', value: 'auto', - description: 'Build hb-gpu demo (requires GLEW, GLFW, GL)') option('subset', type: 'feature', value: 'enabled', description: 'Enable HarfBuzz font subsetting and instancing library') diff --git a/util/gpu/meson.build b/util/gpu/meson.build index 94b07afc8..eab59fc82 100644 --- a/util/gpu/meson.build +++ b/util/gpu/meson.build @@ -33,19 +33,15 @@ if host_machine.system() == 'windows' ) endif -gpu_demo_opt = get_option('gpu_demo') -have_gpu_demo_deps = false -if not gpu_demo_opt.disabled() - glew_dep = dependency('glew', required: gpu_demo_opt) - glfw_dep = dependency('glfw3', required: gpu_demo_opt) - if host_machine.system() == 'darwin' - gl_dep = dependency('appleframeworks', modules: ['OpenGL'], required: gpu_demo_opt) - metal_dep = dependency('appleframeworks', modules: ['Metal', 'QuartzCore', 'Foundation', 'AppKit'], required: false) - else - gl_dep = dependency('gl', required: gpu_demo_opt) - metal_dep = disabler() - endif - d3d11_dep = meson.get_compiler('cpp').find_library('d3d11', required: false) - d3dcompiler_dep = meson.get_compiler('cpp').find_library('d3dcompiler_47', required: false) - have_gpu_demo_deps = glew_dep.found() and glfw_dep.found() and gl_dep.found() +glew_dep = dependency('glew', required: false) +glfw_dep = dependency('glfw3', required: false) +if host_machine.system() == 'darwin' + gl_dep = dependency('appleframeworks', modules: ['OpenGL'], required: false) + metal_dep = dependency('appleframeworks', modules: ['Metal', 'QuartzCore', 'Foundation', 'AppKit'], required: false) +else + gl_dep = dependency('gl', required: false) + metal_dep = disabler() endif +d3d11_dep = meson.get_compiler('cpp').find_library('d3d11', required: false) +d3dcompiler_dep = meson.get_compiler('cpp').find_library('d3dcompiler_47', required: false) +have_gpu_demo_deps = glew_dep.found() and glfw_dep.found() and gl_dep.found()