[tracker-miners/wip/carlosg/cue-guess: 2/3] tracker-extract: Drop libcue 1.x support
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/cue-guess: 2/3] tracker-extract: Drop libcue 1.x support
- Date: Wed, 10 Feb 2021 12:45:09 +0000 (UTC)
commit 39e7316a409d49a41c0cf79bcaead3c145af3801
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Feb 7 15:13:11 2021 +0100
tracker-extract: Drop libcue 1.x support
The first 2.x release was on 2015, even debian stable got rid of
libcue 1.x, let's drop support for it.
config-miners.h.meson.in | 3 ---
meson.build | 3 +--
src/tracker-extract/tracker-cue-sheet.c | 26 ++++++++------------------
3 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/config-miners.h.meson.in b/config-miners.h.meson.in
index 19db0a358..767521ea6 100644
--- a/config-miners.h.meson.in
+++ b/config-miners.h.meson.in
@@ -35,9 +35,6 @@
/* Define if we have libcue */
#mesondefine HAVE_LIBCUE
-/* Define if we have libcue 2 or up */
-#mesondefine HAVE_LIBCUE2
-
/* Define if we have libexif */
#mesondefine HAVE_LIBEXIF
diff --git a/meson.build b/meson.build
index bc5343ba2..745c95403 100644
--- a/meson.build
+++ b/meson.build
@@ -68,7 +68,7 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false)
gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false)
icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false)
icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false)
-libcue = dependency('libcue', required: get_option('cue'))
+libcue = dependency('libcue', version: '>= 2.0.0', required: get_option('cue'))
libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif'))
libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf'))
libgxps = dependency('libgxps', required: get_option('xps'))
@@ -348,7 +348,6 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
conf.set('HAVE_LIBCUE', libcue.found())
-conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
conf.set('HAVE_LIBEXIF', libexif.found())
conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
diff --git a/src/tracker-extract/tracker-cue-sheet.c b/src/tracker-extract/tracker-cue-sheet.c
index 6367821cd..4e662976d 100644
--- a/src/tracker-extract/tracker-cue-sheet.c
+++ b/src/tracker-extract/tracker-cue-sheet.c
@@ -29,10 +29,8 @@
#include <gst/gst.h>
#include <gst/tag/tag.h>
-#if defined(HAVE_LIBCUE2)
+#if defined(HAVE_LIBCUE)
#include <libcue.h>
-#elif defined(HAVE_LIBCUE)
-#include <libcue/libcue.h>
#endif
#include <libtracker-miners-common/tracker-file-utils.h>
@@ -107,14 +105,10 @@ add_cdtext_string_tag (Cdtext *cd_text,
}
static void
-add_cdtext_comment_date_tag (Rem *cd_comments,
-#if defined(HAVE_LIBCUE2)
+add_cdtext_comment_date_tag (Rem *cd_comments,
enum RemType index,
-#elif defined(HAVE_LIBCUE)
- enum Cmt index,
-#endif
- GstTagList *tag_list,
- const gchar *tag)
+ GstTagList *tag_list,
+ const gchar *tag)
{
const gchar *text;
gint year;
@@ -134,14 +128,10 @@ add_cdtext_comment_date_tag (Rem *cd_comments,
}
static void
-add_cdtext_comment_double_tag (Rem *cd_comments,
-#if defined(HAVE_LIBCUE2)
- enum RemType index,
-#elif defined(HAVE_LIBCUE)
- enum Cmt index,
-#endif
- GstTagList *tag_list,
- const gchar *tag)
+add_cdtext_comment_double_tag (Rem *cd_comments,
+ enum RemType index,
+ GstTagList *tag_list,
+ const gchar *tag)
{
const gchar *text;
gdouble value;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]