commit 1680f11565dc31a09b58dd98d812f7e35cb5e2a4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date:   Wed Jul 14 12:12:10 2010 +0100

    Release 1.2.12 (stable)

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

commit e0a425a817e16b142b6e91e3248eb6d139503348
Author: Neil Roberts <neil@linux.intel.com>
Date:   Fri Jun 18 11:12:51 2010 +0100

    clutter-animation: Fix for using fixed:: from clutter_actor_animatev
    
    When using clutter_actor_animatev it would set a boolean whenever a
    property begins with "fixed::". However it would never clear the
    variable so it would end up marking all subsequent properties as
    fixed.
    
    http://bugzilla.openedhand.com/show_bug.cgi?id=2180
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2149
    
    (cherry picked from commit 8512423f22995dced954b9b5c5e6481af83ba5a0)

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

commit fbc210859aa99fd048f6313923a7ba876f4c9d4d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date:   Wed Jun 23 18:46:38 2010 +0100

    Change the Bugzilla link in the configure script
    
    Slightly edited when backporting from master:
    
      f60999becfc40af940eba23cd2dbdd8dd2455b1a

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

commit d488de090428796a0a8bee307a5d89f0ad1f5c5c
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date:   Wed Jun 23 18:46:52 2010 +0100

    doap: Update after the infrastructure changes
    (cherry picked from commit 4e5c84ebc5fba38afdf0593f830dc2ea08098a30)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 clutter.doap |   64 ++++-----------------------------------------------------
 1 files changed, 5 insertions(+), 59 deletions(-)

commit c654f5d704e8c131937de077a549aaf134993f9e
Author: Elliot Smith <elliot.smith@intel.com>
Date:   Thu Jun 24 11:23:50 2010 +0100

    docs: Fix example code in BindingPool
    
    The code sample in the gtk-doc annotations for ClutterBindingPool shows
    the arguments in the wrong order.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2133
    
    (cherry picked from commit 213cd30cebfb58df1298a13adf528755aad6cdfa)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 clutter/clutter-binding-pool.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit e252b1840cb2286a60449baf73ce3d8f04b1e6ef
Author: Alejandro Piñeiro <apinheiro@igalia.com>
Date:   Wed Apr 14 18:07:21 2010 +0200

    Improve clutter_text_get_chars doc
    
    Explicitly explain that end_pos is not included with the resulting
    string
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2081
    (cherry picked from commit d37dee8258ec2a10f5825694376cc27bc43b8f93)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

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

commit 93ef2ae41398b12cdd3d8b7bd5079a99e85de549
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date:   Thu Jun 24 17:21:26 2010 +0100

    actor: Top-levels should always report a 255 opacity
    
    The paint opacity should always assume a fully opaque top-level at the
    end, otherwise the scene would be rendered fully transparent.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2050
    (cherry picked from commit a950388bc68a0fbdb76bf83cc0673bdca2f1d1d5)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 clutter/clutter-actor.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 33e10f06aaa806a84a8d4cae4376337b1973ad52
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date:   Thu Jun 24 17:19:36 2010 +0100

    actor: Ignore the NOP paint at 0 opacity for top-levels
    
    A top-level actor could still have 0 opacity (e.g. a Stage with the
    :use-alpha property set to TRUE), but we want its children to still
    be painted.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2050
    (cherry picked from commit 42df1a150b8ecb49f02a5780b9f9c983221c97ea)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 clutter/clutter-actor.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit d2dafa94ab992b04d184c42963832af56aa80099
Author: Neil Roberts <neil@linux.intel.com>
Date:   Thu Jun 24 17:33:43 2010 +0100

    test-conformance: Use -export-dynamic instead of -rdynamic
    
    The -rdynamic linker option is specific to ELF so it was breaking
    builds on systems with other object formats such as Windows and
    Solaris. This patch replaces that option with -export-dynamic which is
    a portable libtool option which should do the right thing on each
    platform.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=1930
    (cherry picked from commit fbeab378289a0e9f9470aa9f532003cf66529970)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 tests/conform/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 060e7d57d7880179026121dc7a0226c3e02be540
