[eog-plugins] build: Let plugins handle extra dependencies themselves



commit cd3b93a9c9ee00a50f76dd00aa84f3ebc89d28c6
Author: Felix Riemann <friemann gnome org>
Date:   Wed Feb 2 22:23:33 2022 +0100

    build: Let plugins handle extra dependencies themselves
    
    This way these dependencies get en-/disabled together with the plugins
    that need them. Meson caches a dependency on the first use.

 meson.build                      | 1 -
 plugins/exif-display/meson.build | 2 +-
 plugins/map/meson.build          | 2 +-
 plugins/postasa/meson.build      | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index ac9ff2d..e801e44 100644
--- a/meson.build
+++ b/meson.build
@@ -105,7 +105,6 @@ if 'python' in extra_languages
 endif
 
 subdir('po')
-libexif_dep = dependency('libexif', version: '>= 0.6.16', required: false)
 subdir('plugins')
 
 configure_file(
diff --git a/plugins/exif-display/meson.build b/plugins/exif-display/meson.build
index cf36536..86487dd 100644
--- a/plugins/exif-display/meson.build
+++ b/plugins/exif-display/meson.build
@@ -12,9 +12,9 @@ exifdisplay_sources += [ exifdisplay_res.get(0) ]
 
 exifdisplay_deps = [
   eog_dep,
-  libexif_dep,
   libpeas_dep,
   libpeasgtk_dep,
+  dependency('libexif', version: '>= 0.6.16'),
 ]
 
 exifdisplay_sha = shared_module(
diff --git a/plugins/map/meson.build b/plugins/map/meson.build
index eafedce..3c528fd 100644
--- a/plugins/map/meson.build
+++ b/plugins/map/meson.build
@@ -4,13 +4,13 @@ map_sources = files(
 
 map_deps = [
   eog_dep,
-  libexif_dep,
   libpeas_dep,
   libpeasgtk_dep,
   dependency('champlain-0.12', version: '>= 0.9.0'),
   dependency('champlain-gtk-0.12', version: '>= 0.9.0'),
   dependency('clutter-1.0', version: '>= 1.9.4'),
   dependency('clutter-gtk-1.0', version: '>= 1.1.2'),
+  dependency('libexif', version: '>= 0.6.16'),
 ]
 
 map_plugin = shared_module(
diff --git a/plugins/postasa/meson.build b/plugins/postasa/meson.build
index 1481dd3..e15314a 100644
--- a/plugins/postasa/meson.build
+++ b/plugins/postasa/meson.build
@@ -12,7 +12,6 @@ libgdata_dep = dependency('libgdata', version: '>= 0.6.0')
 
 postasa_deps = [
   eog_dep,
-  libexif_dep,
   libpeas_dep,
   libpeasgtk_dep,
   libgdata_dep,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]