From de91d84906044c79abe8612334bc09d9a8c66bf8 Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 17 Nov 2020 04:08:15 +0100 Subject: [PATCH] meson: libjpeg and libtiff are not optional dependencies! --- meson.build | 13 ++++--------- meson_options.txt | 2 -- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 2f5c94ad6d..c54532e197 100644 --- a/meson.build +++ b/meson.build @@ -648,17 +648,12 @@ MIMEtypes = [ -libtiff = dependency('libtiff-4', required: get_option('tiff')) -if libtiff.found() - MIMEtypes += 'image/tiff' -endif +libtiff = dependency('libtiff-4') +MIMEtypes += 'image/tiff' -libjpeg = dependency('libjpeg', required: get_option('jpeg')) -conf.set('HAVE_LIBJPEG', libjpeg.found()) -if libjpeg.found() - MIMEtypes += 'image/jpeg' -endif +libjpeg = dependency('libjpeg') +MIMEtypes += 'image/jpeg' zlib = dependency('zlib') diff --git a/meson_options.txt b/meson_options.txt index e6cfe13db5..33bdd1aa6b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -37,13 +37,11 @@ option('cairo-pdf', type: 'feature', value: 'auto', description: 'Cairo- option('ghostscript', type: 'feature', value: 'auto', description: 'Ghostscript support') option('gudev', type: 'feature', value: 'auto', description: 'Gudev support') option('heif', type: 'feature', value: 'auto', description: 'HEIF support') -option('jpeg', type: 'feature', value: 'auto', description: 'Jpeg support') option('jpeg2000', type: 'feature', value: 'auto', description: 'Jpeg-2000 support') option('mng', type: 'feature', value: 'auto', description: 'Mng support') option('openexr', type: 'feature', value: 'auto', description: 'Openexr support') option('png', type: 'feature', value: 'auto', description: 'PNG support') option('print', type: 'boolean', value: true, description: 'Print support') -option('tiff', type: 'feature', value: 'auto', description: 'TIFF support') option('webkit', type: 'feature', value: 'auto', description: 'Help browser and webpage plugins') option('webp', type: 'feature', value: 'auto', description: 'Webp support') option('wmf', type: 'feature', value: 'auto', description: 'Wmf support')