[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 60/67] ui/vnc: VNC requires PIXMAN
From: |
marcandre . lureau |
Subject: |
[PATCH 60/67] ui/vnc: VNC requires PIXMAN |
Date: |
Wed, 30 Aug 2023 13:38:34 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
meson.build | 5 ++++-
ui/meson.build | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 3bd7046099..ceafbc5b73 100644
--- a/meson.build
+++ b/meson.build
@@ -1549,7 +1549,10 @@ 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 pixman.found()) \
+ .require(pixman.found()) \
+ .allowed() and have_system
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..b3525ef064 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -46,8 +46,8 @@ 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(when: vnc, if_false: files('vnc-stubs.c'))
+system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss)
+system_ss.add(when: [vnc, pixman], if_false: files('vnc-stubs.c'))
ui_modules = {}
--
2.41.0
- [PATCH 55/67] qmp/hmp: disable screendump if PIXMAN is missing, (continued)
- [PATCH 55/67] qmp/hmp: disable screendump if PIXMAN is missing, marcandre . lureau, 2023/08/30
- [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 <=
- [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, 2023/08/30
- [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