cheese r1062 - trunk

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Fri Sep 19 15:17:29 2008
New Revision: 1062
URL: http://svn.gnome.org/viewvc/cheese?rev=1062&view=rev

Log:
update the cheese dependencies, fixes bug #547203


Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
   trunk/wscript

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Fri Sep 19 15:17:29 2008
@@ -4,26 +4,27 @@
 Take photos and videos with your webcam, with fun graphical effects
 
 Cheese currently requires:
-  - glib-2.0 >= 2.15.5
-  - gio-2.0 >= 2.15.5
-  - gobject-2.0
+  - glib-2.0 >= 2.16.0
+  - gobject-2.0 >= 2.12.0
+  - gio-2.0 >= 2.16.0
   - gtk+-2.0 >= 2.10.0
-  - gdk-2.0
+  - gdk-2.0 >= 2.12.0
+  - libgnomeui-2.0 >= 2.20.0
+  - gconf-2.0 >= 2.16.0
+  - gstreamer-0.10 >= 0.10.20
+  - gstreamer-plugins-base-0.10  >= 0.10.20
+  - gstreamer-plugins-good-0.10  >= 0.10.8
+  - gnome-vfs-2.0
   - dbus-1
+  - dbus-glib-1
   - hal
   - cairo
   - pango
   - librsvg >= 2.18.0
-  - gstreamer-0.10 >= 0.10.15
-  - gstreamer-plugins-base-0.10  >= 0.10.15
-  - gstreamer-plugins-good-0.10  >= 0.10.6
-  - gstreamer-pango-0.10  >= 0.10.12
-  - gnome-vfs-2.0
-  - libgnomeui-2.0
-  - xf86vidmodeproto
   - libebook-1.2 (evolution-data-server)
   - postr for Flickr export (optional)
   - f-spot for F-Spot export (optional)
+  - nautilus-sendto for better export mechanism (optional)
   - a webcam
   - a brain
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Sep 19 15:17:29 2008
@@ -56,25 +56,29 @@
 # Check required libraries
 #*******************************************************************************
 
-GLIB_REQUIRED=2.15.5
-GIO_REQUIRED=2.15.5
+GLIB_REQUIRED=2.16.0
+GOBJECT_REQUIRED=2.12.0
+GIO_REQUIRED=2.16.0
 GTK_REQUIRED=2.10.0
-LIBGNOMEUI_REQUIRED=2.14.0
+GDK_REQUIRED=2.12.0
+LIBGNOMEUI_REQUIRED=2.20.0
 GCONF_REQUIRED=2.16.0
-GSTREAMER_REQUIRED=0.10.16
-CAIRO_REQUIRED=1.2.4
+GSTREAMER_REQUIRED=0.10.20
 GNOME_VFS_REQUIRED=2.18.0
 LIBEBOOK_REQUIRED=1.12.0
+CAIRO_REQUIRED=1.4.0
 DBUS_REQUIRED=1.0
-HAL_REQUIRED=0.5.9
 DBUS_GLIB_REQUIRED=0.7
-LIBRSVG_REQUIRED=2.18.0
+HAL_REQUIRED=0.5.9
 PANGOCAIRO_REQUIRED=1.18.0
+LIBRSVG_REQUIRED=2.18.0
 
 PKG_CHECK_MODULES(CHEESE, \ 
   glib-2.0 >= $GLIB_REQUIRED \
+  gobject-2.0 >= $GOBJECT_REQUIRED \
   gio-2.0 >= $GIO_REQUIRED \
   gtk+-2.0 >= $GTK_REQUIRED \
+  gdk-2.0 >= $GDK_REQUIRED \
   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
   gconf-2.0 >= $GCONF_REQUIRED \
   gstreamer-0.10 >= $GSTREAMER_REQUIRED \
@@ -83,8 +87,8 @@
   libebook-1.2 >= $LIBEBOOK_REQUIRED \
   cairo >= $CAIRO_REQUIRED \
   dbus-1 >= $DBUS_REQUIRED \
-  hal >= $HAL_REQUIRED \
   dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
+  hal >= $HAL_REQUIRED \
   pangocairo >= $PANGOCAIRO_REQUIRED \
   librsvg-2.0 >= $LIBRSVG_REQUIRED)
 AC_SUBST(CHEESE_CFLAGS)

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Fri Sep 19 15:17:29 2008
@@ -33,19 +33,23 @@
 
 	conf.check_tool('gcc gnome intltool misc')
 
+	conf.check_pkg('glib-2.0', destvar='GLIB', vnum='2.16.0', mandatory=True)
 	conf.check_pkg('gobject-2.0', destvar='GOBJECT', vnum='2.12.0', mandatory=True)
-	conf.check_pkg('glib-2.0', destvar='GLIB', vnum='2.15.5', mandatory=True)
-	conf.check_pkg('gio-2.0', destvar='GLIB', vnum='2.15.5', mandatory=True)
-	conf.check_pkg('cairo', destvar='CAIRO', vnum='1.4.0', mandatory=True)
-	conf.check_pkg('pangocairo', destvar='PANGOCAIRO', vnum='1.18.0', mandatory=True)
-	conf.check_pkg('gdk-2.0', destvar='GDK', vnum='2.12.0', mandatory=True)
+	conf.check_pkg('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=True)
 	conf.check_pkg('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True)
-	conf.check_pkg('librsvg-2.0', destvar='LIBRSVG', vnum='2.18.0', mandatory=True)
-	conf.check_pkg('hal', destvar='HAL', vnum='0.5.9', mandatory=True)
-	conf.check_pkg('gstreamer-0.10', destvar='GSTREAMER', vnum='0.10.16', mandatory=True)
-	conf.check_pkg('gstreamer-plugins-base-0.10', destvar='GSTREAMER_PLUGINS_BASE', vnum='0.10.16', mandatory=True)
+	conf.check_pkg('gdk-2.0', destvar='GDK', vnum='2.12.0', mandatory=True)
 	conf.check_pkg('libgnomeui-2.0', destvar='LIBGNOMEUI', vnum='2.20.0', mandatory=True)
+	conf.check_pkg('gconf-2.0', destvar='GCONF', vnum='2.16.0', mandatory=True)
+	conf.check_pkg('gstreamer-0.10', destvar='GSTREAMER', vnum='0.10.20', mandatory=True)
+	conf.check_pkg('gstreamer-plugins-base-0.10', destvar='GSTREAMER_PLUGINS_BASE', vnum='0.10.20', mandatory=True)
+	conf.check_pkg('gnome-vfs-2.0', destvar='GNOMEVFS', vnum='2.18.0', mandatory=True)
 	conf.check_pkg('libebook-1.2', destvar='LIBEBOOK', vnum='1.12.0', mandatory=True)
+	conf.check_pkg('cairo', destvar='CAIRO', vnum='1.4.0', mandatory=True)
+	conf.check_pkg('dbus', destvar='DBUS', vnum='1.0', mandatory=True)
+	conf.check_pkg('dbus-glib-1', destvar='DBUSGLIB', vnum='0.7', mandatory=True)
+	conf.check_pkg('hal', destvar='HAL', vnum='0.5.9', mandatory=True)
+	conf.check_pkg('pangocairo', destvar='PANGOCAIRO', vnum='1.18.0', mandatory=True)
+	conf.check_pkg('librsvg-2.0', destvar='LIBRSVG', vnum='2.18.0', mandatory=True)
 	conf.env['LIB_GSTREAMER'] += ['gstinterfaces-0.10']
 
 	conf.define('VERSION', VERSION)