[maemo-commits] [maemo-commits] r18029 - in projects/haf/trunk/hildon-thumbnail: . daemon

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-04-07 18:12:20 +0300 (Tue, 07 Apr 2009)
New Revision: 18029

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/config.h.in
   projects/haf/trunk/hildon-thumbnail/configure.ac
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
Log:
2009-04-07  Philip Van Hoof  <pvanhoof at codeminded.be>

        * config.h.in
        * configure.ac
        * daemon/hildon-thumbnail-daemon.c: Making it possible to compile on a
        host that has no OSSO packages installed



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-04-07 14:56:27 UTC (rev 18028)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-04-07 15:12:20 UTC (rev 18029)
@@ -1,3 +1,10 @@
+2009-04-07  Philip Van Hoof  <pvanhoof at codeminded.be>
+
+	* config.h.in
+	* configure.ac
+	* daemon/hildon-thumbnail-daemon.c: Making it possible to compile on a
+	host that has no OSSO packages installed
+
 2009-03-26  Philip Van Hoof  <pvanhoof at codeminded.be>
 
 	* daemon/hildon-thumbnail-daemon.c

Modified: projects/haf/trunk/hildon-thumbnail/config.h.in
===================================================================
--- projects/haf/trunk/hildon-thumbnail/config.h.in	2009-04-07 14:56:27 UTC (rev 18028)
+++ projects/haf/trunk/hildon-thumbnail/config.h.in	2009-04-07 15:12:20 UTC (rev 18029)
@@ -18,6 +18,9 @@
 /* OMXIL */
 #undef HAVE_OMXIL
 
+/* Define if we have OSSO */
+#undef HAVE_OSSO
+
 /* SQLite3 */
 #undef HAVE_SQLITE3
 

Modified: projects/haf/trunk/hildon-thumbnail/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2009-04-07 14:56:27 UTC (rev 18028)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2009-04-07 15:12:20 UTC (rev 18029)
@@ -40,6 +40,12 @@
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
+PKG_CHECK_MODULES(PLAYBACK, libplayback-1, [have_playback=yes], [have_playback=no])
+AC_SUBST(PLAYBACK_CFLAGS)
+AC_SUBST(PLAYBACK_LIBS)
+
+AM_CONDITIONAL(HAVE_PLAYBACK, test "$have_playback" = "yes")
+
 PKG_CHECK_MODULES(GTK, gtk+-2.0, [have_gtk=yes], [have_gtk=no])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
@@ -204,7 +210,11 @@
 
 AM_CONDITIONAL(ENABLE_OSSO, test x$have_osso = xyes)
 
+if test "x$have_osso" != "xno" ; then
+   AC_DEFINE(HAVE_OSSO, 1, [Define if we have OSSO])
+fi
 
+
 # --- Output ---
 
 AC_CONFIG_LINKS(thumbs/pixbuf-io-loader.c:daemon/plugins/pixbuf-io-loader.c)

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2009-04-07 14:56:27 UTC (rev 18028)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2009-04-07 15:12:20 UTC (rev 18029)
@@ -26,8 +26,10 @@
 #include <linux/sched.h>
 #include <sched.h>
 
+#ifdef HAVE_OSSO
 #include <osso-mem.h>
 #include <osso-log.h>
+#endif
 
 #ifndef SCHED_IDLE
 #define SCHED_IDLE 5
@@ -382,7 +384,9 @@
 	mallopt (M_MMAP_THRESHOLD, 128 *1024);
 #endif
 
+#ifdef HAVE_OSSO
 	result = osso_mem_saw_enable(4 << 20, 64, thumbnailer_oom_func, NULL);
+#endif
 
 	g_type_init ();
 
@@ -465,7 +469,9 @@
 		g_main_loop_unref (main_loop);
 	}
 
+#ifdef HAVE_OSSO
 	osso_mem_saw_disable();
+#endif
 
 	return 0;
 }