From 95f8510ef428f988897176b9585b8ba1432f939f Mon Sep 17 00:00:00 2001 From: Kshitij Suri Date: Fri, 8 Apr 2022 07:13:34 +0000 Subject: 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 Reviewed-by: Daniel P. Berrangé 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 --enable-vnc-png fixup Signed-off-by: Gerd Hoffmann --- scripts/ci/org.centos/stream/8/x86_64/configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/ci') diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index 9850dd4444..08225ee514 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -142,7 +142,7 @@ --disable-virtiofsd \ --disable-vnc \ --disable-vnc-jpeg \ ---disable-vnc-png \ +--disable-png \ --disable-vnc-sasl \ --disable-vte \ --disable-vvfat \ @@ -200,7 +200,7 @@ --enable-vhost-vdpa \ --enable-vhost-vsock \ --enable-vnc \ ---enable-vnc-png \ +--enable-png \ --enable-vnc-sasl \ --enable-werror \ --enable-xkbcommon -- cgit v1.2.3-55-g7522