Author: Colin Walters <walters@verbum.org>
Date:   Tue Jun 29 16:25:18 2010 +0100

    autogen.sh: Support NOCONFIGURE, like gnome-common
    
    (cherry picked from commit f64c66ede8c3edea31931bae4edcb4c10f53d93a)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 autogen.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit f623c8eec33038c74c8fd1d976d40241df4dc199
Author: Alexandros Frantzis <alexandros.frantzis@linaro.org>
Date:   Tue Jul 6 13:24:00 2010 +0100

    build: Exclude built sources from the dist
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2169
    
    (cherry picked from commit 140f76abf44594dc6b004b381e3ec24b6ecdc208)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 clutter/cogl/cogl/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 1433cb28dc14e616bbc4d3b882d7d36f94cacecb
Author: Robert Bragg <robert@linux.intel.com>
Date:   Tue Jul 6 16:47:09 2010 +0100

    osx: explicitly request depth and stencil buffer bits
    
    This is a blind patch because I don't know enough about the osx backend
    and the osx backend probably doesn't even work these days anyway but
    since people have filed bugs specifically on OSX that imply they don't
    have a depth or stencil buffer this tries to fix that.
    
    Maybe someone will eventually pick up the osx backend again and verify
    if this helps.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=1394
    (cherry picked from commit 279e68d8d9a84356c83e32502c5bc5af5160da08)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

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

commit 255143fbdb52e926868d5fa4f3851dfbecfcd17d
Author: Neil Roberts <neil@linux.intel.com>
Date:   Fri Jul 9 18:24:28 2010 +0100

    Add cogl_vertex_buffer_is_indices to the public headers
    
    This function has always been defined in the shared library but it was
    missed from the public headers.
    (cherry picked from commit 0e839c37693339287232f0292283f92522fa3ca5)
    
    Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

 clutter/cogl/cogl/cogl-vertex-buffer.h |   15 +++++++++++++++
 doc/reference/cogl/cogl-sections.txt   |    1 +
 2 files changed, 16 insertions(+), 0 deletions(-)

commit e313cfd432fc1d390f304b7ec57d0145ef17c067
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Tue Jul 6 13:38:16 2010 +0100

    animator: fix removal of multiple keys
    
    When removing keys, sometimes a couple of keys would be remaining.

 clutter/clutter-animator.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

commit 3e4a6c6fc90ba80a3247b91d77ebed0d47589b81
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Wed Jun 16 17:43:44 2010 +0100

    animator: avoid walking off empty list
    
    When removing the last key in a list, the last part of the for statement
    could cause dereferencing (NULL)->next and thus segfaulting.

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

commit ae791acdd32f75c6276d62981cf6d77d5a8cb0a0
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Mon May 17 18:05:19 2010 +0100

    animator: fix issue of dropped frames towards end of animations

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

commit 85a0d04df87e254c0248987abe4fb2e573f68c89
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Wed May 5 18:15:12 2010 +0100

    animator: fix looping when doing cubic interpolation
    
    When using interpolation and the last key is not at 1.0 a bouncing
    artifact could be observed after the keys.

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

commit 261bd3e6681e41134652034df9ba05b2b202ecb6
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Wed May 5 16:55:16 2010 +0100

    animator: only keys that are removed due to actors disappearing are inert

 clutter/clutter-animator.c |   58 ++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 20 deletions(-)

commit 016365f2870735edb2e0cb241f5ff963f5517d3f
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Wed May 5 13:48:34 2010 +0100

    animator: refactoring
    
    renamed KeyAnimator to PropertyIter

 clutter/clutter-animator.c |  167 ++++++++++++++++++++++----------------------
 1 files changed, 84 insertions(+), 83 deletions(-)

