[tracker] meson: Remove options that are only relevant to tracker-miners



commit 3626e92e55d995f28dda92c6c80a1684222bc9f4
Author: Sam Thursfield <sam thursfield codethink co uk>
Date:   Tue Oct 31 14:12:24 2017 +0000

    meson: Remove options that are only relevant to tracker-miners
    
    The tracker-miners now live in a separate repo.

 config.h.meson.in |    6 ------
 meson.build       |   38 --------------------------------------
 meson_options.txt |   29 -----------------------------
 3 files changed, 0 insertions(+), 73 deletions(-)
---
diff --git a/config.h.meson.in b/config.h.meson.in
index 25d2920..35d8d3b 100644
--- a/config.h.meson.in
+++ b/config.h.meson.in
@@ -36,9 +36,6 @@
 /* Defined if Sqlite has FTS5 compiled in */
 #mesondefine HAVE_BUILTIN_FTS
 
-/* Enca language detection aid */
-#mesondefine HAVE_ENCA
-
 /* Define if we have exempi */
 #mesondefine HAVE_EXEMPI
 
@@ -63,9 +60,6 @@
 /* libicu Unicode support library */
 #mesondefine HAVE_LIBICU
 
-/* ICU language detection aid */
-#mesondefine HAVE_LIBICU_CHARSET_DETECTION
-
 /* Define if we have libiptcdata */
 #mesondefine HAVE_LIBIPTCDATA
 
diff --git a/meson.build b/meson.build
index 976fa15..6f27176 100644
--- a/meson.build
+++ b/meson.build
@@ -129,40 +129,6 @@ if unicode_library_name == ''
   endif
 endif
 
-##########################################################################
-# Check for tracker-extract: icu or enca for detecting Cyrillic in MP3s
-#
-# By default, AUTO with this order of preference:
-#  1)  icu
-#  2)  enca
-##########################################################################
-
-charset_library_name = 'none'
-
-if have_libicu
-  if get_option('charset_detection') == 'auto' or get_option('charset_detection') == 'icu'
-    charset_library = declare_dependency(
-       dependencies: [icu_uc, icu_i18n]
-    )
-    charset_library_name = 'icu'
-  endif
-else
-  if get_option('charset_detection') == 'icu'
-    error('libicu requested for character set detection, but it was not found')
-  endif
-endif
-
-if charset_library_name == 'none' and get_option('charset_library') != 'none'
-  enca = dependency('enca', version: '>= 1.9', required: false)
-
-  if enca.found()
-    charset_library = enca
-    charset_library_name = 'enca'
-  elif get_option('enca') == 'yes'
-    error('enca support explicitly requested, but enca couldn\'t be found')
-  endif
-endif
-
 ####################################################################
 # D-Bus service files
 ####################################################################
@@ -227,9 +193,7 @@ conf.set('DISABLE_JOURNAL', get_option('journal') == false)
 conf.set10('HAVE_TRACKER_FTS', enable_fts)
 
 conf.set('HAVE_BUILTIN_FTS', sqlite3_has_builtin_fts5)
-conf.set('HAVE_ENCA', charset_library_name == 'enca')
 conf.set10('HAVE_LIBICU', unicode_library_name == 'icu')
-conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
 conf.set('HAVE_LIBSTEMMER', have_libstemmer)
 conf.set('HAVE_LIBUNISTRING', unicode_library_name == 'unistring')
 conf.set('HAVE_NETWORK_MANAGER', network_manager.found())
@@ -343,8 +307,6 @@ summary = [
      get_option('fts'), sqlite3_has_builtin_fts5),
   '    Build with Stemming support:            ' + have_libstemmer.to_string(),
   '    Bash completion support:                ' + bash_completion_dir,
-  '\nFrameworks / Options:',
-  '    Support Guaranteed Metadata             ' + get_option('guarantee_metadata').to_string(),
 ]
 
 message('\n'.join(summary))
diff --git a/meson_options.txt b/meson_options.txt
index 55cc2e5..496d356 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,41 +1,12 @@
 option('docs', type: 'boolean', value: true,
        description: 'Enable the documentation')
-option('extract', type: 'boolean', value: true,
-       description: 'Enable the Tracker metadata extractor')
 option('fts', type: 'boolean', value: true,
        description: 'Enable the Tracker full-text search feature')
 option('functional_tests', type: 'boolean', value: true,
        description: 'Enable the Tracker functional test suite')
-option('guarantee_metadata', type: 'boolean', value: true,
-       description: 'Set nie:title and nie:contentCreated from filename and mtime if no metadata available')
 option('journal', type: 'boolean', value: true,
        description: 'Enable database journal backup mechanism')
-option('writeback', type: 'boolean', value: true,
-       description: 'Enable Tracker writeback feature')
 
-option('abiword', type: 'boolean', value: 'true',
-       description: 'Enable extractor for AbiWord files')
-option('dvi', type: 'boolean', value: 'true',
-       description: 'Enable extractor for DVI metadata')
-option('icon', type: 'boolean', value: 'true',
-       description: 'Enable extractor for ICO metadata')
-option('mp3', type: 'boolean', value: 'true',
-       description: 'Enable extractor for MP3 metadata')
-option('ps', type: 'boolean', value: 'true',
-       description: 'Enable extractor for PS metadata')
-option('text', type: 'boolean', value: 'true',
-       description: 'Enable extractor for TXT metadata')
-option('unzip_ps_gz_files', type: 'boolean', value: 'true',
-       description: 'Enable extractor for PS.GZ metadata')
-
-option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto',
-       description: 'Enable upower or HAL for battery/mains power detection')
-option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto',
-       description: 'Enable enca or libicu for charset detection in MP3s')
-option('generic_media_extractor', type: 'combo', choices: ['auto', 'gstreamer', 'libav', 'none'], value: 
'auto',
-       description: 'Enables one of the (gstreamer, libav, auto) generic media extractor backends')
-option('gstreamer_backend', type: 'combo', choices: ['discoverer', 'gupnp'], value: 'discoverer',
-       description: 'When GStreamer is used, this enables one of the (discoverer, gupnp) GStreamer backends')
 option('stemmer', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'no',
        description: 'Enable stemming words while indexing')
 option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto',


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