commit bb5608532eb49d51b2f7d92260403806da5c0d80
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 7 15:42:45 2011 +0000
Release Clutter 1.6.2
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 3e857802a8a94718f483f14c0567c0a6dbe2338e
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 7 15:42:23 2011 +0000
Update NEWS
NEWS | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
commit 615c200707411bad14d6864e679ec8c279ec276b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Feb 7 15:40:09 2011 +0000
build: Fix the Cally pkg-config file
Do not use ${winsys}: use ${soname_infix} instead.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2549
clutter/cally/cally.pc.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 9fa85ee9bfa1848f5058d3c9e42aecb2e5865712
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 3 16:25:42 2011 +0000
osx: Add more checks to the redraw function
The redraw function might be called during destruction phase, when the
Stage state has not entirely been tore down. We need to be slightly more
resilient to that scenario.
clutter/osx/clutter-backend-osx.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
commit d846f5fe6a63ef95d1ce12d573b36521f8defd90
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 3 11:30:10 2011 +0000
Add some more sanity checks to clutter_do_event()
Silently ignore events on stages during destruction; but print out a
warning if clutter_do_event() is being called with a stage-less event.
clutter/clutter-main.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
commit 63e88d9840743bf131bc6861112c94c5d8905fbc
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 3 11:26:09 2011 +0000
stage: Unconditionally create the devices hash table
clutter/clutter-stage.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
commit f133d84c026a5c7737c348a85c70f49ab1adb90d
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Feb 3 11:25:28 2011 +0000
stage: Do not update when destroying a stage
During the stage destruction we should just skip event processing, since
we cannot guarantee that the stage is actually valid.
clutter/clutter-stage.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit 901ed3256863118b28bd843e56449b9ee51160da
Author: Viatcheslav Gachkaylo <vgachkaylo@crystalnix.com>
Date: Thu Feb 3 14:51:20 2011 +0600
Fixed bugs with mouse events.
Enter/leave events are now being received. Mouse move events
now work properly.
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
http://bugzilla.clutter-project.org/show_bug.cgi?id=2545
clutter/Makefile.am | 2 ++
clutter/osx/clutter-backend-osx.c | 3 ++-
clutter/osx/clutter-backend-osx.h | 7 +++++--
clutter/osx/clutter-device-manager-osx.h | 2 ++
clutter/osx/clutter-event-loop-osx.c | 2 +-
clutter/osx/clutter-event-osx.c | 10 ++++++----
clutter/osx/clutter-stage-osx.c | 6 ++++++
7 files changed, 24 insertions(+), 8 deletions(-)
commit cef380040d02a597eae33557a7597cc6029d4291
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 2 14:43:38 2011 +0000
osx: Use _clutter_event_push()
Do not operate directly on the event queue, but use the wrapper call
that all backends share.
clutter/osx/clutter-event-osx.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
commit af22290f0d8822105c11f038723bbb3e4d0c3471
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Feb 2 14:41:57 2011 +0000
osx: Re-add the event time
Some overzealous diffing led to a missing call to setting the time of a
ClutterEvent from the corresponding NSEvent.
clutter/osx/clutter-event-osx.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
commit 55e26e23df68ff8f18bc75eb6b3512edbe852456
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Feb 1 18:43:27 2011 +0000
cogl-vertex-buffer: Use a ref count on the pipeline private data
The pipeline private data is accessed both from the private data set
on a CoglPipeline and the destroy notify function of a weak material
that the vertex buffer creates when it needs to override the wrap
mode. However when a CoglPipeline is destroyed, the CoglObject code
first removes all of the private data set on the object and then the
CoglPipeline code gets invoked to destroy all of the weak children. At
this point the vertex buffer's weak override destroy notify function
will get invoked and try to use the private data which has already
been freed causing a crash.
This patch instead adds a reference count to the pipeline private data
stuct so that we can avoid freeing it until both the private data on
the pipeline has been destroyed and all of the weak materials are
destroyed.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2544
clutter/cogl/cogl/cogl-vertex-buffer.c | 33 ++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 6 deletions(-)
commit 5740a5a38a4d0a0b22e62ea0035b8e360c7a6cc0
Author: Neil Roberts <neil@linux.intel.com>
Date: Tue Feb 1 17:38:58 2011 +0000
cogl-pipeline: Fix comparing the color in set_layer_combine_constant
In cogl_pipeline_set_layer_combine_constant it was comparing whether
the new color is the same as the old color using a memcmp on the
constant_color parameter. However the combine constant is stored in
the layer data as an array of four floats but the passed in color is a
CoglColor (which is currently an array of four guint8s). This was
causing valgrind errors and presumably also the check for setting the
same color twice would always fail.
This patch makes it do the conversion to a float array upfront before
the comparison.
clutter/cogl/cogl/cogl-pipeline.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
commit a573ad05c93ee2002882569d09def280ac9f9367
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 1 14:44:22 2011 +0000
event: The device setter work on sub-types
Instead of just setting the input device pointer in the private event
data, it should also set the field in the event sub-types, so that
direct access to the structures still works.
clutter/clutter-event.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit 8fc462269db02dc076067d9b5262e6a5492215a9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 1 14:38:08 2011 +0000
build: Pass --enable-cookbook when distchecking
We should force building the cookbook when releasing a tarball of
Clutter, so that users of packaged tarballs can actually build the
cookbook themselves.
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 428f64212c2c510f7c4484fda189b8fdb4249bc0
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 1 14:33:29 2011 +0000
build: Fixes to pass distcheck
Try to make the cookbook pass the distcheck phase, so that we can run
distcheck with --enable-docs, and make sure that a tarballed clutter
release can actually build the cookbook.
doc/cookbook/Makefile.am | 112 +++++++++++++++++++------------------
doc/cookbook/examples/Makefile.am | 70 ++++++++++++------------
2 files changed, 93 insertions(+), 89 deletions(-)
commit 6f1e5010d90ed74dacfaaf8807ffa6704a8d5329
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 1 14:32:41 2011 +0000
docs: Switch a 'Since' annotation in CallyActor
Since doesn't like it when it's not the last annotation.
clutter/cally/cally-actor.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 2ded18933e767afa6859d35de3de15850743d798
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Jan 31 18:53:51 2011 +0000
cogl-matrix: Get rid of the *_packed variants
cogl_matrix_project_points and cogl_matrix_transform_points had an
optimization for the common case where the stride parameters exactly
match the size of the corresponding structures. The code for both when
generated by gcc with -O2 on x86-64 use two registers to hold the
addresses of the input and output arrays. In the strided version these
pointers are incremented by adding the value of a register and in the
packed version they are incremented by adding an immediate value. I
think the difference in cost here would be negligible and it may even
be faster to add a register.
Also GCC appears to retain the loop counter in a register for the
strided version but in the packed version it can optimize it out and
directly use the input pointer as the counter. I think it would be
possible to reorder the code a bit to explicitly use the input pointer
as the counter if this were a problem.
Getting rid of the packed versions tidies up the code a bit and it
could potentially be faster if the code differences are small and we
get to avoid an extra conditional in cogl_matrix_transform_points.
clutter/cogl/cogl/cogl-matrix.c | 246 ++++++++-------------------------------
1 files changed, 50 insertions(+), 196 deletions(-)
commit c4d4a5469af9ac8e426c5321a4407409cddf93c9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue Feb 1 12:45:52 2011 +0000
build: Dist cb-button.h in the cookbook examples
The header is missing, so we have a build failure if you try to build
Clutter's cookbook from the tarball.
doc/cookbook/examples/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit adeb6119346f46e015cb54b856b2d73543353496
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon Jan 31 15:04:48 2011 +0000
Post-release version bump to 1.6.1
configure.ac | 4 +-
po/clutter-1.0.pot | 76 ++++++++++++++++++++++++++--------------------------
po/de.po | 74 +++++++++++++++++++++++++-------------------------
po/fr.po | 74 +++++++++++++++++++++++++-------------------------
po/id.po | 74 +++++++++++++++++++++++++-------------------------
po/it.po | 74 +++++++++++++++++++++++++-------------------------
po/pl.po | 74 +++++++++++++++++++++++++-------------------------
po/zh_CN.po | 74 +++++++++++++++++++++++++-------------------------
8 files changed, 262 insertions(+), 262 deletions(-)