diff options
| author | Kshitij Suri <kshitij.suri@nutanix.com> | 2022-04-08 07:13:34 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2022-04-27 07:50:28 +0200 |
| commit | 95f8510ef428f988897176b9585b8ba1432f939f (patch) | |
| tree | 723f3f0f65551ec67f61ef84c66d28fccf307f67 /ui/vnc.c | |
| parent | 67ae04273736f103b31fb5d1f9e5170dfee3d64c (diff) | |
| download | qemu-95f8510ef428f988897176b9585b8ba1432f939f.zip qemu-95f8510ef428f988897176b9585b8ba1432f939f.tar.gz qemu-95f8510ef428f988897176b9585b8ba1432f939f.tar.bz2 | |
Replacing CONFIG_VNC_PNG with CONFIG_PNG
Libpng is only detected if VNC is enabled currently. This patch adds a
generalised png option in the meson build which is aimed to replace use of
CONFIG_VNC_PNG with CONFIG_PNG.
Signed-off-by: Kshitij Suri <kshitij.suri@nutanix.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220408071336.99839-2-kshitij.suri@nutanix.com>
[ kraxel: add meson-buildoptions.sh updates ]
[ kraxel: fix centos8 testcase ]
[ kraxel: update --enable-vnc-png too ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
--enable-vnc-png fixup
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/vnc.c')
| -rw-r--r-- | ui/vnc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2165,7 +2165,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vs->features |= VNC_FEATURE_TIGHT_MASK; vs->vnc_encoding = enc; break; -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG case VNC_ENCODING_TIGHT_PNG: vs->features |= VNC_FEATURE_TIGHT_PNG_MASK; vs->vnc_encoding = enc; @@ -3256,7 +3256,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc, #ifdef CONFIG_VNC_JPEG buffer_init(&vs->tight->jpeg, "vnc-tight-jpeg/%p", sioc); #endif -#ifdef CONFIG_VNC_PNG +#ifdef CONFIG_PNG buffer_init(&vs->tight->png, "vnc-tight-png/%p", sioc); #endif buffer_init(&vs->zlib.zlib, "vnc-zlib/%p", sioc); |