[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/27] meson: link libpng independent of vnc
From: |
Paolo Bonzini |
Subject: |
[PULL 25/27] meson: link libpng independent of vnc |
Date: |
Thu, 12 May 2022 19:25:03 +0200 |
From: Kshitij Suri <kshitij.suri@nutanix.com>
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 eba93b41e3..e9f48c5315 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'))
--
2.36.0
- [PULL 22/27] coroutine-lock: introduce qemu_co_queue_enter_all, (continued)
- [PULL 22/27] coroutine-lock: introduce qemu_co_queue_enter_all, Paolo Bonzini, 2022/05/12
- [PULL 08/27] tests/qtest/libqos/pci: Introduce pio_limit, Paolo Bonzini, 2022/05/12
- [PULL 04/27] checkpatch: fix g_malloc check, Paolo Bonzini, 2022/05/12
- [PULL 07/27] hw/xen/xen_pt: Resolve igd_passthrough_isa_bridge_create() indirection, Paolo Bonzini, 2022/05/12
- [PULL 09/27] tests/qtest/libqos: Skip hotplug tests if pci root bus is not hotpluggable, Paolo Bonzini, 2022/05/12
- [PULL 10/27] tests/qtest/libqos: Add generic pci host bridge in arm-virt machine, Paolo Bonzini, 2022/05/12
- [PULL 13/27] machine: add mem compound property, Paolo Bonzini, 2022/05/12
- [PULL 15/27] machine: move more memory validation to Machine object, Paolo Bonzini, 2022/05/12
- [PULL 19/27] net: slirp: add support for CFI-friendly timer API, Paolo Bonzini, 2022/05/12
- [PULL 23/27] coroutine-lock: qemu_co_queue_restart_all is a coroutine-only qemu_co_enter_all, Paolo Bonzini, 2022/05/12
- [PULL 25/27] meson: link libpng independent of vnc,
Paolo Bonzini <=
- [PULL 26/27] vl: make machine type deprecation a warning, Paolo Bonzini, 2022/05/12
- [PULL 24/27] vhost-backend: do not depend on CONFIG_VHOST_VSOCK, Paolo Bonzini, 2022/05/12
- [PULL 27/27] vmxcap: add tertiary execution controls, Paolo Bonzini, 2022/05/12
- Re: [PULL 00/27] Misc patches for 2022-05-12, Richard Henderson, 2022/05/12