tracker r2072 - in branches/indexer-split: . thumbnailers/image thumbnailers/image/hildon

[mottela svn gnome org]

Author: mottela
Date: Wed Aug 13 20:05:41 2008
New Revision: 2072
URL: http://svn.gnome.org/viewvc/tracker?rev=2072&view=rev

Log:
Added hildon-thumbnail based thumbnailer-scripts for images.

Added:
   branches/indexer-split/thumbnailers/image/hildon/
   branches/indexer-split/thumbnailers/image/hildon/gif_thumbnailer   (contents, props changed)
   branches/indexer-split/thumbnailers/image/hildon/jpeg_thumbnailer   (contents, props changed)
   branches/indexer-split/thumbnailers/image/hildon/png_thumbnailer   (contents, props changed)
   branches/indexer-split/thumbnailers/image/hildon/tiff_thumbnailer   (contents, props changed)
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/thumbnailers/image/Makefile.am

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Wed Aug 13 20:05:41 2008
@@ -777,6 +777,38 @@
 AM_CONDITIONAL(HAVE_EXEMPI, test "$have_exempi" = "yes")
 test "$have_exempi" = "yes" && AC_DEFINE(HAVE_EXEMPI, [], [Define if we have exempi])
 
+#Check for binaries
+##################################################################
+# Check for Imagemagick
+##################################################################
+
+AC_ARG_ENABLE(imagemagick, AS_HELP_STRING([--disable-imagemagick], [Disable Imagemagick thumbnailer]),,[enable_imagemagick=yes])
+if test "x$enable_imagemagick" = "xyes"; then
+   	AC_CHECK_PROG(HAVE_IMAGEMAGICK,convert,"yes","no",)
+	have_imagemagick="$HAVE_IMAGEMAGICK"
+else
+	have_imagemagick="no (disabled)"
+fi
+
+AM_CONDITIONAL(HAVE_IMAGEMAGICK, test "$have_imagemagick" = "yes")
+test "$have_imagemagick" = "yes" && AC_DEFINE(HAVE_IMAGEMAGICK, [], [Define if we have imagemagick])
+
+##################################################################
+# Check for Hildon-thumbnail
+##################################################################
+
+AC_ARG_ENABLE(hildon-thumbnail, AS_HELP_STRING([--disable-hildon-thumbnail], [Disable Hildon thumbnail]),,[enable_hildon_thumbnail=yes])
+if test "x$enable_hildon_thumbnail" = "xyes"; then
+   	AC_CHECK_PROG(HAVE_HILDON_THUMBNAIL,hildon-thumb-gdk-pixbuf,"yes","no",)
+	have_hildon_thumbnail="$HAVE_HILDON_THUMBNAIL"
+else
+	have_hildon_thumbnail="no (disabled)"
+fi
+
+AM_CONDITIONAL(HAVE_HILDON_THUMBNAIL, test "$have_hildon_thumbnail" = "yes")
+test "$have_hildon_thumbnail" = "yes" && AC_DEFINE(HAVE_HILDON_THUMBNAIL, [], [Define if we have hildon-thumbnail])
+
+
 AC_CONFIG_FILES([
 	data/dbus/Makefile
 	data/icons/16x16/Makefile
@@ -878,6 +910,11 @@
 	embedded / sidecar xmp:			$have_exempi
 	video files:				$videos_are_handled ($videos_handler)
 
+Thumbnailers:
+
+	Imagemagick				$have_imagemagick
+	Hildon-thumbnail			$have_hildon_thumbnail
+
 Warning:
 
         You must make sure SQLite is compiled with --enable-threadsafe

Modified: branches/indexer-split/thumbnailers/image/Makefile.am
==============================================================================
--- branches/indexer-split/thumbnailers/image/Makefile.am	(original)
+++ branches/indexer-split/thumbnailers/image/Makefile.am	Wed Aug 13 20:05:41 2008
@@ -1,5 +1,11 @@
 thumbappbindir = $(libdir)/tracker/thumbnailers/image
 
+if HAVE_IMAGEMAGICK
 thumbappbin_SCRIPTS = png_thumbnailer jpeg_thumbnailer gif_thumbnailer tiff_thumbnailer
+else
+if HAVE_HILDON_THUMBNAIL
+thumbappbin_SCRIPTS = hildon/png_thumbnailer hildon/jpeg_thumbnailer hildon/gif_thumbnailer hildon/tiff_thumbnailer
+endif
+endif
 
 EXTRA_DIST = $(thumbappbin_SCRIPTS)

Added: branches/indexer-split/thumbnailers/image/hildon/gif_thumbnailer
==============================================================================
--- (empty file)
+++ branches/indexer-split/thumbnailers/image/hildon/gif_thumbnailer	Wed Aug 13 20:05:41 2008
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/gif $2 0 $3 $3
+

Added: branches/indexer-split/thumbnailers/image/hildon/jpeg_thumbnailer
==============================================================================
--- (empty file)
+++ branches/indexer-split/thumbnailers/image/hildon/jpeg_thumbnailer	Wed Aug 13 20:05:41 2008
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/jpeg $2 0 $3 $3
+

Added: branches/indexer-split/thumbnailers/image/hildon/png_thumbnailer
==============================================================================
--- (empty file)
+++ branches/indexer-split/thumbnailers/image/hildon/png_thumbnailer	Wed Aug 13 20:05:41 2008
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/png $2 0 $3 $3
+

Added: branches/indexer-split/thumbnailers/image/hildon/tiff_thumbnailer
==============================================================================
--- (empty file)
+++ branches/indexer-split/thumbnailers/image/hildon/tiff_thumbnailer	Wed Aug 13 20:05:41 2008
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/nice -n19 /usr/bin/hildon-thumb-gdk-pixbuf file:"$1" image/tiff $2 0 $3 $3
+