- New upstream 2.29.0 release

7 files changed, 351 insertions, 148 deletions

diff --git a/.cvsignore b/.cvsignore
index fe4a48d..7065ad1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mutter-2.28.1-20100127.tar.bz2
+mutter-2.29.0.tar.bz2
diff --git a/mutter-2.28.1-add-needed.patch b/mutter-2.28.1-add-needed.patch
deleted file mode 100644
index cce72e9..0000000
--- a/mutter-2.28.1-add-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mutter-2.28.1/src/tools/Makefile.am.jx mutter-2.28.1/src/tools/Makefile.am
---- mutter-2.28.1/src/tools/Makefile.am.jx	2010-01-25 11:07:32.000000000 -0500
-+++ mutter-2.28.1/src/tools/Makefile.am	2010-02-16 18:59:50.000000000 -0500
-@@ -26,7 +26,7 @@ noinst_PROGRAMS=mutter-mag mutter-graysc
- 
- mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@
- mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
--mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
-+mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@ -lm
- mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@
- 
- EXTRA_DIST=$(icon_DATA)
diff --git a/mutter-clutter12.patch b/mutter-clutter12.patch
new file mode 100644
index 0000000..d96b755
--- /dev/null
+++ b/mutter-clutter12.patch
@@ -0,0 +1,340 @@
+From ff4f096f1d9ec3d8113286ade9e9aa53da84b198 Mon Sep 17 00:00:00 2001
+From: Owen W. Taylor <otaylor@fishsoup.net>
+Date: Tue, 23 Feb 2010 17:36:56 +0000
+Subject: Support and require Clutter 1.2
+
+- Specify a minimum version of Clutter-1.2.0
+- Remove conditionalizatin and always use Clutter-1.1 framebuffer
+  API rather than raw GL fbos
+- Replace deprecated cogl_material/texture_unref() with
+  cogl_handle_unref()
+
+https://bugzilla.gnome.org/show_bug.cgi?id=610862
+---
+diff --git a/configure.in b/configure.in
+index 5fe02c0..cb4df73 100644
+--- a/configure.in
++++ b/configure.in
+@@ -249,7 +249,7 @@ else
+   AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
+ fi
+ 
+-CLUTTER_VERSION=1.0.0
++CLUTTER_VERSION=1.2.0
+ CLUTTER_PACKAGE=clutter-1.0
+ AC_SUBST(CLUTTER_PACKAGE)
+ if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
+diff --git a/src/compositor/mutter-shaped-texture.c b/src/compositor/mutter-shaped-texture.c
+index a335cf1..347af0c 100644
+--- a/src/compositor/mutter-shaped-texture.c
++++ b/src/compositor/mutter-shaped-texture.c
+@@ -124,18 +124,18 @@ mutter_shaped_texture_dispose (GObject *object)
+ 
+   if (priv->material != COGL_INVALID_HANDLE)
+     {
+-      cogl_material_unref (priv->material);
++      cogl_handle_unref (priv->material);
+       priv->material = COGL_INVALID_HANDLE;
+     }
+   if (priv->material_unshaped != COGL_INVALID_HANDLE)
+     {
+-      cogl_material_unref (priv->material_unshaped);
++      cogl_handle_unref (priv->material_unshaped);
+       priv->material_unshaped = COGL_INVALID_HANDLE;
+     }
+ #if 1 /* see comment in mutter_shaped_texture_paint */
+   if (priv->material_workaround != COGL_INVALID_HANDLE)
+     {
+-      cogl_material_unref (priv->material_workaround);
++      cogl_handle_unref (priv->material_workaround);
+       priv->material_workaround = COGL_INVALID_HANDLE;
+     }
+ #endif
+@@ -194,7 +194,7 @@ mutter_shaped_texture_dirty_mask (MutterShapedTexture *stex)
+       if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+         glDeleteTextures (1, &mask_gl_tex);
+ 
+-      cogl_texture_unref (priv->mask_texture);
++      cogl_handle_unref (priv->mask_texture);
+       priv->mask_texture = COGL_INVALID_HANDLE;
+     }
+ }
+diff --git a/src/compositor/mutter-texture-tower.c b/src/compositor/mutter-texture-tower.c
+index ce5be59..67f878b 100644
+--- a/src/compositor/mutter-texture-tower.c
++++ b/src/compositor/mutter-texture-tower.c
+@@ -31,15 +31,6 @@
+ #define M_LOG2E 1.4426950408889634074
+ #endif
+ 
+-#if !CLUTTER_CHECK_VERSION(1,1,3)
+-static PFNGLACTIVETEXTUREARBPROC activeTexture;
+-static PFNGLGENFRAMEBUFFERSPROC genFramebuffers;
+-static PFNGLDELETEFRAMEBUFFERSPROC deleteFramebuffers;
+-static PFNGLBINDFRAMEBUFFERPROC bindFramebuffer;
+-static PFNGLFRAMEBUFFERTEXTURE2DPROC framebufferTexture2D;
+-#endif
+-
+-
+ #define MAX_TEXTURE_LEVELS 12
+ 
+ /* If the texture format in memory doesn't match this, then Mesa
+@@ -68,11 +59,7 @@ struct _MutterTextureTower
+ {
+   int n_levels;
+   CoglHandle textures[MAX_TEXTURE_LEVELS];
+-#if CLUTTER_CHECK_VERSION(1,1,3)
+   CoglHandle fbos[MAX_TEXTURE_LEVELS];
+-#else
+-  GLuint fbos[MAX_TEXTURE_LEVELS];
+-#endif
+   Box invalid[MAX_TEXTURE_LEVELS];
+ };
+ 
+@@ -131,7 +118,7 @@ free_texture (CoglHandle texture)
+   if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
+     glDeleteTextures (1, &gl_tex);
+ 
+-  cogl_texture_unref (texture);
++  cogl_handle_unref (texture);
+ }
+ 
+ /**
+@@ -165,22 +152,14 @@ mutter_texture_tower_set_base_texture (MutterTextureTower *tower,
+               tower->textures[i] = COGL_INVALID_HANDLE;
+             }
+ 
+-#if CLUTTER_CHECK_VERSION(1,1,3)
+           if (tower->fbos[i] != COGL_INVALID_HANDLE)
+             {
+               cogl_handle_unref (tower->fbos[i]);
+               tower->fbos[i] = COGL_INVALID_HANDLE;
+             }
+-#else
+-          if (tower->fbos[i] != 0)
+-            {
+-              (*deleteFramebuffers) (1, &tower->fbos[i]);
+-              tower->fbos[i] = 0;
+-            }
+-#endif
+         }
+ 
+-      cogl_texture_unref (tower->textures[0]);
++      cogl_handle_unref (tower->textures[0]);
+     }
+ 
+   tower->textures[0] = texture;
+@@ -189,7 +168,7 @@ mutter_texture_tower_set_base_texture (MutterTextureTower *tower,
+     {
+       int width, height;
+ 
+-      cogl_texture_ref (tower->textures[0]);
++      cogl_handle_ref (tower->textures[0]);
+ 
+       width = cogl_texture_get_width (tower->textures[0]);
+       height = cogl_texture_get_height (tower->textures[0]);
+@@ -429,17 +408,6 @@ texture_tower_create_texture (MutterTextureTower *tower,
+   tower->invalid[level].y2 = height;
+ }
+ 
+-/* The COGL fbo (render-to-texture) support is pretty hard to use in
+- * Clutter 1.0; there's no way to save and restore the old projection
+- * matrix and viewport without ugly workarounds that require explicit
+- * access to the ClutterStage.  In Clutter 1.2, the save/restore is
+- * automatic. For now, until we depend on Clutter 1.2, we use GL
+- * directly for render-to-texture. The main downside (other than
+- * a lot of verbosity) is that we have to save the state, reset anything
+- * that we think COGL might have left in a way we don't want it, then
+- * restore the old state.
+- */
+-#if CLUTTER_CHECK_VERSION(1,1,3)
+ static gboolean
+ texture_tower_revalidate_fbo (MutterTextureTower *tower,
+                               int                 level)
+@@ -478,162 +446,6 @@ texture_tower_revalidate_fbo (MutterTextureTower *tower,
+ 
+   return TRUE;
+ }
+-#else
+-static void
+-initialize_gl_functions (void)
+-{
+-  static gboolean initialized = FALSE;
+-
+-  if (!initialized)
+-    {
+-      initialized = TRUE;
+-
+-      activeTexture = (PFNGLACTIVETEXTUREARBPROC) cogl_get_proc_address ("glActiveTextureARB");
+-      genFramebuffers = (PFNGLGENFRAMEBUFFERSPROC) cogl_get_proc_address ("glGenFramebuffersEXT");
+-      deleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC) cogl_get_proc_address ("glDeleteFramebuffersEXT");
+-      bindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC) cogl_get_proc_address ("glBindFramebufferEXT");
+-      framebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC) cogl_get_proc_address ("glFramebufferTexture2D");
+-    }
+-}
+-
+-static gboolean
+-texture_tower_revalidate_fbo (MutterTextureTower *tower,
+-                              int                 level)
+-{
+-  CoglHandle source_texture = tower->textures[level - 1];
+-  int source_texture_width = cogl_texture_get_width (source_texture);
+-  int source_texture_height = cogl_texture_get_height (source_texture);
+-  CoglHandle dest_texture = tower->textures[level];
+-  int dest_texture_width = cogl_texture_get_width (dest_texture);
+-  int dest_texture_height = cogl_texture_get_height (dest_texture);
+-  ClutterActorBox source_box;
+-  Box *dest_box;
+-
+-  GLuint source_gl_tex;
+-  GLenum source_gl_target;
+-
+-  if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
+-    return FALSE;
+-
+-  initialize_gl_functions ();
+-
+-  /* Create the frame-buffer object that renders to the texture, if
+-   * it doesn't exist; just bind it for rendering if it does */
+-  if (tower->fbos[level] == 0)
+-    {
+-      GLuint dest_gl_tex;
+-      GLenum dest_gl_target;
+-
+-      cogl_texture_get_gl_texture (dest_texture, &dest_gl_tex, &dest_gl_target);
+-
+-      (*genFramebuffers) (1, &tower->fbos[level]);
+-      (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, tower->fbos[level]);
+-      (*framebufferTexture2D) (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+-                               dest_gl_target, dest_gl_tex, 0);
+-    }
+-  else
+-    {
+-      (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, tower->fbos[level]);
+-    }
+-
+-  /* Save the old state (other than the transformation matrices) */
+-  glPushAttrib (GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TEXTURE_BIT | GL_VIEWPORT_BIT);
+-
+-  /* And set up the state we need */
+-  glDisable (GL_BLEND);
+-  glDisable (GL_SCISSOR_TEST);
+-  glDisable (GL_STENCIL_TEST);
+-
+-  glDisable (GL_CLIP_PLANE3);
+-  glDisable (GL_CLIP_PLANE2);
+-  glDisable (GL_CLIP_PLANE1);
+-  glDisable (GL_CLIP_PLANE0);
+-
+-  cogl_texture_get_gl_texture (source_texture, &source_gl_tex, &source_gl_target);
+-
+-  (*activeTexture) (GL_TEXTURE0_ARB);
+-  if (source_gl_target == GL_TEXTURE_2D)
+-    glDisable (GL_TEXTURE_RECTANGLE_ARB);
+-  else
+-    glDisable (GL_TEXTURE_2D);
+-  glEnable (source_gl_target);
+-  glBindTexture (source_gl_target, source_gl_tex);
+-  glTexParameteri (source_gl_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+-  glTexParameteri (source_gl_target, GL_TEXTURE_WRAP_S, GL_CLAMP);
+-  glTexParameteri (source_gl_target, GL_TEXTURE_WRAP_T, GL_CLAMP);
+-
+-  glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+-
+-  /* In theory, we should loop over all the texture units supported
+-   * by the GL implementation, but here we just assume that no more
+-   * than three are used by Mutter and all GL implementations we care
+-   * about will support at least 3.
+-   */
+-  (*activeTexture) (GL_TEXTURE1_ARB);
+-  glDisable (GL_TEXTURE_2D);
+-  glDisable (GL_TEXTURE_RECTANGLE_ARB);
+-  (*activeTexture) (GL_TEXTURE2_ARB);
+-  glDisable (GL_TEXTURE_2D);
+-  glDisable (GL_TEXTURE_RECTANGLE_ARB);
+-
+-  glViewport (0, 0, dest_texture_width, dest_texture_height);
+-
+-  /* Save the transformation matrices and set up new ones that map
+-   * coordinates directly onto the destination texture */
+-  glMatrixMode (GL_MODELVIEW);
+-  glPushMatrix ();
+-  glLoadIdentity ();
+-
+-  glMatrixMode (GL_PROJECTION);
+-  glPushMatrix();
+-  glLoadIdentity ();
+-  glOrtho (0, dest_texture_width, 0, dest_texture_height, -1., 1.);
+-
+-  /* Draw */
+-
+-  dest_box = &tower->invalid[level];
+-  if (texture_is_rectangle (source_texture))
+-    {
+-      source_box.x1 = 2 * dest_box->x1;
+-      source_box.y1 = 2 * dest_box->y1;
+-      source_box.x2 = 2 * dest_box->x2;
+-      source_box.y2 = 2 * dest_box->y2;
+-    }
+-  else
+-    {
+-      source_box.x1 = (2. * dest_box->x1) / source_texture_width;
+-      source_box.y1 = (2. * dest_box->y1) / source_texture_height;
+-      source_box.x2 = (2. * dest_box->x2) / source_texture_width;
+-      source_box.y2 = (2. * dest_box->y2) / source_texture_height;
+-    }
+-
+-  glColor3f (0., 1., 1.);
+-
+-  glBegin (GL_QUADS);
+-  glTexCoord2f (source_box.x1, source_box.y1);
+-  glVertex2f (dest_box->x1, dest_box->y1);
+-  glTexCoord2f (source_box.x2, source_box.y1);
+-  glVertex2f (dest_box->x2, dest_box->y1);
+-  glTexCoord2f (source_box.x2, source_box.y2);
+-  glVertex2f (dest_box->x2, dest_box->y2);
+-  glTexCoord2f (source_box.x1, source_box.y2);
+-  glVertex2f (dest_box->x1, dest_box->y2);
+-  glEnd ();
+-
+-  /* And restore everything back the way we found it */
+-
+-  glMatrixMode (GL_PROJECTION);
+-  glPopMatrix ();
+-  glMatrixMode (GL_MODELVIEW);
+-  glPopMatrix ();
+-
+-  glPopAttrib ();
+-
+-  (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, 0);
+-
+-  return TRUE;
+-}
+-#endif
+ 
+ static void
+ fill_copy (guchar       *buf,
+diff --git a/src/compositor/tidy/tidy-texture-frame.c b/src/compositor/tidy/tidy-texture-frame.c
+index 1ea70ec..7ba4671 100644
+--- a/src/compositor/tidy/tidy-texture-frame.c
++++ b/src/compositor/tidy/tidy-texture-frame.c
+@@ -155,7 +155,7 @@ tidy_texture_frame_unrealize (ClutterActor *self)
+   if (priv->material == COGL_INVALID_HANDLE)
+     return;
+ 
+-  cogl_material_unref (priv->material);
++  cogl_handle_unref (priv->material);
+   priv->material = COGL_INVALID_HANDLE;
+ 
+   CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
+@@ -415,7 +415,7 @@ tidy_texture_frame_dispose (GObject *gobject)
+ 
+   if (priv->material)
+     {
+-      cogl_material_unref (priv->material);
++      cogl_handle_unref (priv->material);
+       priv->material = COGL_INVALID_HANDLE;
+     }
+ 
+--
+cgit v0.8.3.1
diff --git a/mutter-fixKeySym.patch b/mutter-fixKeySym.patch
deleted file mode 100644
index b3fa4e6..0000000
--- a/mutter-fixKeySym.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 03 Feb 2010 19:17:10 +0000
-Subject: [introspection] Include xlib.gir
-
-We need this for KeySym at least.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=607125
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5f76835..a3d892d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -214,6 +214,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mu
- 		--include=Clutter-1.0			\
- 		--pkg=clutter-1.0			\
- 		--pkg=gtk+-2.0				\
-+		--include=xlib-2.0			\
- 		--include=xfixes-4.0			\
- 		--program=$$pwd/mutter			\
- 		$(filter %.c,$(mutter_SOURCES))		\
---
-cgit v0.8.3.1
diff --git a/mutter-math-workaround.patch b/mutter-math-workaround.patch
deleted file mode 100644
index c9b8073..0000000
--- a/mutter-math-workaround.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=520209
-
-diff --git a/src/compositor/mutter-window-group.c b/src/compositor/mutter-window-group.c
-index e89327e..fdb75a2 100644
---- a/src/compositor/mutter-window-group.c
-+++ b/src/compositor/mutter-window-group.c
-@@ -1,6 +1,6 @@
- /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
- 
--#define _ISOC99_SOURCE /* for roundf */
-+#define _BSD_SOURCE /* for rintf */
- #include <math.h>
- 
- #include "mutter-window-private.h"
-@@ -27,7 +27,7 @@ G_DEFINE_TYPE (MutterWindowGroup, mutter_window_group, CLUTTER_TYPE_GROUP);
- static inline int
- round_to_fixed (float x)
- {
--  return roundf (x * 256);
-+  return rintf (x * 256);
- }
- 
- /* We can only (easily) apply our logic for figuring out what a window
-diff --git a/src/compositor/mutter-window.c b/src/compositor/mutter-window.c
-index 83080f8..e07be3d 100644
---- a/src/compositor/mutter-window.c
-+++ b/src/compositor/mutter-window.c
-@@ -1,6 +1,6 @@
- /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
- 
--#define _ISOC99_SOURCE /* for roundf */
-+#define _BSD_SOURCE /* for rintf */
- #include <math.h>
- 
- #include <X11/extensions/shape.h>
-@@ -1420,10 +1420,10 @@ mutter_window_set_visible_region_beneath (MutterWindow *self,
-        */
-       clutter_actor_get_allocation_box (priv->shadow, &box);
- 
--      shadow_rect.x = roundf (box.x1);
--      shadow_rect.y = roundf (box.y1);
--      shadow_rect.width = roundf (box.x2 - box.x1);
--      shadow_rect.height = roundf (box.y2 - box.y1);
-+      shadow_rect.x = rintf (box.x1);
-+      shadow_rect.y = rintf (box.y1);
-+      shadow_rect.width = rintf (box.x2 - box.x1);
-+      shadow_rect.height = rintf (box.y2 - box.y1);
- 
-       overlap = gdk_region_rect_in (beneath_region, &shadow_rect);
- 
-diff --git a/src/compositor/shadow.c b/src/compositor/shadow.c
-index b204440..67fa538 100644
---- a/src/compositor/shadow.c
-+++ b/src/compositor/shadow.c
-@@ -1,6 +1,6 @@
- /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
- 
--#define _GNU_SOURCE /* For M_PI */
-+#define _BSD_SOURCE /* For M_PI */
- 
- #include <math.h>
- 
-diff --git a/src/tools/mutter-mag.c b/src/tools/mutter-mag.c
-index 7c5cb3e..09e2a43 100644
---- a/src/tools/mutter-mag.c
-+++ b/src/tools/mutter-mag.c
-@@ -19,8 +19,7 @@
-  * 02111-1307, USA.
-  */
- 
--#define _GNU_SOURCE
--#define _XOPEN_SOURCE 600 /* C99 -- for rint() */
-+#define _BSD_SOURCE /* for rint() */
- 
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
-diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
-index 32fbc70..adfa922 100644
---- a/src/ui/preview-widget.c
-+++ b/src/ui/preview-widget.c
-@@ -21,9 +21,6 @@
-  * 02111-1307, USA.
-  */
- 
--#define _GNU_SOURCE
--#define _XOPEN_SOURCE 600 /* for the maths routines over floats */
--
- #include <math.h>
- #include <gtk/gtk.h>
- #include "preview-widget.h"
diff --git a/mutter.spec b/mutter.spec
index 382d05d..6763f56 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,24 +1,12 @@
-# Tarfile created using git
-# git clone git://git.gnome.org/anjal
-# git archive --format=tar --prefix=%{name}-%{version}/ %{git_version} | bzip2 > %{name}-%{version}-%{gitdate}.tar.bz2
-
-%define gitdate 20100127
-%define git_version 5764176 
-%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2
-%define snapshot %{gitdate}git%{git_version}
-
 Name:          mutter
-Version:       2.28.1
-Release:       0.2%{?dist}
+Version:       2.29.0
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
 License:       GPLv2+
-URL:           http://git.gnome.org/cgit/mutter
-# Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
-Source0:       %{tarfile}
-Patch0:        mutter-fixKeySym.patch
-Patch1:        mutter-2.28.1-add-needed.patch
+Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Patch0:        mutter-clutter12.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-devel
@@ -42,7 +30,6 @@ BuildRequires: intltool
 BuildRequires: gnome-doc-utils
 BuildRequires: desktop-file-utils
 
-#Temp while we're using git master
 BuildRequires: libtool
 BuildRequires: gnome-common
 
@@ -77,11 +64,9 @@ utilities for testing Metacity/Mutter themes.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fixKeySym
-%patch1 -p1 -b .add-needed
+%patch0 -p1 -b .clutter12
 
-# run autogen.sh until we have a proper release
-NOCONFIGURE=yes ./autogen.sh
+autoreconf
 
 %build
 %configure --with-clutter --disable-static
@@ -168,6 +153,9 @@ gconftool-2 --makefile-install-rule \
 %doc %{_mandir}/man1/mutter-window-demo.1.gz
 
 %changelog
+* Wed Mar 17 2010 Peter Robinson <pbrobinson@gmail.com> 2.29.0-1
+- New upstream 2.29.0 release
+
 * Tue Feb 16 2010 Adam Jackson <ajax@redhat.com> 2.28.1-0.2
 - mutter-2.28.1-add-needed.patch: Fix FTBFS from --no-add-needed
 
diff --git a/sources b/sources
index 1fcd2b8..5373f67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16cd4fc93466166a55e2e7a0275a8b7f  mutter-2.28.1-20100127.tar.bz2
+8676b7b42b1b923afbd3363d1711acf9  mutter-2.29.0.tar.bz2