[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 16/24] ui/vnc: VNC requires PIXMAN
From: |
marcandre . lureau |
Subject: |
[PATCH v8 16/24] ui/vnc: VNC requires PIXMAN |
Date: |
Tue, 7 Nov 2023 11:19:06 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
meson.build | 6 +++++-
ui/meson.build | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 505cc591b9..3e60f42f94 100644
--- a/meson.build
+++ b/meson.build
@@ -1560,7 +1560,11 @@ endif
vnc = not_found
jpeg = not_found
sasl = not_found
-if get_option('vnc').allowed() and have_system
+if get_option('vnc') \
+ .disable_auto_if(not have_system) \
+ .require(pixman.found(),
+ error_message: 'cannot enable VNC if pixman is not
available') \
+ .allowed()
vnc = declare_dependency() # dummy dependency
jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'),
method: 'pkg-config')
diff --git a/ui/meson.build b/ui/meson.build
index 7c99613950..19723188b5 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -46,7 +46,7 @@ vnc_ss.add(files(
))
vnc_ss.add(zlib, jpeg, gnutls)
vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
-system_ss.add_all(when: vnc, if_true: vnc_ss)
+system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss)
system_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
ui_modules = {}
--
2.41.0
- [PATCH v8 03/24] ui: compile out some qemu-pixman functions when !PIXMAN, (continued)
- [PATCH v8 03/24] ui: compile out some qemu-pixman functions when !PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 05/24] vl: drop needless -spice checks, marcandre . lureau, 2023/11/07
- [PATCH v8 04/24] ui: add pixman-minimal.h, marcandre . lureau, 2023/11/07
- [PATCH v8 06/24] qemu-options: define -vnc only #ifdef CONFIG_VNC, marcandre . lureau, 2023/11/07
- [PATCH v8 07/24] vl: simplify display_remote logic, marcandre . lureau, 2023/11/07
- [PATCH v8 09/24] ui/console: allow to override the default VC, marcandre . lureau, 2023/11/07
- [PATCH v8 10/24] ui/vc: console-vc requires PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 11/24] qmp/hmp: disable screendump if PIXMAN is missing, marcandre . lureau, 2023/11/07
- [PATCH v8 14/24] vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 16/24] ui/vnc: VNC requires PIXMAN,
marcandre . lureau <=
- [PATCH v8 17/24] ui/spice: SPICE/QXL requires PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 18/24] ui/gtk: -display gtk requires PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 12/24] virtio-gpu: replace PIXMAN for region/rect test, marcandre . lureau, 2023/11/07
- [PATCH v8 15/24] ui/gl: opengl doesn't require PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 13/24] ui/console: when PIXMAN is unavailable, don't draw placeholder msg, marcandre . lureau, 2023/11/07
- [PATCH v8 08/24] vl: move display early init before default devices, marcandre . lureau, 2023/11/07
- [PATCH v8 19/24] ui/dbus: do not require PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 20/24] arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN, marcandre . lureau, 2023/11/07
- [PATCH v8 21/24] hw/sm501: allow compiling without PIXMAN, marcandre . lureau, 2023/11/07