On 28/2/22 06:22, Kshitij Suri wrote:
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.s...@nutanix.com>
---
meson.build | 10 +++++-----
meson_options.txt | 4 ++--
ui/vnc-enc-tight.c | 18 +++++++++---------
ui/vnc.c | 4 ++--
ui/vnc.h | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meson.build b/meson.build
index 8df40bfac4..3638957fc5 100644
--- a/meson.build
+++ b/meson.build
@@ -1112,14 +1112,14 @@ if gtkx11.found()
x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found(),
kwargs: static_kwargs)
endif
-vnc = not_found
png = not_found
^ dead code, otherwise:
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
+png = dependency('libpng', required: get_option('png'),
+ method: 'pkg-config', kwargs: static_kwargs)
+vnc = not_found
