[tracker/writeback-taglib: 2/4] Remove id3lib writeback module
- From: Adrien Bustany <abustany src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/writeback-taglib: 2/4] Remove id3lib writeback module
- Date: Thu, 15 Apr 2010 14:41:03 +0000 (UTC)
commit 92e422089aad9a2210618fce0989b1f3cc02f94b
Author: Adrien Bustany <abustany gnome org>
Date: Thu Apr 15 09:57:18 2010 -0400
Remove id3lib writeback module
This module is not needed anymore with the taglib based module.
configure.ac | 46 --------
src/tracker-writeback/Makefile.am | 9 --
src/tracker-writeback/tracker-writeback-mp3.c | 151 -------------------------
3 files changed, 0 insertions(+), 206 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c0b4d05..117f1bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,6 @@ EDS_REQUIRED=2.25.5
# Unlikely version for now, Nepomuk integration isn't finished in streamanalyzer atm
LIBSTREAMANALYZER_REQUIRED=0.7.0
GEE_REQUIRED=0.3
-ID3LIB_REQUIRED=3.8.3
TAGLIB_REQUIRED=1.6
GNOME_KEYRING_REQUIRED=2.26
LIBGRSS_REQUIRED=0.3
@@ -240,50 +239,6 @@ GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
AC_SUBST(GLIB_GENMARSHAL)
####################################################################
-# ID3lib for MP3 writeback support
-####################################################################
-
-# FIXME This should be package based. Unfortunately in several main
-# distros, it is not.
-
-OLD_CFLAGS="$CFLAGS"
-OLD_LIBS="$LIBS"
-CFLAGS=""
-LIBS=""
-
-AC_ARG_ENABLE(id3lib,
- AS_HELP_STRING([--enable-id3lib],
- [enable writeback for MP3 data [[default=auto]]]),,
- [enable_id3lib=auto])
-
-if test "x$enable_id3lib" != "xno" ; then
- AC_CHECK_HEADER(id3.h,
- AC_CHECK_LIB([id3], [ID3Tag_New], [], [], [-lstdc++ -lz]))
-
- have_id3lib=${ac_cv_lib_id3_ID3Tag_New:-no}
-
- ID3LIB_CFLAGS="$CFLAGS"
- ID3LIB_LIBS="$LIBS"
-
- AC_SUBST(ID3LIB_CFLAGS)
- AC_SUBST(ID3LIB_LIBS)
-
-else
- have_id3lib="no (disabled)"
-fi
-
-if test "x$enable_id3lib" = "xyes"; then
- if test "x$have_id3lib" != "xyes"; then
- AC_MSG_ERROR([Couldn't find id3lib >= $ID3LIB_REQUIRED.])
- fi
-fi
-
-AM_CONDITIONAL(HAVE_ID3LIB, test "x$have_id3lib" = "xyes")
-
-CFLAGS="$OLD_CFLAGS"
-LIBS="$OLD_LIBS"
-
-####################################################################
# Taglib for audio writeback support
####################################################################
@@ -1837,7 +1792,6 @@ Plugins:
Writeback:
- MP3: $have_id3lib
Audio files using Taglib: $have_taglib
XMP: $have_exempi
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 38c11e5..368e465 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -16,21 +16,12 @@ INCLUDES = \
$(GCOV_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
- $(ID3LIB_CFLAGS) \
$(TAGLIB_CFLAGS) \
$(EXEMPI_CFLAGS) \
$(TOTEM_PL_PARSER_CFLAGS)
modules_LTLIBRARIES =
-# MP3
-#if HAVE_ID3LIB
-#modules_LTLIBRARIES += libwriteback-mp3.la
-#libwriteback_mp3_la_SOURCES = tracker-writeback-mp3.c
-#libwriteback_mp3_la_LDFLAGS = $(module_flags)
-#libwriteback_mp3_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS) $(ID3LIB_LIBS)
-#endif
-
# Audio files (MP3, MPC, FLAC, MP4, ASF, AIFF, WAV, TrueAudio, WavPack,
# Ogg FLAC, Ogg Vorbis and Speex)
if HAVE_TAGLIB
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]