commit e231ee3144c3096b61fe15d149362db6f34bc134
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Wed May 5 13:58:15 2010 +0100

    animator: retain ease-in/interpolation when changing first key
    
    Duplicate the existing ease-in/interpolation mode for the property when
    removing, replacing the first key for a property or adding a new first
    key for a property.

 clutter/clutter-animator.c |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

commit 637ab4e476c9cac4500915490c4cd827f0b2da96
Author: Øyvind Kolås <pippin@linux.intel.com>
Date:   Wed May 5 13:34:06 2010 +0100

    animator: fix crash when setting keys on running animator
    
    When inserting or modifying keys of a running animator the internal
    iterators per property could go out of sync. Reinitializing the
    iterators if the timeline is running avoids this.

 clutter/clutter-animator.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 13edba01753d07bdee8df68aa9f7011f3457a40d
Author: Neil Roberts <neil@linux.intel.com>
Date:   Tue Jul 6 16:08:06 2010 +0100

    cogl-vertex-buffer: Fix the #define for glDisableVertexAttribArray
    
    glDisableVertexAttribArray was defined to glEnableVertexAttribArray so
    it would probably cause crashes if it was ever used. Presumably
    nothing is using these yet because the generic attributes are not yet
    tied to shader attributes in a predictable way.
    
    (cherry picked from commit ced7915ea1977bd9d9aa2a70f54f1f2f774ed567)

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

commit 8769a627012463ace69d84b607c2e4387c0a8c0b
Author: Chris Lord <chris@linux.intel.com>
Date:   Tue Jun 29 15:30:25 2010 +0100

    event: Typos in event code could cause crashes
    
    A typo in clutter-event.c meant that the wrong struct location could be
    used for the input device of key events. Also, a typo in the X11 event
    code meant that key-presses would come from the pointer device (releases
    would still come from the keyboard device).

 clutter/clutter-event.c         |    2 +-
 clutter/x11/clutter-event-x11.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit e32b04295c047e59b1e478cfcdfe262cda28079a
Author: Neil Roberts <neil@linux.intel.com>
Date:   Thu Jun 24 18:14:04 2010 +0100

    clutter-event-win32: Emit multiple events for WM_MOUSEWHEEL Messages
    
    It's possible that a single WM_MOUSEWHEEL event can arrive with a
    scroll amount greater than WHEEL_DELTA. Previously it would accumulate
    these amounts but it would still only emit a single event per
    message. For example, if a message arrived that is worth two
    WHEEL_DELTAs then it would emit one event and leave scroll_pos as
    +WHEEL_DELTA. If the wheel is then scrolled in the opposite direction
    then wheel delta would end up as zero and the scroll event would get
    lost.
    
    This patch fixes it so that it always emits enough events to put
    scroll_pos back to less than WHEEL_DELTA.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2135
    
    (cherry picked from commit 527ad961ab039c55f7cc0cc3066aedcf183db857)

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

commit f33721980afe80524dbf31a61802f88b13c2cd1c
Author: Neil Roberts <neil@linux.intel.com>
Date:   Thu Jun 24 18:07:20 2010 +0100

    clutter-event-win32: Directly enqueue events in message_translate
    
    Previously the window procedure for the stage window would always
    create a ClutterEvent struct for every message and then pass that on
    to message_translate to fill in the details. message_translate could
    return FALSE to abandon the event. Instead of this, message_translate
    now creates and queues the event itself whenever it sees a message
    that could translate to an event. The function now returns void. This
    has a number of advantages:
    
    * It saves redundantly allocating events for messages that Clutter
      doesn't care about.
    
    * A single message can now easily be translated into multiple events.
    
    * There were some messages that were handled and did not fill in the
      event struct but did not cause the function to return FALSE. I think
      this would end up with a CLUTTER_NOTHING event being emitted.
    
    http://bugzilla.clutter-project.org/show_bug.cgi?id=2135
    
    (cherry picked from commit 2c8d73f0472798896a6528359f82f8ea6f7589e2)

 clutter/win32/clutter-event-win32.c |  297 +++++++++++++++++++----------------
 1 files changed, 162 insertions(+), 135 deletions(-)

