[tracker: 6/6] Merge branch 'libtracker-extract'

[Martyn James Russell <mr src gnome org>]

commit b04279f7448ddaee1b1a02e461a56f53b0ba7f15
Merge: 8283d57 92a1cee
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Jan 20 15:23:06 2010 +0000

    Merge branch 'libtracker-extract'

 configure.ac                                       |    4 +
 data/Makefile.am                                   |    9 +-
 data/tracker-extract.pc.in                         |   12 +
 docs/reference/Makefile.am                         |    1 +
 docs/reference/libtracker-extract/Makefile.am      |   58 +++++
 .../libtracker-extract-docs.sgml                   |   43 ++++
 .../libtracker-extract-sections.txt                |   27 +++
 docs/reference/libtracker-extract/version.xml.in   |    1 +
 src/Makefile.am                                    |    1 +
 src/libtracker-extract/Makefile.am                 |   51 ++++
 .../tracker-exif.c                                 |   37 +++-
 .../tracker-exif.h                                 |    6 +-
 src/libtracker-extract/tracker-extract.h           |  164 +++++++++++++
 .../tracker-iptc.c                                 |   56 +++++-
 .../tracker-iptc.h                                 |    6 +-
 .../tracker-xmp.c                                  |  244 ++++++++++++--------
 .../tracker-xmp.h                                  |    8 +-
 src/tracker-extract/Makefile.am                    |  154 ++++++++-----
 src/tracker-extract/dummy.c                        |   36 ++-
 src/tracker-extract/tracker-extract-abw.c          |   13 +-
 .../tracker-extract-gstreamer-helix.c              |   11 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   17 +-
 src/tracker-extract/tracker-extract-html.c         |    8 +-
 src/tracker-extract/tracker-extract-imagemagick.c  |    7 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   11 +-
 src/tracker-extract/tracker-extract-libxine.c      |    7 +-
 src/tracker-extract/tracker-extract-mockup.c       |    6 +-
 src/tracker-extract/tracker-extract-mp3.c          |    8 +-
 src/tracker-extract/tracker-extract-mplayer.c      |    8 +-
 src/tracker-extract/tracker-extract-msoffice.c     |   11 +-
 src/tracker-extract/tracker-extract-oasis.c        |   38 ++--
 src/tracker-extract/tracker-extract-pdf.c          |    7 +-
 src/tracker-extract/tracker-extract-playlist.c     |   17 +-
 src/tracker-extract/tracker-extract-png.c          |   12 +-
 src/tracker-extract/tracker-extract-ps.c           |   11 +-
 src/tracker-extract/tracker-extract-text.c         |    6 +-
 src/tracker-extract/tracker-extract-tiff.c         |   14 +-
 src/tracker-extract/tracker-extract-totem.c        |   12 +-
 src/tracker-extract/tracker-extract-vorbis.c       |    4 +-
 src/tracker-extract/tracker-extract-xmp.c          |    6 +-
 src/tracker-extract/tracker-extract.c              |    9 +-
 src/tracker-extract/tracker-main.h                 |   23 +--
 42 files changed, 864 insertions(+), 320 deletions(-)
---
diff --cc src/tracker-extract/Makefile.am
index 77b3bff,d74ebd8..6ec8364
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@@ -15,12 -15,10 +15,9 @@@ INCLUDES = 								
  	$(GDKPIXBUF_CFLAGS)						\
  	$(GMODULE_CFLAGS) 						\
  	$(DBUS_CFLAGS)							\
- 	$(EXEMPI_CFLAGS) 						\
  	$(LIBJPEG_CFLAGS) 						\
  	$(LIBTIFF_CFLAGS) 						\
- 	$(LIBEXIF_CFLAGS) 						\
- 	$(LIBIPTCDATA_CFLAGS)						\
  	$(LIBGSF_CFLAGS) 						\
 -	$(LIBWV2_CFLAGS) 						\
  	$(LIBXML2_CFLAGS) 						\
  	$(LIBPNG_CFLAGS) 						\
  	$(POPPLER_GLIB_CFLAGS) 						\
@@@ -182,14 -187,26 +186,21 @@@ libextract_html_la_LIBADD = 						
  # MS Office
  libextract_msoffice_la_SOURCES = tracker-extract-msoffice.c
  libextract_msoffice_la_LDFLAGS = $(module_flags)
- libextract_msoffice_la_LIBADD = $(GLIB2_LIBS) $(LIBGSF_LIBS) $(GCOV_LIBS) \
- 	$(top_builddir)/src/libtracker-common/libtracker-common.la
+ libextract_msoffice_la_LIBADD = 					\
+ 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+ 	$(LIBGSF_LIBS)							\
+ 	$(GLIB2_LIBS)							\
+ 	$(GCOV_LIBS)
  
 -if HAVE_LIBWV2
 -libextract_msoffice_la_SOURCES += tracker-msword.cpp tracker-msword.h
 -libextract_msoffice_la_LIBADD += $(LIBWV2_LIBS)
 -endif
 -
  # PDF
- libextract_pdf_la_SOURCES = tracker-extract-pdf.c $(xmp_sources)
+ libextract_pdf_la_SOURCES = tracker-extract-pdf.c
  libextract_pdf_la_LDFLAGS = $(module_flags)
- libextract_pdf_la_LIBADD = $(GLIB2_LIBS) $(POPPLER_GLIB_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS) \
- 	$(top_builddir)/src/libtracker-common/libtracker-common.la
+ libextract_pdf_la_LIBADD = 						\
+ 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+ 	$(top_builddir)/src/libtracker-extract/libtracker-extract.la	\
+ 	$(POPPLER_GLIB_LIBS)						\
+ 	$(GLIB2_LIBS)							\
+ 	$(GCOV_LIBS)
  
  # GStreamer
  libextract_gstreamer_la_SOURCES = tracker-extract-gstreamer.c
diff --cc src/tracker-extract/tracker-extract-msoffice.c
index c395bc5,2d33eeb..c795cf7
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@@ -34,11 -34,16 +34,12 @@@
  #include <gsf/gsf-utils.h>
  
  #include <libtracker-common/tracker-utils.h>
- 
  #include <libtracker-common/tracker-ontology.h>
  
+ #include <libtracker-extract/tracker-extract.h>
+ 
  #include "tracker-main.h"
  
 -#ifdef HAVE_LIBWV2
 -#include "tracker-msword.h"
 -#endif
 -
  #define NIE_PREFIX                              TRACKER_NIE_PREFIX
  #define NFO_PREFIX                              TRACKER_NFO_PREFIX
  #define NCO_PREFIX                              TRACKER_NCO_PREFIX