commit 1176b3b87e20e05e520ef73fbb9da94692efd1e9
Author: Emmanuele Bassi <[email protected]>
Date:   Fri Sep 24 16:34:50 2010 +0100

   Clutter 1.2.14 (stable)

NEWS         |   24 ++++++++++++++++++++++++
configure.ac |    4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)

commit cc7bbf0092d79a29b8d3ca59c24895bf0d833bc7
Author: Alexandros Frantzis <[email protected]>
Date:   Tue Aug 17 13:28:58 2010 +0300

   Remove false dependency on OpenGL for OpenGL ES builds.

   http://bugzilla.clutter-project.org/show_bug.cgi?id=2272

configure.ac |    3 ---
1 files changed, 0 insertions(+), 3 deletions(-)

commit 97501a409321e0541f554b43dabbb5e0841fca2c
Author: Alexandros Frantzis <[email protected]>
Date:   Tue Aug 17 13:01:29 2010 +0300

   Backport GLES 1.1 detection code from clutter 1.3.x.

   Correctly detect various GLES v1.1 libraries (with or without additional
   EGL libraries).

   http://bugzilla.clutter-project.org/show_bug.cgi?id=2271

configure.ac |   75 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 41 insertions(+), 34 deletions(-)

commit 9268d4c44514a2ed127eba228e3f485a4908d165
Author: Emmanuele Bassi <[email protected]>
Date:   Tue Sep 21 12:07:04 2010 +0100

   keysyms: Update from master

   Update the keysyms header from master.

clutter/clutter-keysyms.h |  205 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 190 insertions(+), 15 deletions(-)

commit 632c7e8a37ed444f79014b2a25313c7ecd85f31e
Author: Neil Roberts <[email protected]>
Date:   Mon Sep 20 12:04:51 2010 +0100

   clutter-box-layout: Swap the default request mode

   The request mode set by the box layout was previously width-for-height
   in a vertical layout and height-for-width in a horizontal layout which
   seems to be wrong. For example, if width-for-height is used in a
   vertical layout then the width request will come second with the
   for_height parameter set. However a vertical layout doesn't pass the
   for_height parameter on to its children so doing the requests in that
   order doesn't help. If the layout contains a ClutterText then both the
   width and height request for it will have -1 for the for_width and
   for_height parameters so the text would end up allocated too small.

   http://bugzilla.clutter-project.org/show_bug.cgi?id=2328

   (cherry picked from commit 8f4d61e663770d6a24b75d77418a145eba7c104f)

clutter/clutter-box-layout.c |    6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

commit 813a2046b29024bb12550b52694cccfedd302062
Author: Emmanuele Bassi <[email protected]>
Date:   Tue Jun 8 11:19:28 2010 +0100

   texture-async: Fix path fallback code

   And error out in case of load failure.
   (cherry picked from commit 00675f42aab932b2a2cb7d128d282625f681e449)

tests/interactive/test-texture-async.c |   14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)

commit e6bec829abcc424dfd5e180b1f5d6baf0de28fac
Author: Neil Roberts <[email protected]>
Date:   Wed Jul 14 19:39:24 2010 +0100

   gles/cogl-shader.c: Store the shader type in CoglShader

   Nothing was storing the shader type when a shader was created so it
   would get confused about whether it was a custom vertex or fragment
   shader.

   Also the 'type' member of CoglShader was a GLenum but the only place
   that read it was treating it as if it was CoglShaderType. This changes
   it be CoglShaderType.

   (cherry picked from commit ec26466cdce5b701af7c82bce4588cb6f2e3180c)

.../cogl/cogl/driver/gles/cogl-shader-private.h    |    2 +-
clutter/cogl/cogl/driver/gles/cogl-shader.c        |    1 +
2 files changed, 2 insertions(+), 1 deletions(-)

commit bf3f393e53744cf26471422f8cb18395e73fc457
Author: Neil Roberts <[email protected]>
Date:   Wed Jul 14 19:38:38 2010 +0100

   Flush the journal before setting a user program in GLES2

   Like the big GL backend, GLES2 needs to flush the journal before
   setting a user program because the current program is not logged in
   the journal.

clutter/cogl/cogl/driver/gles/cogl-program.c |    6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

commit 6309c5daa8266babfe8a94188540c0eabab7c2b9
Author: Neil Roberts <[email protected]>
Date:   Wed Jul 14 19:45:06 2010 +0100

   Fix test-shader for GLES2

   The tests can't rely on using the internal HAVE_* macros that are
   generated by configure.ac. It's better to use the public COGL_HAS_*
   macros from cogl-defines.h This was causing it to use the GL versions
   of the variable names.

