mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: refine check for whether to look for virglrenderer

Browse Source 
The check should be performed even if !have_system, as long as there is some hope that
vhost-user-gpu will be built.  Store into have_vhost_user_gpu whether vhost-user-gpu
will be built; we will also use the variable to decide whether to look for libepoxy.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-12-17 12:36:26 +01:00
parent 20cf5cb487
commit 0265fe9e21
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/vhost-user-gpu/meson.build
View File

@ -1,5 +1,4 @@
if have_tools and virgl.found() and gbm.found() \ if have_vhost_user_gpu
and 'CONFIG_LINUX' in config_host and pixman.found()
executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'), executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'),
dependencies: [qemuutil, pixman, gbm, virgl, vhost_user, opengl], dependencies: [qemuutil, pixman, gbm, virgl, vhost_user, opengl],
install: true, install: true,

5
meson.build
View File

@ -621,7 +621,9 @@ if not get_option('zstd').auto() or have_block
method: 'pkg-config', kwargs: static_kwargs) method: 'pkg-config', kwargs: static_kwargs)
endif endif
virgl = not_found virgl = not_found
if not get_option('virglrenderer').auto() or have_system
have_vhost_user_gpu = have_tools and targetos == 'linux' and pixman.found()
if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu
virgl = dependency('virglrenderer', virgl = dependency('virglrenderer',
method: 'pkg-config', method: 'pkg-config',
required: get_option('virglrenderer'), required: get_option('virglrenderer'),
@ -1000,6 +1002,7 @@ if (have_system or have_tools) and (virgl.found() or opengl.found())
gbm = dependency('gbm', method: 'pkg-config', required: false, gbm = dependency('gbm', method: 'pkg-config', required: false,
kwargs: static_kwargs) kwargs: static_kwargs)
endif endif
have_vhost_user_gpu = have_vhost_user_gpu and virgl.found() and gbm.found()
gnutls = not_found gnutls = not_found
gnutls_crypto = not_found gnutls_crypto = not_found