[tracker] tracker-extract: Remove obsolete xine extractor
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] tracker-extract: Remove obsolete xine extractor
- Date: Tue, 18 Mar 2014 17:10:52 +0000 (UTC)
commit 76f3704fcb65c90c41725a00430499c670342281
Author: Bastien Nocera <hadess hadess net>
Date: Tue Mar 18 17:31:03 2014 +0100
tracker-extract: Remove obsolete xine extractor
https://bugzilla.gnome.org/show_bug.cgi?id=726639
configure.ac | 31 +--
src/tracker-extract/92-xine-generic.rule | 4 -
src/tracker-extract/Makefile.am | 19 --
src/tracker-extract/tracker-extract-libxine.c | 287 --------------------
.../test-extraction-data/video/Makefile.am | 2 +-
5 files changed, 3 insertions(+), 340 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a249bdd..caa2b8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1520,12 +1520,12 @@ fi
AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
####################################################################
-# Check for tracker-extract: gstreamer/xine/mplayer/etc
+# Check for tracker-extract: gstreamer/mplayer/etc
####################################################################
AC_ARG_ENABLE(generic-media-extractor,
AS_HELP_STRING([--enable-generic-media-extractor=ARG],
- [enables one of the (gstreamer, libav, xine, external, auto) generic media
extractor backends [[default=auto]]]),,
+ [enables one of the (gstreamer, libav, external, auto) generic media extractor
backends [[default=auto]]]),,
[enable_generic_media_extractor=auto])
PKG_CHECK_MODULES(GSTREAMER,
@@ -1537,14 +1537,6 @@ PKG_CHECK_MODULES(GSTREAMER,
AC_SUBST(GSTREAMER_CFLAGS)
AC_SUBST(GSTREAMER_LIBS)
-PKG_CHECK_MODULES(XINE,
- [libxine >= 1.0],
- [have_libxine=yes],
- [have_libxine=no])
-
-AC_SUBST(XINE_CFLAGS)
-AC_SUBST(XINE_LIBS)
-
PKG_CHECK_MODULES(AVFORMAT,
[libavformat >= 0.8.4],
[have_libavformat=yes],
@@ -1576,9 +1568,6 @@ if test "x$enable_generic_media_extractor" = "xauto"; then
elif test "$have_libav" = "yes"; then
have_generic_media_handler_app="libav"
have_generic_media_handler="yes"
- elif test "$have_libxine" = "yes"; then
- have_generic_media_handler_app="Xine"
- have_generic_media_handler="yes"
else
have_generic_media_handler="?"
have_generic_media_handler_app="An external generic_media player will be called"
@@ -1590,13 +1579,6 @@ elif test "x$enable_generic_media_extractor" = "xgstreamer"; then
else
AC_MSG_ERROR([Couldn't find GStreamer >= $GSTREAMER_REQUIRED])
fi
-elif test "x$enable_generic_media_extractor" = "xxine"; then
- if test "$have_libxine" = "yes"; then
- have_generic_media_handler_app="Xine"
- have_generic_media_handler="yes"
- else
- AC_MSG_ERROR([Couldn't find libxine])
- fi
elif test "x$enable_generic_media_extractor" = "xlibav"; then
if test "$have_libavformat" = "yes" && test "$have_libavcodec" = "yes" && test "$have_libavutil" = "yes";
then
have_generic_media_handler_app="libav"
@@ -1612,26 +1594,17 @@ fi
if test "$have_generic_media_handler_app" = "GStreamer"; then
AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
AM_CONDITIONAL(HAVE_GSTREAMER, true)
- AM_CONDITIONAL(HAVE_LIBXINE, false)
- AM_CONDITIONAL(HAVE_LIBAV, false)
- AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, false)
-elif test "$have_generic_media_handler_app" = "Xine"; then
- AC_DEFINE(HAVE_LIBXINE, [], [Define if we have Libxine])
- AM_CONDITIONAL(HAVE_LIBXINE, true)
- AM_CONDITIONAL(HAVE_GSTREAMER, false)
AM_CONDITIONAL(HAVE_LIBAV, false)
AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, false)
elif test "$have_generic_media_handler_app" = "libav"; then
AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have libav])
AM_CONDITIONAL(HAVE_LIBAV, true)
AM_CONDITIONAL(HAVE_GSTREAMER, false)
- AM_CONDITIONAL(HAVE_LIBXINE, false)
AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, false)
else
AC_DEFINE(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, [], [Define that Tracker will try to use external generic
media players])
AM_CONDITIONAL(USING_EXTERNAL_GENERIC_MEDIA_PLAYER, true)
AM_CONDITIONAL(HAVE_GSTREAMER, false)
- AM_CONDITIONAL(HAVE_LIBXINE, false)
AM_CONDITIONAL(HAVE_LIBAV, false)
fi
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 27b1004..13acf65 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -49,7 +49,6 @@ rules_files = \
90-libav-audio-generic.rule \
90-libav-video-generic.rule \
91-gstreamer-generic-dlna.rule \
- 92-xine-generic.rule \
93-mplayer-generic.rule
# NOTE:
@@ -126,11 +125,6 @@ if HAVE_GUPNP_DLNA
rules_DATA += 91-gstreamer-generic-dlna.rule
endif
-if HAVE_LIBXINE
-extractmodules_LTLIBRARIES += libextract-xine.la
-rules_DATA += 92-xine-generic.rule
-endif
-
if USING_EXTERNAL_GENERIC_MEDIA_PLAYER
extractmodules_LTLIBRARIES += libextract-mplayer.la
rules_DATA += 93-mplayer-generic.rule
@@ -400,19 +394,6 @@ libextract_gstreamer_la_CFLAGS += $(GSTREAMER_PBUTILS_CFLAGS)
libextract_gstreamer_la_LIBADD += $(GSTREAMER_PBUTILS_LIBS)
endif
-# Xine
-libextract_xine_la_SOURCES = tracker-extract-libxine.c
-libextract_xine_la_CFLAGS = \
- $(TRACKER_EXTRACT_MODULES_CFLAGS) \
- $(XINE_CFLAGS)
-libextract_xine_la_LDFLAGS = $(module_flags)
-libextract_xine_la_LIBADD = \
- $(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(BUILD_LIBS) \
- $(TRACKER_EXTRACT_MODULES_LIBS) \
- $(XINE_LIBS)
-
# GIF
libextract_gif_la_SOURCES = tracker-extract-gif.c
libextract_gif_la_CFLAGS = \
diff --git a/tests/functional-tests/test-extraction-data/video/Makefile.am
b/tests/functional-tests/test-extraction-data/video/Makefile.am
index 0917ade..796cc3c 100644
--- a/tests/functional-tests/test-extraction-data/video/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/video/Makefile.am
@@ -8,7 +8,7 @@ videos = \
video-2.mov \
video-2.expected
-# This should be GSTREAMER OR LIBXINE OR GSTREMER_HELIX OR USING_EXTERNAL_VIDEO_PLAYER
+# This should be GSTREAMER OR GSTREMER_HELIX OR USING_EXTERNAL_VIDEO_PLAYER
if HAVE_GSTREAMER
videotest_DATA += $(videos)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]