[PATCH v1] Make png parameter to ui/meson.build independent of vnc

Kshitij Suri posted 1 patch 1 year, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220510161932.228481-1-kshitij.suri@nutanix.com
Maintainers: Gerd Hoffmann <kraxel@redhat.com>
ui/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
[PATCH v1] Make png parameter to ui/meson.build independent of vnc
Posted by Kshitij Suri 1 year, 11 months ago
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
Re: [PATCH v1] Make png parameter to ui/meson.build independent of vnc
Posted by Paolo Bonzini 1 year, 11 months ago
> +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
Re: [PATCH v1] Make png parameter to ui/meson.build independent of vnc
Posted by Kshitij Suri 1 year, 11 months ago
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
>