mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replacing CONFIG_VNC_PNG with CONFIG_PNG

Browse Source 
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>
This commit is contained in:
Kshitij Suri 2022-04-08 07:13:34 +00:00 committed by Gerd Hoffmann
parent 67ae042737
commit 95f8510ef4
8 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -1115,14 +1115,16 @@ if gtkx11.found()
x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found(), x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found(),
kwargs: static_kwargs) kwargs: static_kwargs)
endif endif
vnc = not_found
png = not_found png = not_found
if get_option('png').allowed() and have_system
png = dependency('libpng', required: get_option('png'),
method: 'pkg-config', kwargs: static_kwargs)
endif
vnc = not_found
jpeg = not_found jpeg = not_found
sasl = not_found sasl = not_found
if get_option('vnc').allowed() and have_system if get_option('vnc').allowed() and have_system
vnc = declare_dependency() # dummy dependency vnc = declare_dependency() # dummy dependency
png = dependency('libpng', required: get_option('vnc_png'),
method: 'pkg-config', kwargs: static_kwargs)
jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'), jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'),
method: 'pkg-config', kwargs: static_kwargs) method: 'pkg-config', kwargs: static_kwargs)
sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'],
@ -1554,9 +1556,9 @@ config_host_data.set('CONFIG_TPM', have_tpm)
config_host_data.set('CONFIG_USB_LIBUSB', libusb.found()) config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
config_host_data.set('CONFIG_VDE', vde.found()) config_host_data.set('CONFIG_VDE', vde.found())
config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server) config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server)
config_host_data.set('CONFIG_PNG', png.found())
config_host_data.set('CONFIG_VNC', vnc.found()) config_host_data.set('CONFIG_VNC', vnc.found())
config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
config_host_data.set('CONFIG_VNC_PNG', png.found())
config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found())
config_host_data.set('CONFIG_VIRTFS', have_virtfs) config_host_data.set('CONFIG_VIRTFS', have_virtfs)
config_host_data.set('CONFIG_VTE', vte.found()) config_host_data.set('CONFIG_VTE', vte.found())
@ -3667,11 +3669,11 @@ summary_info += {'curses support': curses}
summary_info += {'virgl support': virgl} summary_info += {'virgl support': virgl}
summary_info += {'curl support': curl} summary_info += {'curl support': curl}
summary_info += {'Multipath support': mpathpersist} summary_info += {'Multipath support': mpathpersist}
summary_info += {'PNG support': png}
summary_info += {'VNC support': vnc} summary_info += {'VNC support': vnc}
if vnc.found() if vnc.found()
summary_info += {'VNC SASL support': sasl} summary_info += {'VNC SASL support': sasl}
summary_info += {'VNC JPEG support': jpeg} summary_info += {'VNC JPEG support': jpeg}
summary_info += {'VNC PNG support': png}
endif endif
if targetos not in ['darwin', 'haiku', 'windows'] if targetos not in ['darwin', 'haiku', 'windows']
summary_info += {'OSS support': oss} summary_info += {'OSS support': oss}

4
meson_options.txt
View File

