Merge branch 'feature/upstream' into develop

1 files changed, 4 insertions, 1 deletions

diff --git a/meson.build b/meson.build
index f75ad49..1f9cd42 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('shotwell', ['vala', 'c'],
-        version : '0.30.1',
+        version : '0.30.4',
         meson_version : '>= 0.43.0',
         default_options : ['buildtype=debugoptimized'])
 
@@ -53,6 +53,9 @@ gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.0')
 gphoto2 = dependency('libgphoto2', version : '>= 2.5.0')
 gudev = dependency('gudev-1.0', version : '>= 145', required: false)
 gexiv2 = dependency('gexiv2', version: '>= 0.10.4')
+if gexiv2.version().version_compare('>= 0.11')
+  add_global_arguments(['--define=NEW_GEXIV2_API'], language : 'vala')
+endif
 libraw = dependency('libraw', version : '>= 0.13.2')
 libexif = dependency('libexif', version : '>= 0.6.16')
 unity = dependency('unity', required : false)