commit c5e628503eb088d58f5a0a48d1cde07f0d35ea5d
Author: Robert Bragg <robert@linux.intel.com>
Date:   Wed Jun 9 02:42:01 2010 +0100

    stage-glx: Never promote clipped redraws to full redraws.
    
    When clipped redraws were first supported in Clutter a heuristic was
    added to promote tall clipped redraws into full redraws due to a concern
    that using glXCopySubBuffer for tall rectangles would block the GPU for
    too long waiting for the vtrace to be in a suitable position so that
    tearing isn't seen. We've so far been unable to measure any impact from
    this blocking even with full height windows so we are removing the
    arbitrary threshold of 300px that was originally "plucked out of thin
    air".
    
    http://bugzilla.o-hand.com/show_bug.cgi?id=2136
    (cherry picked from commit 56315d92bd9e961450746d9f9c973f937be20aa6)

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

commit f3066cfaa53000811d90bd16b4394626e364fb38
Author: Robert Bragg <robert@linux.intel.com>
Date:   Thu Jun 3 20:03:20 2010 +0100

    backend-glx: Avoid vblank waits/glFinish calls when throttling blits
    
    If we have the GLX_SGI_video_sync extension then it's possible to always
    keep track for the video sync counter each time we call glXSwapBuffers
    or do a sub stage blit. This then allows us to avoid waiting before
    issuing a blit if we can see that the counter has already progressed.
    
    Also since we expect that glXCopySubBuffer is synchronized to the vblank
    we don't need to use glFinish () in conjunction with the vblank wait
    since the vblank wait's only purpose is to add a delay.
    (cherry picked from commit 30296a3307b68ce64a2111a07abc9944547b8cdb)

 clutter/glx/clutter-backend-glx.c |    2 +
 clutter/glx/clutter-backend-glx.h |    2 +
 clutter/glx/clutter-stage-glx.c   |   97 +++++++++++++++++++++++++++----------
 3 files changed, 75 insertions(+), 26 deletions(-)

commit 9f119d313805f80823352c943a0a099ea48adef8
Author: Robert Bragg <robert@linux.intel.com>
Date:   Thu Jun 3 23:12:08 2010 +0100

    backend-glx: only check for GLX_SGI_video_sync for direct contexts
    
    The GLX_SGI_video_sync spec explicitly says that it's only supported for
    direct contexts so we don't setup up the function pointers if
    glXIsDirect () returns GL_FALSE.
    (cherry picked from commit 1b31ac465dc63b2a2639c63267d2a351dd6ea8ea)

 clutter/glx/clutter-backend-glx.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 64972c3e942a6b875bd7678431c477752135e6b4
Author: Robert Bragg <robert@linux.intel.com>
Date:   Thu Jun 3 20:03:20 2010 +0100

    backend-glx: Make sure to throttle sub region blits
    
    Neither glXCopySubBuffer or glBlitFramebuffer are integrated with the
    swap interval of a framebuffer so that means when we do partial stage
    updates (as Mutter does in response to window damage) then the blits
    aren't throttled which means applications that throw lots of damage
    events at the compositor can effectively cause Clutter to run flat out
    taking up all the system resources issuing more blits than can even be
    seen.
    
    This patch now makes sure we use the GLX_SGI_video_sync or a
    DRM_VBLANK_RELATIVE ioctl to throttle blits to the vblank frequency as
    we do when using glXSwapBuffers.
    (cherry picked from commit f37de23dec316e1d4ed616c890339bfd3b4cbfa4)

 clutter/glx/clutter-backend-glx.c |   20 +++++++---
 clutter/glx/clutter-stage-glx.c   |   69 +++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 43 deletions(-)

