From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 5 Jun 2009 11:41:42 +0000 (+0100)
Subject: Merge branch '1.0-integration'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e33fe3175d17ff659705c24ac7865510b145528;p=profile%2Fivi%2Fclutter.git

Merge branch '1.0-integration'

* 1.0-integration: (138 commits)
  [x11] Disable XInput by default
  [xinput] Invert the XI extension version check
  [cogl-primitives] Fix an unused variable warning when building GLES
  [clutter-stage-egl] Pass -1,-1 to clutter_stage_x11_fix_window_size
  Update the GLES backend to have the layer filters in the material
  [gles/cogl-shader] Add a missing semicolon
  [cogl] Move the texture filters to be a property of the material layer
  [text] Fix Pango unit to pixels conversion
  [actor] Force unrealization on destroy only for non-toplevels
  [x11] Rework map/unmap and resizing
  [xinput] Check for the XInput entry points
  [units] Validate units against the ParamSpec
  [actor] Add the ::allocation-changed signal
  [actor] Use flags to control allocations
  [units] Rework Units into logical distance value
  Remove a stray g_value_get_int()
  Remove usage of Units and macros
  [cogl-material] Allow setting a layer with an invalid texture handle
  [timeline] Remove the concept of frames from timelines
  [gles/cogl-shader] Fix parameter spec for cogl_shader_get_info_log
  ...

Conflicts:
	configure.ac
---

7e33fe3175d17ff659705c24ac7865510b145528
diff --cc clutter/cogl/gl/cogl-texture.c
index 643b118,e2c6c26..215e14c
--- a/clutter/cogl/gl/cogl-texture.c
+++ b/clutter/cogl/gl/cogl-texture.c
@@@ -1342,10 -1385,12 +1385,11 @@@ cogl_texture_new_from_bitmap (CoglHandl
    tex = (CoglTexture*) g_malloc ( sizeof (CoglTexture));
  
    tex->is_foreign = FALSE;
-   tex->auto_mipmap = ((flags & COGL_TEXTURE_AUTO_MIPMAP) != 0);
+   tex->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0;
+   tex->mipmaps_dirty = TRUE;
  
    tex->bitmap = *bmp;
 -  tex->bitmap_owner = TRUE;
 -  bmp->data = NULL;
 +  tex->bitmap_owner = FALSE;
  
    tex->slice_x_spans = NULL;
    tex->slice_y_spans = NULL;
diff --cc clutter/fruity/clutter-stage-fruity.c
index 1f6b192,76dc135..e85e063
--- a/clutter/fruity/clutter-stage-fruity.c
+++ b/clutter/fruity/clutter-stage-fruity.c
@@@ -189,9 -190,9 +190,9 @@@ clutter_stage_egl_realize (ClutterActo
  
  static void
  clutter_stage_egl_get_preferred_width (ClutterActor *self,
-                         	       ClutterUnit   for_height,
- 				       ClutterUnit  *min_width_p,
- 				       ClutterUnit  *natural_width_p)
 -                        	       gfloat        for_height,
 -				       gfloat       *min_width_p,
 -				       gfloat       *natural_width_p)
++                                       gfloat        for_height,
++                                       gfloat       *min_width_p,
++                                       gfloat       *natural_width_p)
  {
    ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
  
@@@ -204,9 -205,9 +205,9 @@@
  
  static void
  clutter_stage_egl_get_preferred_height (ClutterActor *self,
- 		      			ClutterUnit   for_width,
- 					ClutterUnit  *min_height_p,
- 					ClutterUnit  *natural_height_p)
 -		      			gfloat        for_width,
 -					gfloat       *min_height_p,
 -					gfloat       *natural_height_p)
++                                        gfloat        for_width,
++                                        gfloat       *min_height_p,
++                                        gfloat       *natural_height_p)
  {
    ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
  
diff --cc configure.ac
index dc09a7c,a70833a..65ef287
--- a/configure.ac
+++ b/configure.ac
@@@ -539,12 -586,10 +586,9 @@@ AS_CASE([$with_json]
  AC_SUBST(JSON_PREFIX)
  AM_CONDITIONAL(LOCAL_JSON_GLIB, test "x$have_json" = "xno")
  
+ dnl === Dependencies, compiler flags and linker libraries =====================
 -
 -CLUTTER_REQUIRES="cairo >= 1.4 pangocairo >= 1.18 gobject-2.0 >= 2.16 gthread-2.0 gmodule-no-export-2.0 $IMAGE_PC_FILES $BACKEND_PC_FILES $X11_PC_FILES $JSON_GLIB_PC"
 +CLUTTER_REQUIRES="cairo >= 1.4 pangocairo >= 1.20 gobject-2.0 >= 2.16 gthread-2.0 gmodule-no-export-2.0 $BACKEND_PC_FILES $JSON_GLIB_PC"
  
- if test "x$imagebackend" = "xgdk-pixbuf"; then
-         CLUTTER_REQUIRES="$CLUTTER_REQUIRES gdk-pixbuf-2.0"
- fi
- 
  PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES])
  
  AC_SUBST(CLUTTER_REQUIRES)