All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kshitij Suri <kshitij.suri@nutanix.com>
To: qemu-devel@nongnu.org
Cc: eblake@redhat.com, dgilbert@redhat.com, armbru@redhat.com,
	kraxel@redhat.com, thuth@redhat.com, prerna.saxena@nutanix.com,
	soham.ghosh@nutanix.com, prachatos.mitra@nutanix.com,
	berrange@redhat.com, philippe.mathieu.daude@gmail.com,
	peter.maydell@linaro.org, pbonzini@redhat.com,
	Kshitij Suri <kshitij.suri@nutanix.com>
Subject: [PATCH v1] Make png parameter to ui/meson.build independent of vnc
Date: Tue, 10 May 2022 16:19:32 +0000	[thread overview]
Message-ID: <20220510161932.228481-1-kshitij.suri@nutanix.com> (raw)

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



             reply	other threads:[~2022-05-10 16:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-10 16:19 Kshitij Suri [this message]
2022-05-11  7:46 ` [PATCH v1] Make png parameter to ui/meson.build independent of vnc Paolo Bonzini
2022-05-11  8:21   ` Kshitij Suri

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220510161932.228481-1-kshitij.suri@nutanix.com \
    --to=kshitij.suri@nutanix.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philippe.mathieu.daude@gmail.com \
    --cc=prachatos.mitra@nutanix.com \
    --cc=prerna.saxena@nutanix.com \
    --cc=qemu-devel@nongnu.org \
    --cc=soham.ghosh@nutanix.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.