[shotwell/wip/phako/heif: 2/2] Make some image formats configurable
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/phako/heif: 2/2] Make some image formats configurable
- Date: Sat, 25 May 2019 18:22:10 +0000 (UTC)
commit 6e730a88e059f6eeb83a51dd94feaa0d086a6b39
Author: Jens Georg <mail jensge org>
Date: Sat May 25 20:05:47 2019 +0200
Make some image formats configurable
meson.build | 11 ++++++++++-
meson_options.txt | 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 8143fbe3..8b93a2ea 100644
--- a/meson.build
+++ b/meson.build
@@ -72,7 +72,6 @@ clutter_gtk = dependency('clutter-gtk-1.0')
webpdemux = dependency('libwebpdemux')
webp = dependency('libwebp')
-heif = dependency('libheif')
unity_available = false
if unity.found() and get_option('unity-support')
@@ -80,6 +79,16 @@ if unity.found() and get_option('unity-support')
add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
endif
+foreach image_format: get_option('additional_image_formats')
+ if image_format == 'heif'
+ heif = dependency('libheif')
+ endif
+ add_global_arguments(
+ ['--define=HAVE_@0@'.format(image_format.to_upper())],
+ language : 'vala'
+ )
+endforeach
+
foreach publisher : get_option('publishers').split(',')
add_global_arguments(['--define=HAVE_@0@'.format(publisher.to_upper())],
language : 'vala')
diff --git a/meson_options.txt b/meson_options.txt
index fe15ee75..086cc13d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,3 +10,4 @@ option('face-detection', type:'boolean', value:false, description: 'Enable face
option('face-detection-helper', type : 'boolean', value : 'true', description : 'If face-detection is
enabled, build the external helper tool')
option('face_detection_helper_bus', type:'combo', choices: ['private', 'session'], value : 'session',
description: 'Which DBus bus to use for external helper tool')
option('fatal_warnings', type:'boolean', value:false)
+option('additional_image_formats', type: 'array', choices : ['heif'], value: ['heif'])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]