@ -177,12 +177,12 @@ option('vde', type : 'feature', value : 'auto',
description: 'vde network backend support') description: 'vde network backend support')
option('virglrenderer', type : 'feature', value : 'auto', option('virglrenderer', type : 'feature', value : 'auto',
description: 'virgl rendering support') description: 'virgl rendering support')
option('png', type : 'feature', value : 'auto',
description: 'PNG support with libpng')
option('vnc', type : 'feature', value : 'auto', option('vnc', type : 'feature', value : 'auto',
description: 'VNC server') description: 'VNC server')
option('vnc_jpeg', type : 'feature', value : 'auto', option('vnc_jpeg', type : 'feature', value : 'auto',
description: 'JPEG lossy compression for VNC server') description: 'JPEG lossy compression for VNC server')
option('vnc_png', type : 'feature', value : 'auto',
description: 'PNG compression for VNC server')
option('vnc_sasl', type : 'feature', value : 'auto', option('vnc_sasl', type : 'feature', value : 'auto',
description: 'SASL authentication for VNC server') description: 'SASL authentication for VNC server')
option('vte', type : 'feature', value : 'auto', option('vte', type : 'feature', value : 'auto',

4
scripts/ci/org.centos/stream/8/x86_64/configure vendored
View File

@ -142,7 +142,7 @@
--disable-virtiofsd \ --disable-virtiofsd \
--disable-vnc \ --disable-vnc \
--disable-vnc-jpeg \ --disable-vnc-jpeg \
--disable-vnc-png \ --disable-png \
--disable-vnc-sasl \ --disable-vnc-sasl \
--disable-vte \ --disable-vte \
--disable-vvfat \ --disable-vvfat \
@ -200,7 +200,7 @@
--enable-vhost-vdpa \ --enable-vhost-vdpa \
--enable-vhost-vsock \ --enable-vhost-vsock \
--enable-vnc \ --enable-vnc \
--enable-vnc-png \ --enable-png \
--enable-vnc-sasl \ --enable-vnc-sasl \
--enable-werror \ --enable-werror \
--enable-xkbcommon --enable-xkbcommon

2
scripts/coverity-scan/run-coverity-scan
View File

@ -394,7 +394,7 @@ echo "Configuring..."
--enable-opengl --enable-vte --enable-gnutls \ --enable-opengl --enable-vte --enable-gnutls \
--enable-nettle --enable-curses --enable-curl \ --enable-nettle --enable-curses --enable-curl \
--audio-drv-list=oss,alsa,sdl,pa --enable-virtfs \ --audio-drv-list=oss,alsa,sdl,pa --enable-virtfs \
--enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-vnc-png \ --enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-png \
--enable-xen --enable-brlapi \ --enable-xen --enable-brlapi \
--enable-linux-aio --enable-attr \ --enable-linux-aio --enable-attr \
--enable-cap-ng --enable-trace-backends=log --enable-spice --enable-rbd \ --enable-cap-ng --enable-trace-backends=log --enable-spice --enable-rbd \

6
scripts/meson-buildoptions.sh
View File

@ -94,6 +94,7 @@ meson_options_help() {
printf "%s\n" ' oss OSS sound support' printf "%s\n" ' oss OSS sound support'
printf "%s\n" ' pa PulseAudio sound support' printf "%s\n" ' pa PulseAudio sound support'
printf "%s\n" ' parallels parallels image format support' printf "%s\n" ' parallels parallels image format support'
printf "%s\n" ' png PNG support with libpng'
printf "%s\n" ' qcow1 qcow1 image format support' printf "%s\n" ' qcow1 qcow1 image format support'
printf "%s\n" ' qed qed image format support' printf "%s\n" ' qed qed image format support'
printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)' printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)'
@ -123,7 +124,6 @@ meson_options_help() {
printf "%s\n" ' virtiofsd build virtiofs daemon (virtiofsd)' printf "%s\n" ' virtiofsd build virtiofs daemon (virtiofsd)'
printf "%s\n" ' vnc VNC server' printf "%s\n" ' vnc VNC server'
printf "%s\n" ' vnc-jpeg JPEG lossy compression for VNC server' printf "%s\n" ' vnc-jpeg JPEG lossy compression for VNC server'
printf "%s\n" ' vnc-png PNG compression for VNC server'
printf "%s\n" ' vnc-sasl SASL authentication for VNC server' printf "%s\n" ' vnc-sasl SASL authentication for VNC server'
printf "%s\n" ' vte vte support for the gtk UI' printf "%s\n" ' vte vte support for the gtk UI'
printf "%s\n" ' vvfat vvfat image format support' printf "%s\n" ' vvfat vvfat image format support'
@ -277,6 +277,8 @@ _meson_option_parse() {
--disable-pa) printf "%s" -Dpa=disabled ;; --disable-pa) printf "%s" -Dpa=disabled ;;
--enable-parallels) printf "%s" -Dparallels=enabled ;; --enable-parallels) printf "%s" -Dparallels=enabled ;;
--disable-parallels) printf "%s" -Dparallels=disabled ;; --disable-parallels) printf "%s" -Dparallels=disabled ;;
--enable-png) printf "%s" -Dpng=enabled ;;
--disable-png) printf "%s" -Dpng=disabled ;;
--enable-profiler) printf "%s" -Dprofiler=true ;; --enable-profiler) printf "%s" -Dprofiler=true ;;
--disable-profiler) printf "%s" -Dprofiler=false ;; --disable-profiler) printf "%s" -Dprofiler=false ;;
--enable-qcow1) printf "%s" -Dqcow1=enabled ;; --enable-qcow1) printf "%s" -Dqcow1=enabled ;;
@ -347,8 +349,6 @@ _meson_option_parse() {
--disable-vnc) printf "%s" -Dvnc=disabled ;; --disable-vnc) printf "%s" -Dvnc=disabled ;;
--enable-vnc-jpeg) printf "%s" -Dvnc_jpeg=enabled ;; --enable-vnc-jpeg) printf "%s" -Dvnc_jpeg=enabled ;;
--disable-vnc-jpeg) printf "%s" -Dvnc_jpeg=disabled ;; --disable-vnc-jpeg) printf "%s" -Dvnc_jpeg=disabled ;;
--enable-vnc-png) printf "%s" -Dvnc_png=enabled ;;
--disable-vnc-png) printf "%s" -Dvnc_png=disabled ;;
--enable-vnc-sasl) printf "%s" -Dvnc_sasl=enabled ;; --enable-vnc-sasl) printf "%s" -Dvnc_sasl=enabled ;;
--disable-vnc-sasl) printf "%s" -Dvnc_sasl=disabled ;; --disable-vnc-sasl) printf "%s" -Dvnc_sasl=disabled ;;
--enable-vte) printf "%s" -Dvte=enabled ;; --enable-vte) printf "%s" -Dvte=enabled ;;

