diff options
| author | obache <obache> | 2009-10-26 08:45:51 +0000 |
|---|---|---|
| committer | obache <obache> | 2009-10-26 08:45:51 +0000 |
| commit | 3b0511ab219e748300cefd944c2d7c8f7b44ef46 (patch) | |
| tree | 93f1a42e0609c06bb5e7669814fda34b0e945c27 /graphics/clutter | |
| parent | 786d340da0dfc49848ee2e9622d41fbba730b7d9 (diff) | |
| download | pkgsrc-3b0511ab219e748300cefd944c2d7c8f7b44ef46.tar.gz | |
Update clutter-1.0.8.
Clutter 1.0.8 (19/10/2009)
===============================================================================
* List of changes since 1.0.6
o Documentation fixes and updates
o Unset the IN_DESTRUCTION flag when leaving ::destroy
o Fix components validation in the Vertex Buffer API
o Allow omitting the alpha when converting from string to color
o Do not overwrite the :use-markup property when setting the :text one
o Add support for pre-edit strings in ClutterText; this is an
API addition.
o Clarify the ID pool warning
o Notify the :position property of ClutterText when it changes
Many thanks to:
Damien Lespiau
Neil Roberts
Robert Bragg
Thomas Wood
Clutter 1.0.6 (22/09/2009)
===============================================================================
* List of changes since 1.0.4
o Various documentation improvements including a new ClutterPath migration
guide, a Glossary and objects index
o A couple of new unit tests for: initial actor sizing, preferred actor
size and ClutterGroup depth sorting
o Fix ClutterGroup depth sorting
o Fix double to float type conversions in ClutterScript and update
test-script.json so it doesn't refer to old Actor types such as
ClutterLabel.
o Do not attempt to free empty ClutterModel column names
o Fix the BlendString parser so numbers can be part of function names
allowing use of DOT3_RGB
o Fix the parsing of special "signal-" property names available when
using the ClutterAnimation vararg API
o Adds a "use-markup" property getter for ClutterText
o Account for clock roll backs between frames so timelines don't simply
hang
o Disable mipmap filters before checking framebuffer object completeness
since some drivers consider texture objects incomplete if a mipmap
filter is set but the mipmap data hasn't yet been uploaded.
o Various Makefile fixes, including fixes for the %.c: %.glsl codegen rules
for GLES2, use AM_SILENT_RULES for automake > 1.11, use a shared set of
defines for silencing make rules (Makefile.am.silent) and cleanup some
misuse of CLUTTER_MAJORMINOR.
o Fix cogl_clear so the alpha component isn't ignored
o Fix for the GLES 2.0 Cogl backend and the eglx Clutter backend
Many thanks to:
Damien Lespiau
Emmanuele Bassi
Neil Roberts
Øyvind Kolås
Samuel Degrande
Zhou Jiangwei
Clutter 1.0.4 (25/08/2009)
===============================================================================
* List of changes since 1.0.2
o Depend on GObject-Introspection 0.6.4, to fix the generation of
introspection data from uninstalled libraries
o Fix a crash when closing multiple stages
o Help gtk-doc pick up ClutterInterval as an object
o Do not premultiply the color twice inside the CoglPango renderer
o Fix keyboard navigation of works inside ClutterText
o Allow key events to bubble up to its parent container if the
event contains the control modifier is detected
Many thanks to:
Jonas Bonn
Jussi Kukkonen
Owen W. Taylor
Clutter 1.0.2 (14/08/2009)
===============================================================================
* List of changes since 1.0.0
o Documentation fixes
o Build fixes
o Update the MingW script for building Clutter on Windows
o Update the build instructions for OS X
o On X11, make sure to destroy the stage Window when switching to
a foreign one
o Fix a bug where clutter_actor_apply_relative_transform() was no
using the right vertex to perform the transformation
Many thanks to:
Damien Lespiau
Colin Walters
Joshua Lock
Xu Li
Clutter 1.0.0 (28/07/2009)
===============================================================================
* List of changes since 0.9.8
o Allow per-stage disabling of motion event throttling; this should allow
platforms or applications that require all the motion events not for
drawing purposes to get them exactly like Clutter gets them from the
windowing system.
o Various documentation fixes.
o Add per-word key navigation inside ClutterText.
o Fix the RGB<->HLS conversion.
o Various fixes for the OSX backend.
o Various build-related fixes.
Many thanks to:
Geoff Gustafson
Michael Mortensen
Owen W. Taylor
Clutter 0.9.8 (17/07/2009)
===============================================================================
* List of changes since 0.9.6
o Add more introspection annotations for language bindings.
o Fix a bug in clutter_animation_set_alpha(), which also broke the
clutter_actor_animate_with_alpha() function.
o Check if the stage requires a relayout before showing it; this fixes
a bug in the X11-based backends, especially under compositing window
managers, where a 640x480 window would flicker before the default
stage was shown for the first time.
o Performance fixes for Cogl.
o Sliced textures were broken by the COGL journalling.
o Use the redraw cycle when asynchronously loading textures from
files.
o Miscellaneous compilation fixes for the OS X and Windows backends.
o Allow querying from within the paint function of an Actor whether
the actor is currently being directly painted or by a Clone actor.
o In the GLX backend, when using the non-implicit sync-to-vblank inside
glXSwapBuffers(), call glFinish() to avoid potential tearing.
Many thanks to:
Colin Walters
Evan Martin
Marcos
Owen W. Taylor
Xu Li
Clutter 0.9.6 (01/07/2009)
===============================================================================
* List of changes since 0.9.4:
o Allow the manipulation of the actor's transformation matrix, so that is
is possible to apply additional transformations in a way that is
compatible with the transformations already applied by the scene graph.
o Fix a race in the X11 backend that happened between resizing the stage
drawable and the call to glViewport().
o Merge the cogl-journal-batching branch; this branch implements batching
the geometry of the elements of the scene graph before sending it to
OpenGL, thus minimizing the number of state changes and improving the
overall performance of Clutter-based applications.
o Add more debugging states for Clutter and COGL, which allow the developer
to track the state of the journal; to check the VBO fallback paths; to
disable picking for reliable profiling; to disable software-side matrix
transformations in favour of the driver/GPU ones.
o Improve the ability to "break out" of COGL by using gl_begin/gl_end
semantics; applications that drop into raw GL are, though, ignoring all
the caching performed by COGL and might incur in performance issues.
o Fixed the :load-async and :load-data-async properties of Texture by
removing the unneeded G_PARAM_CONSTRUCT flag.
o Added an initial migration guide that shows the porting process from
older releases of Clutter to the 1.0 API; the first chapter deals with
the migration from ClutterEffect to the new implicit animations API.
o Fixed MT-safety for the master clock.
Many thanks to:
Ole André Vadla Ravnås
Tim Horton
Clutter 0.9.4 (19/06/2009)
===============================================================================
* List of changes since 0.9.2:
o Set the layout height in ClutterText, so that wrapping and ellipsization
work correctly to fill all the allocated area.
o Remove all the units-based API, and migrate all the positional and
dimensional accessors to use floating point values when dealing with
pixels. All the properties dealing with pixels now that a floating
point value as well.
o Add the ability to track wether an actor is going to be painted or not,
using the "mapped" flag. This also allows Clutter to be more strict
in the handling of the scenegraph, ensuring correctness and avoiding
wasting resources on nodes that won't be painted.
o Add debugging facilities for COGL, similar to those of Clutter; through
them is also possible to have an on screen debugging mode that shows the
boundaries of each rectangle sent to the GPU.
o Rework "units" into real logical distance units that can be converted
between millimeters, typographic points and ems into pixels.
o Simplify the Animation class to avoid redundancy and the possibility
of it going out of sync with the Timeline and Alpha instances it uses.
o Move every operation into a single "master clock" source that advances
the timelines, dispatches events and redraws the stages in a predictable
sequence, thus avoiding unneeded redraws. The default is to follow the
sync-to-vblank cycle, if it is supported by the drivers.
o Cache the glyphs geometry into a vertex buffer object to avoid
resubmitting too much information to the GPU.
o Rework the behaviour of ClutterModel when a filter is applied.
o Allow submitting premultiplied texture data; this removes the need
for unpremultiplying data in CairoTexture.
o Add a simple API for submitting blending and texture combining modes
through a string description.
o Move Timelines to pure time-based objects.
o Lots of performance improvements.
o Removal of all the deprecated API.
o Removal of all the fixed point entry points.
o Lots of documentation fixes - the coverage is now 99% of the exported
1600 symbols for Clutter and 80%+ of the 300 exported symbols for COGL.
o Generate the GObject Introspection data for both Clutter and COGL
at build time.
o Build environment fixes.
Many thanks to:
Owen W. Taylor <otaylor@fishsoup.net>
Thomas Wood <thomas.wood@intel.com>
Havoc Pennington <hp@pobox.com>
Bastian Winkler <buz@netbuz.org>
Chris Lord <chris@linux.intel.com>
Garry Bodsworth <gjb@camvine.com>
Rob Bradford <rob@linux.intel.com>
Johan Bilien <jobi@litl.com>
Jonas Bonn <jonas@southpole.se>
Raymond Liu <raymond.liu@intel.com>
Damien Lespiau <damien.lespiau@gmail.com>
Dan Winship <danw@gnome.org>
Marc-André Lureau <marcandre.lureau@gmail.com>
Robert Staudinger <robsta@gnome.org>
Tommi Komulainen <tko@litl.com>
Clutter 0.9.2 (16/03/2009)
===============================================================================
Bastian Winkler (2):
[media] Fix the interface cast macro
Remove redundant declaration in clutter-text.h
Chris Lord (1):
[actor] Force a relayout on set_parent()
Christian Persch (1):
Bug 1429 - Redundant declaration in clutter-x11.h
Colin Walters (3):
Bug 1491 - Fix hardcoded lib path in .pc files
Typo in clutter-win32.pc.in introduced by commit 24ce19383
[animation] Enhance the bind API
Damien Lespiau (6):
[gitignore] update gitignore files for tests/
[build] Beautify autotools' output
[build] Add dolt
[build] Fix interaction between shave, gtk-doc and libtool 1.x
[build] Fix dist for the newly introduced m4 macro directory
Update shave
Emmanuele Bassi (111):
Post-release bump to 0.9.1
[text] Merge the attributes with markup enabled
[tests] Update the text-field interactive test
Add Actor::create_pango_layout()
[docs] Add clutter_text_set_markup()
[clone] Allow cloning unparented actors
[text] Use create_pango_layout()
[text] Rename :alignment to :line-alignment
[texture] Consolidate the quality to filter conversions
[texture] Check if the material is valid
[event] Extend KeyEvent for multi-input support
[actor] Check out parameters before setting them
[list-model] Make ClutterListModel subclassable
Bug 1440 - Add clutter_get_current_event_time()
[tests] Add TEST_CONFORM_SKIP() macro
[tests] Add conformance tests for ClutterModel
[ignore] Add the newly created conformance units
[actor] Revert part of commit 402e022c
[animation] Do not bind construct-only properties
[x11] Add backend-specific get_current_event_time()
Initialize a variable to avoid warnings
[cogl] Add cogl_is_material to cogl-material.h
[cogl] Provide GTypes for COGL types
[texture] Use COGL_TYPE_HANDLE for the handle properties
[docs] Clarify the set_cogl_texture() documentation
Merge branch 'build-enhancements'
[docs] Add a missing "return" annotation
[build] Pass the -s switch to cmp
Remove type functions for removed types
[docs] Update the sections file
[tests] Add TEST_CONFORM_TODO macro
[build] Show pkg-config file being generated
[build] Reference the headers with their full path
[docs] Update build for COGL API reference
[build] Update the EXTRA_DIST list
[build] Fix the ChangeLog generation rule
[build] Do not overwrite BUILT_SOURCES
[behaviour] Do not notify empty behaviours
[path] Do not accept NULL descriptions
[timeline] Set the n_markers out paramater
Do not use GL types in Clutter headers
[docs] Require gtk-doc 1.11
[docs] Use the --name-space option
[docs] Add the 1.0 symbols index
[docs] Rename cogl-docs from sgml to xml
Add build machinery for gobject-introspection data
[backend] Update the viewport when updating the GL context
[build] Move all the compiler flags to AM_CFLAGS
[ignore] Update with the introspection files
Add runtime debug messages for COGL
[actor] Remove usage of ClutterFixed
Make disable text mipmapping a command line switch
Make fuzzy picking a command line switch
[docs] Document envvars and command line switches
Remove stray fixed point macro usage
Use a dynamic array for the actors when delivering events
[media] Add sub-second resolution for the duration
[build] Put the X11 pc dependencies in another variable
[build] Do not shave typelib generation
Intern the ClutterScriptable type name
[backend] Constify font options
[cogl] Add a PANGO debug flag for CoglPango use
Clean up of the ClutterColor API
[shader] Unify code paths
Add pkg-config file for COGL
[build] Various fixes for distcheck
[docs] Clarify clutter_actor_animate() behaviour
[docs] Note that grabs are evil
[cogl-fixed] Add a double-to-fixed conversion macro
Move BehaviourScale to CoglFixed
Move ClutterBehaviourEllipse to CoglFixed
Move ClutterBehaviourRotate to CoglFixed
Move ClutterTimeline to CoglFixed
[cogl-fixed] Implement the CoglFixed fundamental GType
[tests] Test CoglFixed, not ClutterFixed
[interval] Update fixed-point handling
[stage] Coalesce fog and perspective API
[texture] Fix ClutterFixed usage
[text] Convert units to the right type
[tests] Use floats, not ClutterFixed
[units] Add more conversion functions
[fixed] Remove ClutterFixed API
[cogl] Fix hardcoded paths in the pc file
[docs] Remove ClutterFixed from the documentation
[docs] Update API reference
[animation] Add vector variants for ::animate()
[cogl] Initialize boolean flag in CoglContext
[cogl] Initialize all members of CoglContext
[color] Fixed HLS to RGB conversion
[docs] Calling g_object_ref() will not dispose an object
[docs] Document the commit message format
[tests] Animate the color during easing
[docs] Reword some of the coding practices
[docs] Add a bindings coding practices
Add more deprecation notices
[deprecated] Add Effect deprecation
Do not cause more size requisitions than necessary
[cogl] Avoid shadowing math.h symbols
[docs] Clarify Animation memory management
[animation] Add an emitter for ::completed
[animation] Add Animation getter
[tests] Remove unused variables
[docs] Add description of queue_redraw
[docs] Update after Animation API changes
[animation] Enhance consistency of the Animation API
[docs] Bring down the undocumented symbols to 2%
Fix release date of 0.9.0
Update release notes
[docs] Fix naming of the interval parameter
[docs] Ignore the TimeoutInterval internal API
Update release notes
Geoff Gustafson (1):
[animation] Broken fixed:: properties
Gordon Williams (1):
[group] Output the group name when debugging paint
Havoc Pennington (4):
Virtualize GL matrix operations and use a client-side matrix when GL is indirect
[actor] Add :clip-to-allocation property
[actor] Add ::queue-redraw signal
[cogl] Flush matrix before clip planes
Jonathan Matthew (1):
Declare the EnumValues for PixelFormat static
Neil Roberts (36):
[cogl-material] Always bind the new texture handle
Fix building GLES 2 after the material branch merge
[cogl-texture] Fix the count for the number of enabled arrays
[cogl-gles2-wrapper] Remove the FIXME to adjust the fragment color
[clutter-clone] Override the parent opacity to self not self->parent
[clutter-texture] Release the temporary ref taken when setting a texture
[clutter-texture] Unref the Cogl material on dispose
[clutter-texture] Fix the no_slice property
[cogl-texture] Fix offset to next quad when flushing the log
[cogl-texture] Move the destruction of the material to _finalize
[cogl-texture] Fix uninitialised priv var in texture_finalize
Added a test for non-power-of-two sized textures
Emit CLUTTER_LEAVE events when the pointer leaves the stage
Call glActiveTexture and glClientActiveTexture through cogl_get_proc_address
[win32] Track mouse leave messages
[clutter-main] Fix the input device passed to set_motion_last_actor
Override the opacity when painting a clone instead of combining
Allow rotation angle properties to be negative
[ClutterBehaviourRotate] Fix up some breakage from the cogl-float branch merge
[tests/conform] Copy in redhand.png
Replaced ClutterFixed constants in color_{darken,lighten} with float
[cogl-gles2-wrapper] Convert texture unit settings to be a static sized array
[cogl-gles2-wrapper] Actually call glActiveTexture
Add an environment variable to disable mipmapped text
[tests/tools] Don't install libdisable-npots.so
[clutter-texture] Use a GThreadPool for loading async textures
[cogl-pango-glyph-cache] Fix compiler warning on 64-bit
Fix warning in clutter-backend-sdl
[eglnative] Add -I flags for the clutter dir in the src and build dirs
Set the mapped flag on the stage in the SDL and eglnative backends
Fix out of tree builds
Remove use of $(builddir)
[README] Small typo fix
Change cogl_path_rectangle and cogl_path_round_rectangle to take x1,y1,x2,y2
[cogl-path] Minor fix to gtk-doc
Count timeline frames using the FPS instead of an integer interval
Owen W. Taylor (7):
Honor ACLOCAL_FLAGS in autogen.sh
Add gobject-introspection annotations
Fix x/y confusion for GL_TEXTURE_RECTANGLE_ARB
Use COGL to establish GL state for ClutterGLXTexturePixmap
Add (out) annotations for ClutterActor
Allow NULL for clutter_text_set_text()
Avoid drawing twice if relayout queues a draw
Raymond Liu (2):
[text] Crash when multi-byte utf8 text exceeds max_length
[text] Insertion of multi-byte characters broken
Robert Bragg (28):
[Cogl] Renames cogl_fog_set to cogl_set_fog for consistency
[cogl-material] Fixes some dirty flag checks
[cogl-vertex-buffer] Some fixes for texturing and color arrays
[docs] Various gtk-doc updates for Cogl
[tests] Some improvements for test-pixmap
[Cogl] cogl_clip_{set*,unset} renamed to cogl_clip_{push*,pop}
[Cogl] Renames cogl_paint_init to cogl_clear and adds a cogl_disable_fog function
[cogl-color.c] #include fix for the cogl_set_source_color prototype
[Cogl] the cogl_get_*_matrix functions now work with CoglMatrix types
[Cogl] Fixes automatic handling of the GL blend enable state.
[cogl-material] Always glBindTexture when flushing material state
[Cogl] Remove a debugging assert that was triggering on false positives
[test-vertex-buffer-contiguous] Improves the texturing test
[cogl-matrix] Adds padding to CoglMatrix
[cogl-matrix] Documents that CoglMatrix members should be considered read only
Removes need for casting (const float *) to (GLfloat *) in _cogl_set_clip_planes
80 char fix
Avoid casting CoglMatrix to a GLfloat * when calling glGetFloatv
Explicitly make the modelview-matrix current in cogl_{rotate,transform,etc}
Use Cogl enum when making modelview-matrix current in cogl_{rotate,transform,etc}
Finish GLES{1,2} support for client side matrix stacks
Maintain the Cogl assumption that the modelview matrix is normally current
Merge branch 'cogl-client-matrix-stacks'
[cogl-vertex-buffer] Add a flush of attribute changes in the *_draw() functions
[cogl-vertex-buffer] Allow querying back the number of vertices a buffer represents
[cogl-vertex-buffer] fix cogl_vertex_buffer_draw_elements prototype
[tests] Adds an interactive cogl vertex buffer unit test
[cogl] Don't endlessly print the same warning regarding layer fallbacks
Robert Staudinger (1):
[build] Add cogl.h to the built sources list
Shane Bryan (1):
Bug 1434 - _NET_WM_NAME not set before realize
Tomas Frydrych (3):
Fixed handling of enter and leave events in clutter_x11_handle_event()
Fix clutter_x11_texture_pixmap_get/set_property() following change of PROP_WINDOW type
[x11] Only update cached last event time if we have a real timestamp.
Øyvind Kolås (11):
Added a mutex for clutter asynchronous textures threads.
Bail early in clutter_texture_paint if opacity == 0
Add a warning for recursive emit_event
Change the default size of thread pool from 3 to 1
[tests] Added test-texture-async
[clutter-texture] add option to not block on size for loaded images
[clutter-texture] remove load-size-async property
Merge commit 'origin/async-texture-thread-pool' into async-size
[clutter-texture] updated documentation.
[clutter-texture] fixed gtk-doc formatting, and init threads in test.
Merge branch 'async-texture-thread-pool'
Clutter 0.9.0 (30/01/2009)
===============================================================================
* List of changes between 0.8.6 and 0.9.0
o ClutterText is a new actor allowing text display, text editing
both in multi-line and single-line modes, and text selection using
the pointer devices and the keyboard. ClutterText supercedes both
ClutterLabel and ClutterEntry.
o ClutterClone is a new actor that allows cloning of other actors,
both simple and composite. ClutterClone supercedes ClutterCloneTexture.
o ClutterBindingPool is a new API that allows to easily add key bindings
to an actor.
o ClutterAnimation is a new API for implicit animations, similar to
the tweening API used in toolkits like jQuery, Tween and Flash. This
new API supercedes the ClutterEffect API.
o ClutterAlpha uses "animation modes" instead of raw function
pointers; it is still possible to pass alpha functions. The alpha
functions provided by Clutter have been removed from the public
API. It is possible to register global alpha functions and use
them though a logical id.
o The interval of the ClutterAlpha:alpha property has been changed
to a floating point value in the [ -1.0, 2.0 ] range; this allowed
the addition of "overshooting" easing modes.
o COGL now supports backface culling.
o The COGL-based Pango renderer is public API and it is accessible
to developers. It is also possible to access the PangoContext used
by Clutter in order to create PangoLayouts to render text.
o The ClutterFixed API has been moved to COGL.
o COGL does not depend on Clutter data types anymore.
o The ClutterMedia interface has been overhauled: implementations
now must only override the interface properties. The ranges of
some properties have been changed to normalized values.
o COGL now exposes only floating point entry points, and reserves
the eventual conversion to fixed point only when needed. The
fixed point type and macros are publicly available for developers
concerned about floating point operations.
o COGL has a new Vertex Attribues API that allows submitting an
extensible number of vertex attributes to OpenGL in a way that
does not require format conversions and allows fast re-use.
o COGL has a new Material API that decouples paths from fills; it
is possible to create an arbitrary path and fill it with a COGL
texture. The Material API also allows setting multiple texture
layers and defining the blend modes and colors.
o ClutterTexture has the ability to use a worker thread to asynchronously
load an image from a file, as long as the GLib threading support has
been enabled prior to calling clutter_init().
o Clutter now supports localization of the help output, and it
also supports globally setting the text direction for non left to
right locales.
o ClutterCairoTexture is a new actor that allows using Cairo
to draw on a ClutterTexture; since Cairo does not have an OpenGL
backend, the drawing is not hardware accelerated.
o Clutter has a unit testing suite, based on the GLib unit test
framework, which can be used to track regressions.
o A ClutterPath object has been added, and it is used by the
BehaviourPath. The Path object allows defining paths using a set
of coordinates and operations. A Path can be "painted" either using
COGL primitives or using Cairo primitives, allowing an easier way
to paint non-rectangular shaped actors.
o ClutterInterval is a simple object, used by ClutterAnimation, that
describes an interval between two values, and interpolates between
the initial and final values of the interval.
* List of bugs fixed since 0.8.6
o #835 - Optimize clutter_actor_real_pick()
o #851 - setting anchor point causes picking problem
o #883 - Outstanding COGL merge issues
o #1003 - Add clutter_actor_take_key_focus
o #1014 - Clutter Animation API Improvements.
o #1049 - Clutter doesn't support most GLSL uniforms
o #1051 - WebKit/Clutter product/component?
o #1058 - Build clutter-box2d with Clutter 0.8
o #1066 - Clipping regression in 0.8
o #1086 - virtualize stage_queue_redraw
o #1105 - low level access to PangoClutter
o #1106 - ClutterText instead of ClutterLabel and ClutterEntry
o #1108 - Enter/Leave events logics wrt. skipped motion events
o #1109 - clutter-0.8.0 fails to compile
o #1123 - Crash when FBO actor is used and the stage is MINIMIZED
o #1144 - Provide an option to load images asynchronously in ClutterTexture
o #1162 - Add unit testing for Clutter
o #1164 - Mesh API
o #1172 - Disjoint paths and clip to path
o #1189 - Backface culling
o #1209 - Move fixed point API in COGL
o #1210 - Add CoglColor API
o #1211 - Drop ClutterFeatureFlags usage from COGL
o #1212 - Allow only a single include file for Clutter
o #1215 - Move the Pango renderer to the public API
o #1219 - Clean up cogl.h
o #1231 - Build fails in gles flavour in revision 3442
o #1233 - CLUTTER_ALPHA_SINE_INC is broken in trunk
o #1251 - Merge the Cairo texture actor in core
o #1252 - Merge ClutterBehaviourPath and ClutterBehaviourBspline
o #1261 - [patch] Minimize differences between gl/cogl-texture.c and
gles/cogl-texture.c
o #1269 - mingw32 building failed at clutter-media.c
o #1270 - Update to mingw-cross-compile.sh
o #1271 - mingw compiling failed: undefined reference to
`_glDrawRangeElements@24'
o #1284 - Return something reasonable from clutter_x11_handle_event()
o #1300 - clutter_score_remove and clutter_score_remove_all are different
in object remove
o #1310 - font rendering problem
o #1313 - Fix computation of camera distance
o #1314 - clutter_sinx() is more inaccurate than it needs to be
o #1321 - Get Matrix in float
o #1323 - ClutterBehaviorDepth conflicts with other behaviors
o #1325 - ClutterPath to cairo_path_t conversion functions
o #1330 - We should not queue redraw for non-visible actors
o #1334 - Default value for ClutterLabel::text should be "" instead of NULL
o #1344 - clutter_actor_transform_stage_point gives invalid coordinates
for big actors
o #1352 - Weird cogl-pango.h includes in clutter-[entry|label].c
o #1354 - Floating point exception when set fps>1000 and start timeline
o #1361 - Unused ClutterStage::get_resolution() methods
o #1365 - ClutterEntry doesn't get the cursor when it should
o #1366 - disable-npots fails to build on mac
o #1380 - Return booleans from CLUTTER_ACTOR_IS_* macros
o #1386 - Wrong clipping dimensions for larger actors
o #1387 - Clarify new-frame signal emission with advance()
o #1388 - Clarify signal emission for advance_to_marker()
o #1395 - behaviour_apply and behaviour_get_nth_actor are opposite on
actors sequence
o #1397 - clutter command line is not localized.
o #1402 - Change default tile-waste from 64 to 63
o #1403 - ClutterMedia::get_uri() should return allocated string
o #1404 - ClutterMedia issues
o #1405 - Fix properties that have X11 types to be 'long'
o #1409 - Use G_SIGNAL_RUN_LAST with ::queue-redraw signal
o #1410 - [patch] Implements a generic ClutterActorClone class without fbos
o #1414 - avoid relayout of ClutterTexture if not syncing size
o #1415 - short-circuit setting same clip again
Diffstat (limited to 'graphics/clutter')
| -rw-r--r-- | graphics/clutter/Makefile | 12 | ||||
| -rw-r--r-- | graphics/clutter/PLIST | 194 | ||||
| -rw-r--r-- | graphics/clutter/buildlink3.mk | 5 | ||||
| -rw-r--r-- | graphics/clutter/distinfo | 9 | ||||
| -rw-r--r-- | graphics/clutter/options.mk | 3 | ||||
| -rw-r--r-- | graphics/clutter/patches/patch-aa | 14 |
6 files changed, 148 insertions, 89 deletions
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 4fba9590bd5..79f02d3d140 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2009/09/30 09:22:47 sketch Exp $ +# $NetBSD: Makefile,v 1.6 2009/10/26 08:45:51 obache Exp $ # -DISTNAME= clutter-0.8.8 -PKGREVISION= 1 +DISTNAME= clutter-1.0.8 CATEGORIES= graphics -MASTER_SITES= http://www.clutter-project.org/sources/clutter/0.8/ +MASTER_SITES= http://www.clutter-project.org/sources/clutter/1.0/ MAINTAINER= obache@NetBSD.org HOMEPAGE= http://clutter-project.org/ @@ -31,9 +30,10 @@ TOOLS_NOOP+= gtkdoc-rebase TEST_TARGET= check -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.14.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 .include "../../devel/glib2/buildlink3.mk" -BUILDLINK_API_DEPENDS.pango+= pango>=1.18.0 +BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 .include "../../devel/pango/buildlink3.mk" +BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.7.4 .include "../../textproc/json-glib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/clutter/PLIST b/graphics/clutter/PLIST index 7e3218a8419..4948dbdd712 100644 --- a/graphics/clutter/PLIST +++ b/graphics/clutter/PLIST @@ -1,94 +1,117 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:08 joerg Exp $ -include/clutter-0.8/clutter/clutter-actor.h -include/clutter-0.8/clutter/clutter-alpha.h -include/clutter-0.8/clutter/clutter-backend.h -include/clutter-0.8/clutter/clutter-behaviour-bspline.h -include/clutter-0.8/clutter/clutter-behaviour-depth.h -include/clutter-0.8/clutter/clutter-behaviour-ellipse.h -include/clutter-0.8/clutter/clutter-behaviour-opacity.h -include/clutter-0.8/clutter/clutter-behaviour-path.h -include/clutter-0.8/clutter/clutter-behaviour-rotate.h -include/clutter-0.8/clutter/clutter-behaviour-scale.h -include/clutter-0.8/clutter/clutter-behaviour.h -include/clutter-0.8/clutter/clutter-child-meta.h -include/clutter-0.8/clutter/clutter-clone-texture.h -include/clutter-0.8/clutter/clutter-color.h -include/clutter-0.8/clutter/clutter-container.h -include/clutter-0.8/clutter/clutter-deprecated.h -include/clutter-0.8/clutter/clutter-effect.h -include/clutter-0.8/clutter/clutter-entry.h -include/clutter-0.8/clutter/clutter-enum-types.h -include/clutter-0.8/clutter/clutter-event.h -include/clutter-0.8/clutter/clutter-feature.h -include/clutter-0.8/clutter/clutter-fixed.h -include/clutter-0.8/clutter/clutter-frame-source.h -include/clutter-0.8/clutter/clutter-group.h -include/clutter-0.8/clutter/clutter-json.h -include/clutter-0.8/clutter/clutter-keysyms.h -include/clutter-0.8/clutter/clutter-label.h -include/clutter-0.8/clutter/clutter-list-model.h -include/clutter-0.8/clutter/clutter-main.h -include/clutter-0.8/clutter/clutter-media.h -include/clutter-0.8/clutter/clutter-model.h -${PLIST.osx}include/clutter-0.8/clutter/clutter-osx.h -include/clutter-0.8/clutter/clutter-rectangle.h -include/clutter-0.8/clutter/clutter-score.h -include/clutter-0.8/clutter/clutter-script.h -include/clutter-0.8/clutter/clutter-scriptable.h -include/clutter-0.8/clutter/clutter-shader.h -include/clutter-0.8/clutter/clutter-stage-manager.h -include/clutter-0.8/clutter/clutter-stage.h -include/clutter-0.8/clutter/clutter-texture.h -include/clutter-0.8/clutter/clutter-timeline.h -include/clutter-0.8/clutter/clutter-timeout-pool.h -include/clutter-0.8/clutter/clutter-types.h -include/clutter-0.8/clutter/clutter-units.h -include/clutter-0.8/clutter/clutter-util.h -include/clutter-0.8/clutter/clutter-version.h -include/clutter-0.8/clutter/clutter.h -${PLIST.x11}include/clutter-0.8/clutter/glx/clutter-glx-texture-pixmap.h -${PLIST.x11}include/clutter-0.8/clutter/glx/clutter-glx.h -include/clutter-0.8/clutter/pangoclutter.h -${PLIST.x11}include/clutter-0.8/clutter/x11/clutter-x11-enum-types.h -${PLIST.x11}include/clutter-0.8/clutter/x11/clutter-x11-texture-pixmap.h -${PLIST.x11}include/clutter-0.8/clutter/x11/clutter-x11.h -include/clutter-0.8/cogl/cogl-defines-gl.h -include/clutter-0.8/cogl/cogl.h -${PLIST.x11}lib/libclutter-glx-0.8.la -${PLIST.osx}lib/libclutter-osx-0.8.la -lib/pkgconfig/clutter-0.8.pc -${PLIST.x11}lib/pkgconfig/clutter-glx-0.8.pc -${PLIST.osx}lib/pkgconfig/clutter-osx-0.8.pc -${PLIST.x11}lib/pkgconfig/clutter-x11-0.8.pc +@comment $NetBSD: PLIST,v 1.3 2009/10/26 08:45:51 obache Exp $ +include/clutter-1.0/clutter/clutter-actor.h +include/clutter-1.0/clutter/clutter-alpha.h +include/clutter-1.0/clutter/clutter-animatable.h +include/clutter-1.0/clutter/clutter-animation.h +include/clutter-1.0/clutter/clutter-backend.h +include/clutter-1.0/clutter/clutter-behaviour-depth.h +include/clutter-1.0/clutter/clutter-behaviour-ellipse.h +include/clutter-1.0/clutter/clutter-behaviour-opacity.h +include/clutter-1.0/clutter/clutter-behaviour-path.h +include/clutter-1.0/clutter/clutter-behaviour-rotate.h +include/clutter-1.0/clutter/clutter-behaviour-scale.h +include/clutter-1.0/clutter/clutter-behaviour.h +include/clutter-1.0/clutter/clutter-binding-pool.h +include/clutter-1.0/clutter/clutter-cairo-texture.h +include/clutter-1.0/clutter/clutter-child-meta.h +include/clutter-1.0/clutter/clutter-clone.h +include/clutter-1.0/clutter/clutter-color.h +include/clutter-1.0/clutter/clutter-container.h +include/clutter-1.0/clutter/clutter-deprecated.h +include/clutter-1.0/clutter/clutter-enum-types.h +include/clutter-1.0/clutter/clutter-event.h +include/clutter-1.0/clutter/clutter-feature.h +include/clutter-1.0/clutter/clutter-fixed.h +include/clutter-1.0/clutter/clutter-frame-source.h +include/clutter-1.0/clutter/clutter-group.h +include/clutter-1.0/clutter/clutter-interval.h +include/clutter-1.0/clutter/clutter-json.h +include/clutter-1.0/clutter/clutter-keysyms.h +include/clutter-1.0/clutter/clutter-list-model.h +include/clutter-1.0/clutter/clutter-main.h +include/clutter-1.0/clutter/clutter-media.h +include/clutter-1.0/clutter/clutter-model.h +${PLIST.osx}include/clutter-1.0/clutter/clutter-osx.h +include/clutter-1.0/clutter/clutter-path.h +include/clutter-1.0/clutter/clutter-rectangle.h +include/clutter-1.0/clutter/clutter-score.h +include/clutter-1.0/clutter/clutter-script.h +include/clutter-1.0/clutter/clutter-scriptable.h +include/clutter-1.0/clutter/clutter-shader-types.h +include/clutter-1.0/clutter/clutter-shader.h +include/clutter-1.0/clutter/clutter-stage-manager.h +include/clutter-1.0/clutter/clutter-stage.h +include/clutter-1.0/clutter/clutter-text.h +include/clutter-1.0/clutter/clutter-texture.h +include/clutter-1.0/clutter/clutter-timeline.h +include/clutter-1.0/clutter/clutter-timeout-pool.h +include/clutter-1.0/clutter/clutter-types.h +include/clutter-1.0/clutter/clutter-units.h +include/clutter-1.0/clutter/clutter-util.h +include/clutter-1.0/clutter/clutter-version.h +include/clutter-1.0/clutter/clutter.h +${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h +${PLIST.x11}include/clutter-1.0/clutter/glx/clutter-glx.h +${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11-enum-types.h +${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h +${PLIST.x11}include/clutter-1.0/clutter/x11/clutter-x11.h +include/clutter-1.0/cogl/cogl-bitmap.h +include/clutter-1.0/cogl/cogl-color.h +include/clutter-1.0/cogl/cogl-debug.h +include/clutter-1.0/cogl/cogl-defines-gl.h +include/clutter-1.0/cogl/cogl-deprecated.h +include/clutter-1.0/cogl/cogl-enum-types.h +include/clutter-1.0/cogl/cogl-fixed.h +include/clutter-1.0/cogl/cogl-material.h +include/clutter-1.0/cogl/cogl-matrix.h +include/clutter-1.0/cogl/cogl-offscreen.h +include/clutter-1.0/cogl/cogl-pango.h +include/clutter-1.0/cogl/cogl-path.h +include/clutter-1.0/cogl/cogl-shader.h +include/clutter-1.0/cogl/cogl-texture.h +include/clutter-1.0/cogl/cogl-types.h +include/clutter-1.0/cogl/cogl-vertex-buffer.h +include/clutter-1.0/cogl/cogl.h +${PLIST.x11}lib/libclutter-glx-1.0.la +${PLIST.osx}lib/libclutter-osx-1.0.la +lib/pkgconfig/clutter-1.0.pc +${PLIST.x11}lib/pkgconfig/clutter-glx-1.0.pc +${PLIST.osx}lib/pkgconfig/clutter-osx-1.0.pc +${PLIST.x11}lib/pkgconfig/clutter-x11-1.0.pc +lib/pkgconfig/cogl-1.0.pc +lib/pkgconfig/cogl-gl-1.0.pc share/gtk-doc/html/clutter/ClutterActor.html share/gtk-doc/html/clutter/ClutterAlpha.html +share/gtk-doc/html/clutter/ClutterAnimatable.html share/gtk-doc/html/clutter/ClutterBehaviour.html -share/gtk-doc/html/clutter/ClutterBehaviourBspline.html share/gtk-doc/html/clutter/ClutterBehaviourDepth.html share/gtk-doc/html/clutter/ClutterBehaviourEllipse.html share/gtk-doc/html/clutter/ClutterBehaviourOpacity.html share/gtk-doc/html/clutter/ClutterBehaviourPath.html share/gtk-doc/html/clutter/ClutterBehaviourRotate.html share/gtk-doc/html/clutter/ClutterBehaviourScale.html +share/gtk-doc/html/clutter/ClutterCairoTexture.html share/gtk-doc/html/clutter/ClutterChildMeta.html -share/gtk-doc/html/clutter/ClutterCloneTexture.html +share/gtk-doc/html/clutter/ClutterClone.html share/gtk-doc/html/clutter/ClutterContainer.html -share/gtk-doc/html/clutter/ClutterEntry.html share/gtk-doc/html/clutter/ClutterGroup.html -share/gtk-doc/html/clutter/ClutterLabel.html share/gtk-doc/html/clutter/ClutterListModel.html share/gtk-doc/html/clutter/ClutterMedia.html share/gtk-doc/html/clutter/ClutterModel.html share/gtk-doc/html/clutter/ClutterModelIter.html +share/gtk-doc/html/clutter/ClutterPath.html share/gtk-doc/html/clutter/ClutterRectangle.html share/gtk-doc/html/clutter/ClutterScore.html share/gtk-doc/html/clutter/ClutterScript.html +share/gtk-doc/html/clutter/ClutterScriptable.html share/gtk-doc/html/clutter/ClutterShader.html share/gtk-doc/html/clutter/ClutterStage.html +share/gtk-doc/html/clutter/ClutterText.html share/gtk-doc/html/clutter/ClutterTexture.html share/gtk-doc/html/clutter/ClutterTimeline.html share/gtk-doc/html/clutter/actor-box.png -share/gtk-doc/html/clutter/alpha-func.png +share/gtk-doc/html/clutter/additionaldocs.html +share/gtk-doc/html/clutter/annotation-glossary.html share/gtk-doc/html/clutter/building-clutter.html share/gtk-doc/html/clutter/ch01.html share/gtk-doc/html/clutter/ch02.html @@ -99,21 +122,24 @@ share/gtk-doc/html/clutter/ch06.html share/gtk-doc/html/clutter/ch07.html share/gtk-doc/html/clutter/ch08.html share/gtk-doc/html/clutter/ch09.html -share/gtk-doc/html/clutter/clutter-Clutter-Effects.html share/gtk-doc/html/clutter/clutter-ClutterBackend.html -share/gtk-doc/html/clutter/clutter-ClutterScriptable.html share/gtk-doc/html/clutter/clutter-Colors.html +share/gtk-doc/html/clutter/clutter-EGL-Specific-Support.html +share/gtk-doc/html/clutter/clutter-EGLX-Specific-Support.html share/gtk-doc/html/clutter/clutter-Events.html -share/gtk-doc/html/clutter/clutter-Fixed-Point-Support.html +share/gtk-doc/html/clutter/clutter-GLX-Specific-Support.html share/gtk-doc/html/clutter/clutter-General.html +share/gtk-doc/html/clutter/clutter-Implicit-Animations.html +share/gtk-doc/html/clutter/clutter-Key-Bindings.html share/gtk-doc/html/clutter/clutter-Unit-conversion.html share/gtk-doc/html/clutter/clutter-Utilities.html +share/gtk-doc/html/clutter/clutter-Value-intervals.html share/gtk-doc/html/clutter/clutter-Versioning-Macros.html share/gtk-doc/html/clutter/clutter-Win32-Specific-Support.html share/gtk-doc/html/clutter/clutter-X11-Specific-Support.html share/gtk-doc/html/clutter/clutter-animation-behaviours.html share/gtk-doc/html/clutter/clutter-animation-conclusion.html -share/gtk-doc/html/clutter/clutter-animation-effects.html +share/gtk-doc/html/clutter/clutter-animation-implicit.html share/gtk-doc/html/clutter/clutter-animation-timelines.html share/gtk-doc/html/clutter/clutter-animations.html share/gtk-doc/html/clutter/clutter-overview.html @@ -121,34 +147,52 @@ share/gtk-doc/html/clutter/clutter-subclassing-ClutterActor.html share/gtk-doc/html/clutter/clutter.devhelp share/gtk-doc/html/clutter/clutter.devhelp2 share/gtk-doc/html/clutter/clutteranimation.html +share/gtk-doc/html/clutter/clutterbackends.html share/gtk-doc/html/clutter/clutterbase.html +share/gtk-doc/html/clutter/clutterglossary.html +share/gtk-doc/html/clutter/clutterobjecthierarchy.html +share/gtk-doc/html/clutter/clutterobjectindex.html +share/gtk-doc/html/clutter/clutterobjects.html +share/gtk-doc/html/clutter/cluttertools.html share/gtk-doc/html/clutter/creating-your-own-behaviours.html +share/gtk-doc/html/clutter/easing-modes.png share/gtk-doc/html/clutter/event-flow.png +share/gtk-doc/html/clutter/go01.html share/gtk-doc/html/clutter/home.png share/gtk-doc/html/clutter/index.html share/gtk-doc/html/clutter/index.sgml +share/gtk-doc/html/clutter/iterating-paths.html share/gtk-doc/html/clutter/ix01.html share/gtk-doc/html/clutter/ix02.html share/gtk-doc/html/clutter/ix03.html share/gtk-doc/html/clutter/ix04.html share/gtk-doc/html/clutter/ix05.html share/gtk-doc/html/clutter/ix06.html +share/gtk-doc/html/clutter/ix07.html share/gtk-doc/html/clutter/left.png share/gtk-doc/html/clutter/license.html +share/gtk-doc/html/clutter/migrating-ClutterEffect.html +share/gtk-doc/html/clutter/migrating-ClutterPath.html +share/gtk-doc/html/clutter/migration.html share/gtk-doc/html/clutter/path-alpha-func.png -share/gtk-doc/html/clutter/pt05.html -share/gtk-doc/html/clutter/pt06.html -share/gtk-doc/html/clutter/pt07.html +share/gtk-doc/html/clutter/pt10.html share/gtk-doc/html/clutter/right.png +share/gtk-doc/html/clutter/running-clutter.html share/gtk-doc/html/clutter/style.css share/gtk-doc/html/clutter/up.png +share/gtk-doc/html/clutter/using-cairo.html share/gtk-doc/html/cogl/ch01.html +share/gtk-doc/html/cogl/cogl-Blend-Strings.html +share/gtk-doc/html/cogl/cogl-Color-Type.html +share/gtk-doc/html/cogl/cogl-Fixed-Point-API.html share/gtk-doc/html/cogl/cogl-General-API.html +share/gtk-doc/html/cogl/cogl-Materials.html +share/gtk-doc/html/cogl/cogl-Matrices.html share/gtk-doc/html/cogl/cogl-Offscreen-Buffers.html share/gtk-doc/html/cogl/cogl-Primitives.html share/gtk-doc/html/cogl/cogl-Shaders-and-Programmable-Pipeline.html share/gtk-doc/html/cogl/cogl-Textures.html -share/gtk-doc/html/cogl/cogl-Utility-API.html +share/gtk-doc/html/cogl/cogl-Vertex-Buffers.html share/gtk-doc/html/cogl/cogl.devhelp share/gtk-doc/html/cogl/cogl.devhelp2 share/gtk-doc/html/cogl/home.png diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk index 4de155e12fe..639832c9a56 100644 --- a/graphics/clutter/buildlink3.mk +++ b/graphics/clutter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:57:00 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2009/10/26 08:45:51 obache Exp $ # BUILDLINK_TREE+= clutter @@ -6,8 +6,7 @@ BUILDLINK_TREE+= clutter .if !defined(CLUTTER_BUILDLINK3_MK) CLUTTER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.clutter+= clutter>=0.8.0 -BUILDLINK_ABI_DEPENDS.clutter?= clutter>=0.8.8 +BUILDLINK_API_DEPENDS.clutter+= clutter>=1.0.0 BUILDLINK_PKGSRCDIR.clutter?= ../../graphics/clutter pkgbase := clutter diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo index aff36843375..79d636ae2f2 100644 --- a/graphics/clutter/distinfo +++ b/graphics/clutter/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2009/05/08 11:02:28 obache Exp $ +$NetBSD: distinfo,v 1.3 2009/10/26 08:45:51 obache Exp $ -SHA1 (clutter-0.8.8.tar.gz) = 560e127b99494131ec3b901f53bd93d6809d79ea -RMD160 (clutter-0.8.8.tar.gz) = 400c97617cd26ae9e338cedddce8b67bc3fe4293 -Size (clutter-0.8.8.tar.gz) = 2153665 bytes +SHA1 (clutter-1.0.8.tar.gz) = 2dbf1adaca38a70e7b2b7da06263d502f96a9d62 +RMD160 (clutter-1.0.8.tar.gz) = b6b25d27b6e4199223dd26e9037e8f92e3b5acee +Size (clutter-1.0.8.tar.gz) = 2676163 bytes +SHA1 (patch-aa) = 4e5aff1ec5d7c6190bdd59c7eb18359954c26755 diff --git a/graphics/clutter/options.mk b/graphics/clutter/options.mk index 2bd90f98557..989cdce6c51 100644 --- a/graphics/clutter/options.mk +++ b/graphics/clutter/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2009/04/11 17:19:00 reed Exp $ +# $NetBSD: options.mk,v 1.3 2009/10/26 08:45:51 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.clutter @@ -14,6 +14,7 @@ PLIST.x11= yes CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-flavour=glx CONFIGURE_ARGS+= --with-imagebackend=gdk-pixbuf +CONFIGURE_ARGS+= --enable-xinput BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.0 .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/graphics/clutter/patches/patch-aa b/graphics/clutter/patches/patch-aa new file mode 100644 index 00000000000..ecb58d34807 --- /dev/null +++ b/graphics/clutter/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1 2009/10/26 08:45:52 obache Exp $ + +--- clutter/clutter-json.h.in.orig 2009-10-19 14:32:54.000000000 +0000 ++++ clutter/clutter-json.h.in +@@ -6,8 +6,6 @@ + * without changing the other headers. + */ + +-#include "@JSON_PREFIX@/json-types.h" +-#include "@JSON_PREFIX@/json-parser.h" +-#include "@JSON_PREFIX@/json-generator.h" ++#include "@JSON_PREFIX@/json-glib.h" + + #endif /* __CLUTTER_JSON_H__ */ |