tests/interactive/test-shader.c |   12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

commit 7e9080ab0c9aec611483faf9fb5a0688c2927e6e
Author: Neil Roberts <[email protected]>
Date:   Thu Jul 22 17:27:04 2010 +0100

   test-shader: Unref the ClutterShader after setting it on an actor

   Otherwise the test leaks the shader object and the underlying GLSL
   program.

   (cherry picked from commit 616eccdad63ce35d5ce59094cf026970b799cf09)

tests/interactive/test-shader.c |    4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

commit 4ef0995acb2de2c926049e293c1a659a1a9eb456
Author: Neil Roberts <[email protected]>
Date:   Thu Jul 22 16:58:23 2010 +0100

   Plug the leaking CoglProgram and CoglShader

   _cogl_program_free and _cogl_shader_free never freed the struct their
   structs so it would end up leaking a little bit.

   (cherry picked from commit 87e77f9a22785b8b11f7cdb4dc82841aa34c6e83)

clutter/cogl/cogl/driver/gl/cogl-program.c   |    2 ++
clutter/cogl/cogl/driver/gl/cogl-shader.c    |    2 ++
clutter/cogl/cogl/driver/gles/cogl-program.c |    2 ++
clutter/cogl/cogl/driver/gles/cogl-shader.c  |    2 ++
4 files changed, 8 insertions(+), 0 deletions(-)

commit 3a4344b0ec83fb40dbb589eabf46acda69055005
Author: Neil Roberts <[email protected]>
Date:   Thu Jul 15 17:10:31 2010 +0100

   test-shader: The tex_coord varying is now an array under GLES2

   Since the GLES2 wrapper grew support for multi-texturing, the
   tex_coord varying variable defined in the vertex shader is actually an
   array of texture coordinates so it ought to match in the fragment
   shader in test-shader. This seemed to work anyway under Mesa/Intel but
   under NVidia it does not so I don't think it's safe to assume that
   linking a non-array varying with an array will work.

   (cherry picked from commit a1c74209795c341dc89dbe2f6c3a91242a8c813c)

tests/interactive/test-shader.c |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

commit f49292e91b61e9556ab4be6fc3c1879c55746354
Author: Neil Roberts <[email protected]>
Date:   Tue Jul 20 17:34:04 2010 +0100

   cogl-material: Don't map the shininess value to [0,1]

   In OpenGL the 'shininess' lighting parameter is floating point value
   limited to the range 0.0→128.0. This number is used to affect the size
   of the specular highlight. Cogl materials used to only accept a number
   between 0.0 and 1.0 which then gets multiplied by 128.0 before sending
   to GL. I think the assumption was that this is just a weird GL quirk
   so we don't expose it. However the value is used as an exponent to
   raise the attenuation to a power so there is no conceptual limit to
   the value.

   This removes the mapping and changes some of the documentation.

   http://bugzilla.clutter-project.org/show_bug.cgi?id=2222

clutter/cogl/cogl/cogl-material.c |    4 ++--
clutter/cogl/cogl/cogl-material.h |    9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)

commit fc09f9d51e84d6bed505b3fe3a2b7d0f712da5a2
Author: Neil Roberts <[email protected]>
Date:   Thu Jul 22 10:04:06 2010 +0100

   Minor fix to the documentation for clutter_texture_get_sync_size

   The documentation was recursively referring to itself causing a stack
   overflow in the reader's brain.

   http://bugzilla.clutter-project.org/show_bug.cgi?id=2233

   (cherry picked from commit 1dee65770a7eba85c899890e652d4cf32744c71a)

clutter/clutter-texture.c |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 4600615be61a1d73abfd4d521308e9512a01f475
Author: Nate Stedman <[email protected]>
Date:   Wed Jul 14 14:46:23 2010 -0400

   Fixes build with GLX on Mac OS X.

   Moves preprocessor #ifdef __linux_ above else statement, avoiding the
   lack of an else block if __linux__ is not defined.

   http://bugzilla.clutter-project.org/show_bug.cgi?id=2212

   Signed-off-by: Emmanuele Bassi <[email protected]>
   (cherry picked from commit fff5558ad25d3a633657c2bd4558132b21dc8ab8)

clutter/glx/clutter-stage-glx.c |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 9f00bcc0af5263aee3d2241276c724b07ca684d7
Author: Emmanuele Bassi <[email protected]>
Date:   Wed Jul 14 12:29:04 2010 +0100

   Post-release version bump to 1.2.13

configure.ac |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)