[gimp] meson: do not show "profile support: yes" when HEIC support is OFF.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] meson: do not show "profile support: yes" when HEIC support is OFF.
- Date: Thu, 22 Oct 2020 09:58:57 +0000 (UTC)
commit e736b5fa0c1b1a7e880adb6b79fd9d1591029041
Author: Jehan <jehan girinstud io>
Date: Thu Oct 22 11:54:51 2020 +0200
meson: do not show "profile support: yes" when HEIC support is OFF.
Note that profile support also affect AVIF but since AVIF support came
anyway after libheif 1.4.0 (which is when color profile support
appeared), there is no way to differentiate there.
Thanks to Darix for noting the miss.
See: https://gitlab.gnome.org/GNOME/gimp/-/issues/5787#note_938976
meson.build | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/meson.build b/meson.build
index 21cffaf761..173918fa15 100644
--- a/meson.build
+++ b/meson.build
@@ -728,33 +728,33 @@ libheif = dependency('libheif', version: '>='+libheif_minver,
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'))
-can_import_heic = 'no'
-can_export_heic = 'no'
-can_import_avif = 'no'
-can_export_avif = 'no'
+can_import_heic = false
+can_export_heic = false
+can_import_avif = false
+can_export_avif = false
have_heif = libheif.found()
libheif_warning=''
if have_heif
have_heif = true
- can_import_heic = libheif.get_pkgconfig_variable('builtin_h265_decoder')
- can_export_heic = libheif.get_pkgconfig_variable('builtin_h265_encoder')
- if can_import_heic == 'yes'
+ can_import_heic = (libheif.get_pkgconfig_variable('builtin_h265_decoder') == 'yes')
+ can_export_heic = (libheif.get_pkgconfig_variable('builtin_h265_encoder') == 'yes')
+ if can_import_heic
MIMEtypes += [
'image/heif',
'image/heic',
]
endif
- can_import_avif = libheif.get_pkgconfig_variable('builtin_avif_decoder')
- can_export_avif = libheif.get_pkgconfig_variable('builtin_avif_encoder')
- if can_import_avif == 'yes'
+ can_import_avif = (libheif.get_pkgconfig_variable('builtin_avif_decoder') == 'yes')
+ can_export_avif = (libheif.get_pkgconfig_variable('builtin_avif_encoder') == 'yes')
+ if can_import_avif
MIMEtypes += [
'image/avif'
]
endif
- if can_import_heic != 'yes' and can_import_avif != 'yes'
+ if not can_import_heic and not can_import_avif
have_heif = false
endif
@@ -1777,6 +1777,7 @@ final_message = [
''' WebP: @0@'''.format(webp_found),
''' HEIC: import: @0@ - export: @1@ [profile support: @2@]@3@'''
.format(can_import_heic, can_export_heic,
+ (can_import_heic or can_export_heic) and
libheif.version().version_compare('>=1.4.0'),
libheif_warning != '' ? ' (see warning below)' : ''),
''' AVIF: import: @0@ - export: @1@'''
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]