18
ui/vnc-enc-tight.c
View File

@ -32,7 +32,7 @@
INT32 definitions between jmorecfg.h (included by jpeglib.h) and INT32 definitions between jmorecfg.h (included by jpeglib.h) and
Win32 basetsd.h (included by windows.h). */ Win32 basetsd.h (included by windows.h). */
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
/* The following define is needed by pngconf.h. Otherwise it won't compile, /* The following define is needed by pngconf.h. Otherwise it won't compile,
because setjmp.h was already included by osdep.h. */ because setjmp.h was already included by osdep.h. */
#define PNG_SKIP_SETJMP_CHECK #define PNG_SKIP_SETJMP_CHECK
@ -95,7 +95,7 @@ static const struct {
}; };
#endif #endif
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
static const struct { static const struct {
int png_zlib_level, png_filters; int png_zlib_level, png_filters;
} tight_png_conf[] = { } tight_png_conf[] = {
@ -919,7 +919,7 @@ static int send_full_color_rect(VncState *vs, int x, int y, int w, int h)
int stream = 0; int stream = 0;
ssize_t bytes; ssize_t bytes;
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
if (tight_can_send_png_rect(vs, w, h)) { if (tight_can_send_png_rect(vs, w, h)) {
return send_png_rect(vs, x, y, w, h, NULL); return send_png_rect(vs, x, y, w, h, NULL);
} }
@ -966,7 +966,7 @@ static int send_mono_rect(VncState *vs, int x, int y,
int stream = 1; int stream = 1;
int level = tight_conf[vs->tight->compression].mono_zlib_level; int level = tight_conf[vs->tight->compression].mono_zlib_level;
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
if (tight_can_send_png_rect(vs, w, h)) { if (tight_can_send_png_rect(vs, w, h)) {
int ret; int ret;
int bpp = vs->client_pf.bytes_per_pixel * 8; int bpp = vs->client_pf.bytes_per_pixel * 8;
@ -1020,7 +1020,7 @@ static int send_mono_rect(VncState *vs, int x, int y,
struct palette_cb_priv { struct palette_cb_priv {
VncState *vs; VncState *vs;
uint8_t *header; uint8_t *header;
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
png_colorp png_palette; png_colorp png_palette;
#endif #endif
}; };
@ -1082,7 +1082,7 @@ static int send_palette_rect(VncState *vs, int x, int y,
int colors; int colors;
ssize_t bytes; ssize_t bytes;
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
if (tight_can_send_png_rect(vs, w, h)) { if (tight_can_send_png_rect(vs, w, h)) {
return send_png_rect(vs, x, y, w, h, palette); return send_png_rect(vs, x, y, w, h, palette);
} }
@ -1233,7 +1233,7 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality)
/* /*
* PNG compression stuff. * PNG compression stuff.
*/ */
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
static void write_png_palette(int idx, uint32_t pix, void *opaque) static void write_png_palette(int idx, uint32_t pix, void *opaque)
{ {
struct palette_cb_priv *priv = opaque; struct palette_cb_priv *priv = opaque;
@ -1379,7 +1379,7 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h,
buffer_reset(&vs->tight->png); buffer_reset(&vs->tight->png);
return 1; return 1;
} }
#endif /* CONFIG_VNC_PNG */ #endif /* CONFIG_PNG */
static void vnc_tight_start(VncState *vs) static void vnc_tight_start(VncState *vs)
{ {
@ -1706,7 +1706,7 @@ void vnc_tight_clear(VncState *vs)
#ifdef CONFIG_VNC_JPEG #ifdef CONFIG_VNC_JPEG
buffer_free(&vs->tight->jpeg); buffer_free(&vs->tight->jpeg);
#endif #endif
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
buffer_free(&vs->tight->png); buffer_free(&vs->tight->png);
#endif #endif
} }

4
ui/vnc.c
View File

@ -2165,7 +2165,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
vs->features |= VNC_FEATURE_TIGHT_MASK; vs->features |= VNC_FEATURE_TIGHT_MASK;
vs->vnc_encoding = enc; vs->vnc_encoding = enc;
break; break;
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
case VNC_ENCODING_TIGHT_PNG: case VNC_ENCODING_TIGHT_PNG:
vs->features |= VNC_FEATURE_TIGHT_PNG_MASK; vs->features |= VNC_FEATURE_TIGHT_PNG_MASK;
vs->vnc_encoding = enc; vs->vnc_encoding = enc;
@ -3256,7 +3256,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,
#ifdef CONFIG_VNC_JPEG #ifdef CONFIG_VNC_JPEG
buffer_init(&vs->tight->jpeg, "vnc-tight-jpeg/%p", sioc); buffer_init(&vs->tight->jpeg, "vnc-tight-jpeg/%p", sioc);
#endif #endif
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
buffer_init(&vs->tight->png, "vnc-tight-png/%p", sioc); buffer_init(&vs->tight->png, "vnc-tight-png/%p", sioc);
#endif #endif
buffer_init(&vs->zlib.zlib, "vnc-zlib/%p", sioc); buffer_init(&vs->zlib.zlib, "vnc-zlib/%p", sioc);

2
ui/vnc.h
View File

@ -201,7 +201,7 @@ typedef struct VncTight {
#ifdef CONFIG_VNC_JPEG #ifdef CONFIG_VNC_JPEG
Buffer jpeg; Buffer jpeg;
#endif #endif
#ifdef CONFIG_VNC_PNG #ifdef CONFIG_PNG
Buffer png; Buffer png;
#endif #endif
int levels[4]; int levels[4];