[nautilus: 1/2] general: Remove exempi and exempi-xmp



commit 23eacd31559ffecf688a4ccbde2c4440832d4349
Author: Carlos Soriano <csoriano gnome org>
Date:   Mon Nov 20 14:51:42 2017 +0100

    general: Remove exempi and exempi-xmp
    
    Since now we use gexiv2 these are not longer necessary.

 meson.build         | 6 ------
 meson_options.txt   | 8 --------
 src/meson.build     | 8 --------
 src/nautilus-main.c | 4 ----
 4 files changed, 26 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0e531e922..fe252a2c0 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,6 @@ gnome_desktop_ver = '>=3.0.0'
 pango_ver = '1.28.3'
 gtk_ver = '>=3.22.6'
 xml_ver = '>=2.7.8'
-exempi_ver = '>=2.1.0'
 notify_ver = '0.7.0'
 schemas_ver = '>=3.8.0'
 autoar_ver = '>=0.2.1'
@@ -82,11 +81,6 @@ if not tracker_sparql.found()
   tracker_sparql = dependency ('tracker-sparql-1.0')
 endif
 
-if get_option ('enable-xmp')
-    exempi = dependency ('exempi-2.0', version: exempi_ver)
-    conf.set10 ('HAVE_EXEMPI', true)
-endif
-
 configure_file (input: 'config.h.meson',
                 output: 'config.h',
                 configuration: conf)
diff --git a/meson_options.txt b/meson_options.txt
index c934dd8b1..783061463 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,14 +4,6 @@ option ('enable-profiling',
 option ('enable-nst-extension',
         type: 'boolean',
         value: true)
-option ('enable-exif',
-        type: 'boolean',
-        value: false,
-        description: 'enable EXIF support')
-option ('enable-xmp',
-        type: 'boolean',
-        value: false,
-        description: 'enable XMP support')
 option ('enable-selinux',
         type: 'boolean',
         value: true)
diff --git a/src/meson.build b/src/meson.build
index ac20704bd..aca423ac7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -281,18 +281,10 @@ nautilus_deps = [glib,
                  tracker_sparql,
                  gexiv2]
 
-if get_option ('enable-exif')
-    nautilus_deps += exif
-endif
-
 if get_option ('enable-selinux')
     nautilus_deps += selinux
 endif
 
-if get_option ('enable-xmp')
-    nautilus_deps += exempi
-endif
-
 libnautilus = static_library ('nautilus',
                               libnautilus_sources,
                               dependencies: nautilus_deps,
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 1471e86cd..c1fff44de 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -49,10 +49,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef HAVE_EXEMPI
-#include <exempi/xmp.h>
-#endif
-
 int
 main (int   argc,
       char *argv[])


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