diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-08-30 13:38:35 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-11-07 14:04:25 +0400 |
| commit | c98791eb63517299d0c87fdd2823c3738d8c73cb (patch) | |
| tree | 186c884d2cdea2dcf6f5afa91e14e25a89b9de85 | |
| parent | 89fd3eab52f4dcdd7fcbb6e30a78ad0c7f8b6e80 (diff) | |
| download | qemu-c98791eb63517299d0c87fdd2823c3738d8c73cb.zip qemu-c98791eb63517299d0c87fdd2823c3738d8c73cb.tar.gz qemu-c98791eb63517299d0c87fdd2823c3738d8c73cb.tar.bz2 | |
ui/spice: SPICE/QXL requires PIXMAN
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/display/Kconfig | 2 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | ui/meson.build | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 7b3da68..4d8b0ce 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -93,7 +93,7 @@ config VGA config QXL bool - depends on SPICE && PCI + depends on SPICE && PCI && PIXMAN select VGA config VIRTIO_GPU diff --git a/meson.build b/meson.build index 3e60f42..0f578dd 100644 --- a/meson.build +++ b/meson.build @@ -1015,7 +1015,11 @@ if not get_option('spice_protocol').auto() or have_system method: 'pkg-config') endif 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', required: get_option('spice'), method: 'pkg-config') diff --git a/ui/meson.build b/ui/meson.build index 1972318..024f494 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -141,12 +141,12 @@ if spice.found() 'spice-display.c' )) ui_modules += {'spice-core' : spice_core_ss} -endif -if spice.found() and gio.found() - spice_ss = ss.source_set() - spice_ss.add(spice, gio, pixman, files('spice-app.c')) - ui_modules += {'spice-app': spice_ss} + if gio.found() + spice_ss = ss.source_set() + spice_ss.add(spice, gio, pixman, files('spice-app.c')) + ui_modules += {'spice-app': spice_ss} + endif endif keymaps = [ |