From bd3d6c838c699b876fd8c19b408c475eb47e17b6 Mon Sep 17 00:00:00 2001 From: Artem Senichev Date: Sun, 2 Jul 2023 09:49:06 +0300 Subject: [PATCH] webp: Fix link error Resolves error 'undefined reference to symbol 'WebPGetFeaturesInternal'` during build with latest libwebp version. Signed-off-by: Artem Senichev --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index de81935..84cc0a5 100644 --- a/meson.build +++ b/meson.build @@ -49,7 +49,8 @@ jpeg = dependency('libjpeg', required: get_option('jpeg')) png = dependency('libpng', required: get_option('png')) rsvg = dependency('librsvg-2.0', version: '>=2.46', required: get_option('svg')) tiff = dependency('libtiff-4', required: get_option('tiff')) -webp = dependency('libwebpdemux', required: get_option('webp')) +webp = dependency('libwebp', required: get_option('webp')) +webp_demux = dependency('libwebpdemux', required: get_option('webp')) # optional dependencies: other features exif = dependency('libexif', required: get_option('exif')) bash = dependency('bash-completion', required: get_option('bash')) @@ -72,7 +73,7 @@ conf.set('HAVE_LIBJXL', jxl.found()) conf.set('HAVE_LIBPNG', png.found()) conf.set('HAVE_LIBRSVG', rsvg.found()) conf.set('HAVE_LIBTIFF', tiff.found()) -conf.set('HAVE_LIBWEBP', webp.found()) +conf.set('HAVE_LIBWEBP', webp.found() and webp_demux.found()) conf.set('HAVE_LIBEXIF', exif.found()) conf.set_quoted('APP_NAME', meson.project_name()) conf.set_quoted('APP_VERSION', version) @@ -185,7 +186,7 @@ endif if tiff.found() sources += 'src/formats/tiff.c' endif -if webp.found() +if webp.found() and webp_demux.found() sources += 'src/formats/webp.c' endif @@ -212,7 +213,7 @@ executable( png, rsvg, tiff, - webp, + webp, webp_demux, ], install: true )