[tracker-miners/sam/remove-flac-vorbis-extractors] extract: Remove flac and vorbis extractors

[Sam Thursfield <sthursfield src gnome org>]

commit 3dc417e6ff249649ef294380c160079bee020337
Author: Sam Thursfield <sam afuera me uk>
Date:   Tue Feb 25 14:05:11 2020 +0100

    extract: Remove flac and vorbis extractors
    
    The GStreamer and libav extractors handle these types well, and these
    alternative codepaths were actually unused in most cases.
    
    Closes https://gitlab.gnome.org/GNOME/tracker-miners/issues/50

 meson.build                                  |   4 -
 meson_options.txt                            |   4 -
 src/tracker-extract/10-flac.rule             |   4 -
 src/tracker-extract/10-vorbis.rule           |   4 -
 src/tracker-extract/meson.build              |   8 -
 src/tracker-extract/tracker-extract-flac.c   | 321 --------------------
 src/tracker-extract/tracker-extract-vorbis.c | 426 ---------------------------
 tests/functional-tests/meson.build           |   6 +-
 8 files changed, 2 insertions(+), 775 deletions(-)
---
diff --git a/meson.build b/meson.build
index 4958d506c..280bef254 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,6 @@ avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
 avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
 dbus = dependency('dbus-1', version: '>= 1.3.1')
 exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp'))
-flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac'))
 gexiv2 = dependency('gexiv2', required: get_option('raw'))
 gio = dependency('gio-2.0', version: '>=' + glib_required)
 gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required)
@@ -82,7 +81,6 @@ libpng = dependency('libpng', version: '>= 0.89', required: get_option('png'))
 libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
 libtiff = dependency('libtiff-4', required: get_option('tiff'))
 libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml'))
-libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis'))
 poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf'))
 totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
 upower = dependency('upower-glib', version: '>= 0.9.0', required: false)
@@ -459,8 +457,6 @@ if have_tracker_extract
     '    Support RAW:                            ' + gexiv2.found().to_string(),
     '    Support TIFF:                           @0@ (xmp: @1@, exif: @2@, iptc: @3@)'.format(
         libtiff.found().to_string(), exempi.found().to_string(), libexif.found().to_string(), 
libiptcdata.found().to_string()),
-    '    Support Vorbis (ogg/etc):               ' + libvorbis.found().to_string(),
-    '    Support Flac:                           ' + flac.found().to_string(),
     '    Support MS & Open Office:               ' + libgsf.found().to_string(),
     '    Support XML / HTML:                     ' + libxml2.found().to_string(),
     '    Support embedded / sidecar XMP:         ' + exempi.found().to_string(),
diff --git a/meson_options.txt b/meson_options.txt
index 87ce733ad..79a78d676 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -39,8 +39,6 @@ option('cue', type: 'feature', value: 'auto',
        description: 'Support cue sheet parsing')
 option('exif', type: 'feature', value: 'auto',
        description: 'Support EXIF metadata')
-option('flac', type: 'feature', value: 'auto',
-       description: 'Support extracting metadata from Flac audio')
 option('gif', type: 'feature', value: 'auto',
        description: 'Support extracting metadata from GIF images')
 option('gsf', type: 'feature', value: 'auto',
@@ -61,8 +59,6 @@ option('raw', type: 'feature', value: 'auto',
        description: 'Support extracting metadata from RAW photos')
 option('tiff', type: 'feature', value: 'auto',
        description: 'Support extracting metadata from TIFF images')
-option('vorbis', type: 'feature', value: 'auto',
-       description: 'Support extracting metadata from Vorbis (ogg/etc) files')
 option('xml', type: 'feature', value: 'auto',
        description: 'Support extracting metadata from XML and HTML documents')
 option('xmp', type: 'feature', value: 'auto',
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index aa9abaf04..80df74310 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -25,10 +25,6 @@ if libgsf.found()
   modules += [['extract-oasis', 'tracker-extract-oasis.c', ['10-oasis.rule'], [libgsf, 
tracker_miners_common_dep]]]
 endif
 
-if flac.found()
-  modules += [['extract-flac', 'tracker-extract-flac.c', ['10-flac.rule'], [flac, 
tracker_miners_common_dep]]]
-endif
-
 if gexiv2.found()
   modules += [['extract-raw', 'tracker-extract-raw.c', ['10-raw.rule'], [gexiv2, tracker_miners_common_dep]]]
 endif
@@ -102,10 +98,6 @@ if libtiff.found()
   modules += [['extract-tiff', 'tracker-extract-tiff.c', ['10-tiff.rule'], [libtiff, 
tracker_miners_common_dep]]]
 endif
 
-if libvorbis.found()
-  modules += [['extract-vorbis', 'tracker-extract-vorbis.c', ['10-vorbis.rule'], [libvorbis, 
tracker_miners_common_dep]]]
-endif
-
 if exempi.found()
   modules += [['extract-xmp', 'tracker-extract-xmp.c', ['10-xmp.rule'], []]]
 endif
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 7e5037f39..b7d57b16c 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -36,9 +36,7 @@ extractor_tests = [
   'audio/mp3-id3v2.4-2',
 ]
 
-if libvorbis.found()
-  extractor_tests += 'audio/vorbis'
-endif
+extractor_tests += 'audio/vorbis'
 
 if libjpeg.found() and exempi.found() and libexif.found()
   extractor_tests += [
@@ -120,7 +118,7 @@ if libjpeg.found() and libgif.found() and libpng.found() and libtiff.found() and
   ]
 endif
 
-if libvorbis.found() and flac.found() and generic_media_handler_name != 'none'
+if generic_media_handler_name != 'none'
   functional_tests += 'writeback-audio'
 endif