* [PATCH v1] Make png parameter to ui/meson.build independent of vnc
@ 2022-05-10 16:19 Kshitij Suri
2022-05-11 7:46 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Kshitij Suri @ 2022-05-10 16:19 UTC (permalink / raw)
To: qemu-devel
Cc: eblake, dgilbert, armbru, kraxel, thuth, prerna.saxena,
soham.ghosh, prachatos.mitra, berrange, philippe.mathieu.daude,
peter.maydell, pbonzini, Kshitij Suri
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: 9a0a119a382867dc9a5c2ae9348003bf79d84af2
Signed-off-by: Kshitij Suri <kshitij.suri@nutanix.com>
---
ui/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ui/meson.build b/ui/meson.build
index eba93b41e3..df65dbd0e0 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -40,11 +40,15 @@ 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'))
+if png.found()
+ softmmu_ss.add(png)
+endif
+
ui_modules = {}
if curses.found()
--
2.22.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1] Make png parameter to ui/meson.build independent of vnc
2022-05-10 16:19 [PATCH v1] Make png parameter to ui/meson.build independent of vnc Kshitij Suri
@ 2022-05-11 7:46 ` Paolo Bonzini
2022-05-11 8:21 ` Kshitij Suri
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Bonzini @ 2022-05-11 7:46 UTC (permalink / raw)
To: Kshitij Suri
Cc: qemu-devel, eblake, dgilbert, armbru, kraxel, thuth,
prerna.saxena, soham.ghosh, prachatos.mitra, berrange,
philippe.mathieu.daude, peter.maydell, pbonzini
> +if png.found()
> + softmmu_ss.add(png)
> +endif
Queued, thanks. However, this can be just "softmmu_ss.add(png) without
the if, so I adjusted that.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1] Make png parameter to ui/meson.build independent of vnc
2022-05-11 7:46 ` Paolo Bonzini
@ 2022-05-11 8:21 ` Kshitij Suri
0 siblings, 0 replies; 3+ messages in thread
From: Kshitij Suri @ 2022-05-11 8:21 UTC (permalink / raw)
To: Paolo Bonzini
Cc: qemu-devel, eblake, dgilbert, armbru, kraxel, thuth,
prerna.saxena, soham.ghosh, prachatos.mitra, berrange,
philippe.mathieu.daude, peter.maydell
Thank you! Grateful for it.
Regards,
Kshitij Suri
On 11/05/22 1:16 pm, Paolo Bonzini wrote:
>> +if png.found()
>> + softmmu_ss.add(png)
>> +endif
> Queued, thanks. However, this can be just "softmmu_ss.add(png) without
> the if, so I adjusted that.
>
> Paolo
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-11 8:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-10 16:19 [PATCH v1] Make png parameter to ui/meson.build independent of vnc Kshitij Suri
2022-05-11 7:46 ` Paolo Bonzini
2022-05-11 8:21 ` Kshitij Suri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).