commit 21846e417c9302fa16b3ffca4fb34e3c622e0d32
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date:   Sat Jun 5 12:51:32 2010 +0200

    backend-glx: Provide copy_sub_buffer fallback
    
    Currently glXCopySubBufferMESA is used for sub stage redraws, but in case
    a driver does not support GLX_MESA_copy_sub_buffer we fall back to redrawing
    the complete stage which isn't really optimal.
    
    So instead to directly fallback to complete redraws try using GL_EXT_framebuffer_blit
    to do the BACK to FRONT buffer copies.
    
    http://bugzilla.openedhand.com/show_bug.cgi?id=2128
    (cherry picked from commit 630a2c5edcd572ea77d0a52026115fc01e5ec14a)

 clutter/glx/clutter-backend-glx.c |   35 +++++++++++++++++++++++++++++++++++
 clutter/glx/clutter-backend-glx.h |   17 +++++++++++++++++
 clutter/glx/clutter-stage-glx.c   |   30 ++++++++++++++----------------
 3 files changed, 66 insertions(+), 16 deletions(-)

commit f92f19171edeb8ffebf1aa6da05ea5ae81aadc86
Author: Neil Roberts <neil@linux.intel.com>
Date:   Mon Jun 14 13:03:09 2010 +0100

    clutter-text: Round the layout width to nearest integer not down
    
    When converting the floating point allocation width to an integer
    multiple of PANGO_SCALE to give to the PangoLayout it can sometimes
    end up slightly short of the allocated size due to rounding
    errors. This can cause some of the lines to be wrapped differently
    when a non-integer-aligned position is used (such as when animating
    text). It works better to round the number to the nearest integer by
    adding 0.5 instead of letting the default float cast truncate it
    downwards.
    
    http://bugzilla.openedhand.com/show_bug.cgi?id=2170
    
    (cherry picked from commit 38da6b4a0eacbe0c7e40bc5d237bf31030fcc57d)
    
    Conflicts:
    
    	clutter/clutter-text.c

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

commit 91403ca927f58001968ef7b4c3aca5fc472f91a5
Author: Neil Roberts <neil@linux.intel.com>
Date:   Fri Jun 11 14:47:30 2010 +0100

    cogl/winsys/cogl-eglx: Use the right egl header on 1.1
    
    Commit b0cc98fdceb introduced a #include for the egl header in
    cogl-eglx.c The header name is different under GLES 1.1 so it broke
    compilation.
    
    (cherry picked from commit ded9322a7ab13dc0ab2d5470164909d764eaa436)

 clutter/cogl/cogl/winsys/cogl-eglx.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit adb9ce51ec856ed73423cabd00ad2cec7eb6b73d
Author: Neil Roberts <neil@linux.intel.com>
Date:   Fri Jun 11 14:37:56 2010 +0100

    cogl-program: Add cogl_program_uniform_1i to GLES
    
    The GLES 1.1 backend was missing a stub for cogl_program_uniform_1i.
    
    (cherry picked from commit 64e6cf69d74f9501914bf1f0a6738d897d83aaa5)

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

commit 8da7fcf452f30c29bb54bdbcf0b69314da8f49f8
Author: Neil Roberts <neil@linux.intel.com>
Date:   Fri Jun 11 14:36:38 2010 +0100

    cogl-gles2: Prefix internal GLES 2 wrapper symbols with _
    
    Some internal symbols used for the GLES 2 wrapper were accidentally
    being exported. This prepends an underscore to them so they won't
    appear in the shared library.
    
    (cherry picked from commit 181b46933a16f7649d2c50b928d10e765ad0a522)

 .../cogl/cogl/driver/gles/cogl-context-driver.c    |    2 +-
 .../driver/gles/cogl-fixed-fragment-shader.glsl    |   30 ++--
 .../cogl/driver/gles/cogl-fixed-vertex-shader.glsl |   24 ++--
 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c |  201 ++++++++++----------
 clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h |  192 ++++++++++----------
 .../cogl/cogl/driver/gles/cogl-texture-driver.c    |    2 +-
 6 files changed, 226 insertions(+), 225 deletions(-)

commit 1dc2858a6f31cffc61590430ec22e537efa154fb
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date:   Tue Jun 8 11:56:02 2010 +0100

    Post-release version bump to 1.2.11

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