From 59dcd29f1e8106e5a683638b211fec7104c5e7c0 Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 12 Nov 2019 15:56:49 +0100 Subject: [PATCH] meson: fix HAVE_LIBHEIF_1_4_0 macro. It was typoed as HAVE_LIBHEIF_4_1_0 so profile support was never working for HEIF format. Also add warnings and better output, similar to configure script one. --- meson.build | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 85c16d9c46..be3089f9ac 100644 --- a/meson.build +++ b/meson.build @@ -686,7 +686,8 @@ endif libheif = dependency('libheif', version: '>=1.3.2', required: get_option('heif')) -conf.set('HAVE_LIBHEIF_4_1_0', libheif.version().version_compare('>=1.4.0')) +conf.set('HAVE_LIBHEIF_1_4_0', libheif.version().version_compare('>=1.4.0')) +conf.set('HAVE_LIBHEIF_1_6_0', libheif.version().version_compare('>=1.6.0')) if libheif.found() MIMEtypes += [ @@ -695,6 +696,16 @@ if libheif.found() ] endif +if not libheif.version().version_compare('>=1.6.0') and (platform_windows or platform_osx) + libheif_warning=''' + + libheif lower than version 1.6.0 is known to crash when + exporting on Windows and macOS (bug #4185). Please update. + ''' + warning(libheif_warning) + warnings += libheif_warning +endif + webkit = dependency('webkit2gtk-4.0', version: '>=2.20.3', required: get_option('webkit')) conf.set('HAVE_WEBKIT', webkit.found()) @@ -1662,7 +1673,8 @@ final_message = [ ''' MNG: @0@'''.format(libmng.found()), ''' OpenEXR: @0@'''.format(openexr.found()), ''' WebP: @0@'''.format(webp_found), -''' Heif: @0@'''.format(libheif.found()), +''' Heif: @0@ (profile support: @1@)''' + .format(libheif.found(), libheif.version().version_compare('>=1.4.0')), ''' PDF (export): @0@'''.format(cairopdf.found()), ''' Print: @0@'''.format(have_print), ''' Python 3 plug-ins: @0@'''.format(have_python),