From e23a13c0426774443543d78eef84ec8404534f0b Mon Sep 17 00:00:00 2001
From: Kshitij Suri <kshitij.suri@nutanix.com>
Date: Tue, 10 May 2022 16:19:32 +0000
Subject: [PATCH] meson: link libpng independent of vnc
Currently png support is dependent on vnc for linking object file to
libpng. This commit makes the parameter independent of vnc as it breaks
system emulator with --disable-vnc unless --disable-png is added.
Fixes: 9a0a119a38 ("Added parameter to take screenshot with screendump as PNG", 2022-04-27)
Signed-off-by: Kshitij Suri <kshitij.suri@nutanix.com>
Message-Id: <20220510161932.228481-1-kshitij.suri@nutanix.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
ui/meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/meson.build b/ui/meson.build
index eba93b41e34..e9f48c53158 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -2,6 +2,7 @@ softmmu_ss.add(pixman)
specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: pixman) # for the include path
specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl) # for the include path
+softmmu_ss.add(png)
softmmu_ss.add(files(
'clipboard.c',
'console.c',
@@ -40,7 +41,7 @@ vnc_ss.add(files(
'vnc-jobs.c',
'vnc-clipboard.c',
))
-vnc_ss.add(zlib, png, jpeg, gnutls)
+vnc_ss.add(zlib, jpeg, gnutls)
vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
--
GitLab