[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 61/67] ui/spice: SPICE/QXL requires PIXMAN
From: |
marcandre . lureau |
Subject: |
[PATCH 61/67] ui/spice: SPICE/QXL requires PIXMAN |
Date: |
Wed, 30 Aug 2023 13:38:35 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
hw/display/Kconfig | 2 +-
ui/meson.build | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 7b3da68d1c..4d8b0cec40 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/ui/meson.build b/ui/meson.build
index b3525ef064..08d845d43a 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -133,7 +133,7 @@ if sdl.found()
ui_modules += {'sdl' : sdl_ss}
endif
-if spice.found()
+if spice.found() and pixman.found()
spice_core_ss = ss.source_set()
spice_core_ss.add(spice, pixman, files(
'spice-core.c',
@@ -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 = [
--
2.41.0
- [PATCH 49/67] ui/vc: split off the VC part from console.c, (continued)
- [PATCH 49/67] ui/vc: split off the VC part from console.c, marcandre . lureau, 2023/08/30
- [PATCH 51/67] build-sys: add optional "pixman" feature, marcandre . lureau, 2023/08/30
- [PATCH 53/67] ui: add pixman-compat.h, marcandre . lureau, 2023/08/30
- [PATCH 57/67] ui/console: when PIXMAN is unavailable, don't draw placeholder msg, marcandre . lureau, 2023/08/30
- [PATCH 58/67] vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 59/67] ui/gl: opengl doesn't require PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 60/67] ui/vnc: VNC requires PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 62/67] ui/gtk: -display gtk requires PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 61/67] ui/spice: SPICE/QXL requires PIXMAN,
marcandre . lureau <=
- [PATCH 63/67] ui/dbus: do not require PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 65/67] ppc/kconfig: make SAM460EX depend on PPC & PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 64/67] arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 66/67] sh4/kconfig: make R2D depend on SH4 & PIXMAN, marcandre . lureau, 2023/08/30
- [PATCH 67/67] display/kconfig: make SM501 depend on PIXMAN, marcandre . lureau, 2023/08/30
- Re: [PATCH 00/67] Make pixman an optional dependency, Thomas Huth, 2023/08/30