mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-06 19:19:41 +00:00
ui/spice: SPICE/QXL requires PIXMAN
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
89fd3eab52
commit
c98791eb63
|
@ -93,7 +93,7 @@ config VGA
|
||||||
|
|
||||||
config QXL
|
config QXL
|
||||||
bool
|
bool
|
||||||
depends on SPICE && PCI
|
depends on SPICE && PCI && PIXMAN
|
||||||
select VGA
|
select VGA
|
||||||
|
|
||||||
config VIRTIO_GPU
|
config VIRTIO_GPU
|
||||||
|
|
|
@ -1015,7 +1015,11 @@ if not get_option('spice_protocol').auto() or have_system
|
||||||
method: 'pkg-config')
|
method: 'pkg-config')
|
||||||
endif
|
endif
|
||||||
spice = not_found
|
spice = not_found
|
||||||
if not get_option('spice').auto() or have_system
|
if get_option('spice') \
|
||||||
|
.disable_auto_if(not have_system) \
|
||||||
|
.require(pixman.found(),
|
||||||
|
error_message: 'cannot enable SPICE if pixman is not available') \
|
||||||
|
.allowed()
|
||||||
spice = dependency('spice-server', version: '>=0.14.0',
|
spice = dependency('spice-server', version: '>=0.14.0',
|
||||||
required: get_option('spice'),
|
required: get_option('spice'),
|
||||||
method: 'pkg-config')
|
method: 'pkg-config')
|
||||||
|
|
|
@ -141,12 +141,12 @@ if spice.found()
|
||||||
'spice-display.c'
|
'spice-display.c'
|
||||||
))
|
))
|
||||||
ui_modules += {'spice-core' : spice_core_ss}
|
ui_modules += {'spice-core' : spice_core_ss}
|
||||||
endif
|
|
||||||
|
|
||||||
if spice.found() and gio.found()
|
if gio.found()
|
||||||
spice_ss = ss.source_set()
|
spice_ss = ss.source_set()
|
||||||
spice_ss.add(spice, gio, pixman, files('spice-app.c'))
|
spice_ss.add(spice, gio, pixman, files('spice-app.c'))
|
||||||
ui_modules += {'spice-app': spice_ss}
|
ui_modules += {'spice-app': spice_ss}
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
keymaps = [
|
keymaps = [
|
||||||
|
|
Loading…
Reference in a new issue