diff mbox series

[60/67] ui/vnc: VNC requires PIXMAN

Message ID 20230830093843.3531473-61-marcandre.lureau@redhat.com
State New
Headers show
Series Make pixman an optional dependency | expand

Commit Message

Marc-André Lureau Aug. 30, 2023, 9:38 a.m. UTC 
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(-)

Comments

Paolo Bonzini Sept. 4, 2023, 2:01 p.m. UTC | #1 
On 8/30/23 11:38, marcandre.lureau@redhat.com wrote:
> -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

".disable_auto_if()" is not needed, because ".require()" handles it.

However, please add an error message for ".require()" and make it a seprate variable:

have_vnc = get_option('vnc') \
   .disable_auto_if(not have_system) \
   .require(pixman.found(),
            error_message: 'cannot enable VNC if pixman is not available') \
   .allowed()

Thanks,

Paolo
diff mbox series

Patch

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 = {}