Commit Graph

494 Commits

Author SHA1 Message Date
Emmanuele Bassi
f1d86071c3 build: Remove the GLES configuration option
The selector for GLES 1.1 or 2.0 is all in Cogl, now.
2011-10-19 15:32:41 +01:00
Robert Bragg
14b3ec8485 build: remove the experimental_image var from configure
Since the image backend is something now dealt with by Cogl there is no
need to check the experimental status of the backend in the Clutter
configure script.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-10-19 15:27:20 +01:00
Robert Bragg
2ba1a19870 build: Don't actually check for glx for glx flavour
GLX is now totally abstracted by Cogl so the "glx" flavour is actually
only used to determine the soname of clutter now so we don't actually
have to check for the glx header or that libGL provides any GLX symbols.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-10-19 15:26:43 +01:00
Chun-wei Fan
b1780711f7 Merge branch 'master' into msvc-support-master 2011-10-17 15:52:57 +08:00
Emmanuele Bassi
d93e6ef6b9 Bump up the dependency on gtk-doc 2011-10-14 11:34:26 +01:00
Emmanuele Bassi
a05eb9177d build: Strip out G_DISABLE_DEPRECATED
We have compiler warnings, now.
2011-10-14 10:21:37 +01:00
Chun-wei Fan
bd991e625b Merge branch 'master' into msvc-support-master 2011-10-12 14:37:19 +08:00
Emmanuele Bassi
ef0e52f0e1 build: Disable deprecation warnings with --enable-deprecated
Just like we turn everything on with --disable-deprecated, we have to
turn everything off with --enable-deprecated. This means disabling the
deprecation warnings from the compiler as well.
2011-10-11 23:06:51 +01:00
Emmanuele Bassi
53e201f865 Show lib and sysconfdir in the configure summary 2011-10-11 17:52:17 +01:00
Chun-wei Fan
f0dfd8ab07 Merge branch 'master' into msvc-support-master
Conflicts:
	tests/interactive/Makefile.am
2011-09-29 16:33:02 +08:00
Emmanuele Bassi
1465aa04aa Depend on GLib 2.31
We need to switch away from GStaticMutex and use GMutex instead, as the
former has been deprecated.
2011-09-28 13:52:53 +01:00
Chun-wei Fan
9e822d9ae4 Merge branch 'master' into msvc-support-master 2011-09-27 14:35:26 +08:00
Emmanuele Bassi
0b07a5ef04 Post branch version bump to 1.9.1 2011-09-19 20:04:11 +01:00
Emmanuele Bassi
2270335247 Depend on Cogl new stable release, 1.8.0 2011-09-19 20:02:17 +01:00
Emmanuele Bassi
14bd6eaad4 Bump GLib dependency
We have been using g_slist_free_full() which was added in GLib 2.28, and
yet we neved bumped the GLib dependency. Whoopsie.
2011-09-19 17:58:39 +01:00
Chun-wei Fan
208fbe756e Recover msvc-support
messed up my own git repo...
2011-09-16 17:15:33 +08:00
Emmanuele Bassi
92d4197b2c Post-release version bump to 1.7.91 2011-09-12 13:59:30 +01:00
Emmanuele Bassi
8435549448 Release Clutter 1.7.90 (1.8.0-rc1) 2011-09-12 13:16:03 +01:00
Emmanuele Bassi
28ad23e7d7 Post-release version bump to 1.7.15 2011-09-05 21:39:51 +01:00
Emmanuele Bassi
d992c0cbff Release Clutter 1.7.14 2011-09-05 21:16:01 +01:00
Alejandro Piñeiro
f1a7cd7c0f Merge branch 'atkwindow' 2011-08-30 12:26:35 +02:00
Emmanuele Bassi
2212937788 Post-release version bump to 1.7.13 2011-08-29 23:29:07 +01:00
Emmanuele Bassi
c26dd3f008 Release Clutter 1.7.12 (snapshot) 2011-08-29 23:05:03 +01:00
Alejandro Piñeiro
a9690a4a5e a11y: Using AtkWindow on cally-stage 2011-08-23 17:22:11 +02:00
Emmanuele Bassi
e906d2cbde build: Depend on pangoft2 on X11
We need the fontconfig API to reinitialize the fontmap caches whenever
the system tells us that the user fonts have changed.
2011-08-18 15:32:29 +01:00
Emmanuele Bassi
98b3834d55 Post-release version bump to 1.7.11 2011-08-16 00:19:34 +01:00
Emmanuele Bassi
d80fef4c71 Release Clutter 1.7.10 (snapshot) 2011-08-15 23:52:55 +01:00
Emmanuele Bassi
8402e41332 build: Require the latest stable version of Cogl 2011-08-15 15:35:41 +01:00
Emmanuele Bassi
2c34f0b16c Post-release version bump to 1.7.9 2011-08-15 15:16:24 +01:00
Emmanuele Bassi
f6fe09fa24 Release Clutter 1.7.8 (snapshot) 2011-08-15 14:32:37 +01:00
Robert Bragg
d2763fd8a4 stage-cogl: pass top-left relative swap_region coords
All 2D coordinate spaces in Cogl have their origin at the top-left so we
shouldn't be flipping the coordinates we pass to
cogl_framebuffer_swap_region to be relative to the bottom of the
framebuffer.

This bumps the Cogl version requirement to 1.7.5 since we've had to fix
a bug in the semantics of cogl_framebuffer_swap_region.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
2011-08-12 15:42:42 +01:00
Emmanuele Bassi
fdba569213 Post-release version bump to 1.7.7 2011-07-26 14:12:08 +01:00
Emmanuele Bassi
0a008b98e7 Release Clutter 1.7.6 (snapshot) 2011-07-26 13:55:58 +01:00
Emmanuele Bassi
c89de4324e docs: Remove manual/
The programmers manual never materialized, and its role has been taken
by both the cookbook and the API reference.
2011-07-20 11:32:15 +01:00
Emmanuele Bassi
2dc69dc63d build: Escape AC_DEFINE arguments 2011-07-15 16:02:19 +01:00
Carlos Garnacho
075a4ed86c x11: Improve XGenericEventCookie data allocation
https://bugzilla.gnome.org/show_bug.cgi?id=654656

Clutter may be used together with GTK+, which indirectly may use
XInput2 too, so the cookie data must persist when both are handling
events.

What happens now in a nutshell is, Clutter is only guaranteed to allocate
the cookie itself after XNextEvent(), and only frees the cookie if its
XGetEventData() call allocated the cookie data.

The X[Get|Free]EventData() calls happen now in clutter-event-x11.c as
hypothetically different event translators could also handle other set
of X Generic Events, or other libraries handling events for that matter.
2011-07-15 13:46:33 +02:00
Emmanuele Bassi
f45b12dac4 build: Unescape conditionally defined defaults in AS_HELP_STRING
AS_HELP_STRING() escapes everything, so m4 doesn't have a chance to run
expansions.
2011-07-13 14:49:55 +01:00
Emmanuele Bassi
ab89f9b9e8 build: Detect the appropriate default flavour
If we're building on/for Windows, set 'win32' as the default flavour; if
we're building on OS X, set 'osx' as the default flavour. For everything
else, use 'glx'.
2011-07-13 14:27:39 +01:00
Emmanuele Bassi
9a3b97b55e Revert "build: Detect the appropriate default flavour"
Ouch, butterfingers and git commit -a.

This reverts commit 81e8c8dec9.
2011-07-13 14:26:05 +01:00
Emmanuele Bassi
d67bc235a4 build: The OSX backend is not experimental any more
The OSX backend is actively developed, and tested, so we can drop the
experimental flag.
2011-07-13 14:22:14 +01:00
Emmanuele Bassi
81e8c8dec9 build: Detect the appropriate default flavour
If we're building on/for Windows, set 'win32' as the default flavour; if
we're building on OS X, set 'osx' as the default flavour. For everything
else, use 'glx'.
2011-07-13 14:20:47 +01:00
Robert Bragg
62ae252c59 build: depend on cogl-1.7.3 development version
Since some experimental API in Cogl that Clutter uses has changed this
bumps our dependency up to 1.7.3 before landing the corresponding build
fixes for clutter to bring it in line with the Cogl changes.
2011-07-11 16:57:29 +01:00
Emmanuele Bassi
805d27fb0d Post-release version bump to 1.7.5 2011-07-04 22:28:30 +01:00
Emmanuele Bassi
79f21a9b50 Release Clutter 1.7.4 (snapshot) 2011-07-04 22:14:06 +01:00
Øyvind Kolås
aa05b66a01 tests: Add performance tracking framework
This adds a performance tracking framework that can run a set of tests over
specified git revisions. The ruby script for generating the reports comes from
similar performance tracking in GEGL. The framework permits evaluating new
tests against older version of clutter.

The tests themselves go through a few hoops for disabling framerate limiting in
both mesa and clutter.

When running make check the tests will be run and lines of the form:

@ test-state: 40.51 fps

will be left in the output, a script can scrape these lines out of a build log
on a buildbot to in other ways track performance.
2011-07-04 17:27:48 +01:00
Emmanuele Bassi
dbf2ccfd59 Bump up the Cogl dependency
We need 1.7.2 at least.
2011-07-01 17:26:10 +01:00
Emmanuele Bassi
675da6ed86 build: Use tar-ustar and dist-xz to dist tarballs 2011-06-20 13:59:14 +01:00
Emmanuele Bassi
3861a1c3ba build: Update the API reference build
Add the Cogl prefix to the fix-cross-references script options, and
update the location of the extra headers.
2011-06-20 13:56:46 +01:00
Emmanuele Bassi
e6c58b7fb3 build: Replace AC_HELP_STRING with AS_HELP_STRING
The latter is the new version of the former.
2011-06-16 13:36:08 +01:00
Robert Bragg
2d8083bab8 unify egl and glx backends as "cogl" backend
Since GLX and EGL are abstracted by Cogl the two backends are both
implementing everything using the Cogl API and they are almost
identical.

This updates the egl backend to support everything that the glx backend
supports. Now that EGL and GLX are abstracted by Cogl, the plan is that
we will squash the clutter-egl/glx backends into one. Since the EGL
backend in clutter can conditionally not depend on X11 we will use the
EGL backend as the starting point of our common backend.

https://bugzilla.gnome.org/show_bug.cgi?id=649826
2011-06-14 20:35:18 +01:00
Emmanuele Bassi
a7fc76a1c5 build: Disable deprecated symbols during development cycles
And add a configure switch to toggle them.
2011-06-14 14:50:10 +01:00
Emmanuele Bassi
5e1fa71498 Post-release version bump to 1.7.3 2011-06-13 23:46:21 +01:00
Emmanuele Bassi
a7cc84a483 Release Clutter 1.7.2 (snapshot) 2011-06-13 23:15:17 +01:00
Neil Roberts
dbae7e6014 configure.ac: Remove the check for 'ffs'
The check for the ffs function is only needed by Cogl we don't need to
have it in Clutter's configure script anymore.
2011-05-06 17:48:59 +01:00
Emmanuele Bassi
ea502fd492 build: Depend on cogl-pango-1.0
For both builds and introspection.
2011-05-06 17:21:00 +01:00
Emmanuele Bassi
f1204bfe09 build: Specify the buildreq version for Cogl
Don't just assume the latest.
2011-05-06 16:56:29 +01:00
Robert Bragg
589c80e41e Remove last dependency on the GdkPixbuf API
In test-pixmap.c instead of using the GdkPixbuf API to load the
redhand.png image we now use the cairo API to load the png into a xlib
surface which wraps our Pixmap.

This test was the last thing that depended on the gdk API and since
it's more concise to use Cairo here which is a hard dependency for
Clutter this change means we avoid depending on GdkPixbuf directly.
2011-05-06 15:44:13 +01:00
Robert Bragg
223e14811c Removes Cogl from the repository
Cogl has now been split out into a standalone project with a separate
repository at git://git.gnome.org/cogl. From now on the Clutter build
will now simply look for a cogl-1.0 pkg-config file to find a suitable
Cogl library to link against at build time.
2011-05-06 15:44:08 +01:00
Robert Bragg
723e5de4b6 cogl/configure.ac: Adds --enable-stub-winsys option
We want to be able to split Cogl out as a standalone project but there
are still some window systems that aren't natively supported by Cogl.
This allows Clutter to support those window systems directly but still
work with a standalone Cogl library.

This also ensures we set the SUPPORT_STUB conditional in clutter's
configure.ac when building for win32/osx and wayland.
2011-05-05 15:05:11 +01:00
Robert Bragg
825a51b898 Adds Cogl Hello World and "X11 foreign" example applications
This adds a simple standalone Cogl application that can be used to
smoke test a standalone build of Cogl without Clutter.

This also adds an x11-foreign app that shows how a toolkit can ask Cogl
to draw to an X Window that it owns instead of Cogl being responsible
for automatically creating and mapping an X Window for CoglOnscreen.
2011-05-05 14:46:03 +01:00
Robert Bragg
1c502fbbc8 cogl/configure.ac: add options to control driver/egl platform
This allows more detailed control over the driver and winsys features
that Cogl should have. Cogl is designed so it can support multiple
window systems simultaneously so we have enable/disable options for
the drivers (gl vs gles1 vs gles2) and options for the individual window
systems; currently glx and egl. Egl is broken down into an option
for each platform.
2011-05-05 14:46:03 +01:00
Robert Bragg
e26a59afc8 EGL: Updates GDL platform support
The GDL API is used for example on intel ce4100 (aka Sodaville) based
systems as a way to allocate memory that can be composited using the
platforms overlay hardware. This updates the Cogl EGL winsys and the
support in Clutter so we can continue to support these platforms.
2011-05-05 14:46:02 +01:00
Robert Bragg
c55cffbb6b Moves all EGL code down from Clutter to Cogl
As was recently done for the GLX window system code, this commit moves
the EGL window system code down from the Clutter backend code into a
Cogl winsys.

Note: currently the cogl/configure.ac is hard coded to only build the GLX
winsys so currently this is only available when building Cogl as part
of Clutter.
2011-05-05 14:46:01 +01:00
Robert Bragg
ce0dc2160c remove references to unused DRM_SURFACELESS EGL platform
The "DRM_SURFACELESS" EGL platform was invented when we were adding the
wayland backend to Clutter but in the end we added a dedicated backend
instead of extending the EGL backend so actually the platform name isn't
used.
2011-05-05 14:46:01 +01:00
Emmanuele Bassi
267de48c1e Point to GNOME for filing bugs
The canonical bug tracker for Clutter has been moved to
bugzilla.gnome.org.
2011-04-12 17:32:01 +01:00
Robert Bragg
af366ad750 backend: remove untested fruity backend
This backend hasn't been used for years now and so because it is
untested code and almost certainly doesn't work any more it would be a
burdon to continue trying to maintain it. Considering that we are now
looking at moving OpenGL window system integration code down from
Clutter backends into Cogl that will be easier if we don't have to
consider this backend.
2011-04-11 17:54:36 +01:00
Robert Bragg
70767f08dc Adds a --with-system-cogl config option for Clutter
This makes it possible to build Clutter against a standalone build of
Cogl instead of having the Clutter build traverse into the clutter/cogl
subdirectory.
2011-04-11 17:54:36 +01:00
Robert Bragg
31da46c799 Adds the ability to build Cogl standalone
This adds an autogen.sh, configure.ac and build/autotool files etc under
clutter/cogl and makes some corresponding Makefile.am changes that make
it possible to build and install Cogl as a standalone library.

Some notable things about this are:
A standalone installation of Cogl installs 3 pkg-config files;
cogl-1.0.pc, cogl-gl-1.0.pc and cogl-2.0.pc. The second is only for
compatibility with what clutter installed though I'm not sure that
anything uses it so maybe we could remove it. cogl-1.0.pc is what
Clutter would use if it were updated to build against a standalone cogl
library. cogl-2.0.pc is what you would use if you were writing a
standalone Cogl application.

A standalone installation results in two libraries currently, libcogl.so
and libcogl-pango.so. Notably we don't include a major number in the
sonames because libcogl supports two major API versions; 1.x as used by
Clutter and the experimental 2.x API for standalone applications.
Parallel installation of later versions e.g. 3.x and beyond will be
supportable either with new sonames or if we can maintain ABI then we'll
continue to share libcogl.so.

The headers are similarly not installed into a directory with a major
version number since the same headers are shared to export the 1.x and
2.x APIs (The only difference is that cogl-2.0.pc ensures that
-DCOGL_ENABLE_EXPERIMENTAL_2_0_API is used). Parallel installation of
later versions is not precluded though since we can either continue
sharing or later add a major version suffix.
2011-04-11 17:54:36 +01:00
Robert Bragg
d6f110a4d2 Moves all GLX code down from Clutter to Cogl
This migrates all the GLX window system code down from the Clutter
backend code into a Cogl winsys. Moving OpenGL window system binding
code down from Clutter into Cogl is the biggest blocker to having Cogl
become a standalone 3D graphics library, so this is an important step in
that direction.
2011-04-11 17:54:36 +01:00
Emmanuele Bassi
42508e6091 build: Look for sed
Use AC_PROG_SED to find sed in a portable way.
2011-04-04 22:33:31 +01:00
Samuel Degrande
4594d1bafe Removes the addition of the .exe extension to unit-test scripts, on win32.
On win32, test scripts are created with a .exe extension.
Under mingw, a .exe script is launched in 16 bit compatibility mode (through
ntvdm), and so it just does not run.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2619
2011-04-01 17:08:25 +01:00
Emmanuele Bassi
a4d29ca2e1 build: Fix previous commit
The previous commit broke the backend-specific required pkg-config
packages.
2011-03-24 14:13:59 +00:00
Emmanuele Bassi
0eee5788df build: Remove bash-isms 2011-03-22 17:18:07 +00:00
Emmanuele Bassi
a5c87c74a6 build: Use AC_CANONICAL_HOST
Since we're checking the value of the $host variable, it's a good idea
to use the canonicalization support in autoconf.
2011-03-22 17:10:49 +00:00
Emmanuele Bassi
23c0dac231 build: Show CFLAGS in the configure summary
Don't show just the maintainer flags, but the whole shebang.
2011-02-28 14:16:24 +00:00
Emmanuele Bassi
0d14be1aec Start 1.7 development cycle 2011-02-28 11:24:14 +00:00
Emmanuele Bassi
b31cf80807 Post-release version bump to 1.6.7 2011-02-21 14:19:47 +00:00
Emmanuele Bassi
d5e6594ddd Release Clutter 1.6.6 (stable) 2011-02-21 12:47:09 +00:00
Emmanuele Bassi
e2bd848924 build: Centralize X11 extensions versioning
Similar to what we did for the base dependencies.
2011-02-19 09:02:51 +00:00
Emmanuele Bassi
8231c345dc build: Compress the CLUTTER_PC_FILES list
A bit of black magic, courtesy of gtk+'s configure.ac, to strip the
leading space from BACKEND_PC_FILES.
2011-02-16 16:42:30 +00:00
Neil Roberts
e52cc75f07 configure.ac: Add -Wpointer-arith to the maintainer CFLAGS
GCC by default allows pointer arithmetic on void* pointers and treats
them as having a size of 1 byte. This is non-standard behaviour and
causes errors on some compilers so we should try to avoid
it. -Wpointer-arith warns about these cases.
2011-02-15 14:26:17 +00:00
Emmanuele Bassi
fbaac155c5 build: Generate README
Use the configure script to generate the README from a template file, so
that we can keep the versions of the dependencies in one place.
2011-02-14 17:27:25 +00:00
Emmanuele Bassi
b91befaaca Post-release version bump to 1.6.5 2011-02-14 16:15:55 +00:00
Emmanuele Bassi
c9b87435d5 Release Clutter 1.6.4 (stable) 2011-02-14 15:53:02 +00:00
Emmanuele Bassi
c2c51b2950 build: Fix clutter-config.h defines
The checks for non-x11/glx platforms were using the wrong configure.ac
variables and values.
2011-02-11 16:53:28 +00:00
Emmanuele Bassi
75434b8a69 build: Modify maintainer compiler flags values
We use the micro version for distinguishing released tarballs and Git
builds; the maintainer compiler flags should be enabled for the latter,
and not just for unstable cycles, since it makes sense to have extra
warning flags even on stable cycles.

We also want to allow people to turn on -Werror on demand, so let's add
a third option to --enable-maintainer-flags.
2011-02-11 15:49:07 +00:00
Emmanuele Bassi
7decee300e docs: Clarify interface_age usage in configure.ac
The clutter_interface_age value should be changed only on stable cycles;
unstable cycles should reset the value to 0.
2011-02-11 15:44:03 +00:00
Emmanuele Bassi
4956152a11 Post-release version bump to 1.6.3 2011-02-07 15:59:42 +00:00
Emmanuele Bassi
bb5608532e Release Clutter 1.6.2 2011-02-07 15:42:45 +00:00
Emmanuele Bassi
adeb611934 Post-release version bump to 1.6.1 2011-01-31 15:04:48 +00:00
Emmanuele Bassi
01cbd47b19 Release Clutter 1.6.0 2011-01-31 14:47:37 +00:00
Emmanuele Bassi
b917285e24 Post-release version bump to 1.5.15 2011-01-24 10:51:06 +00:00
Emmanuele Bassi
3e05d2df8d Release Clutter 1.5.14 (1.6.0rc1) 2011-01-24 10:23:36 +00:00
Emmanuele Bassi
001f84875a Enable XInput support by default
Since we have a decent XI1 and XI2 implementation, now, we should turn
the support for XInput on by default.

The actual implementation to be used at run-time is still left to be
decided by the user.
2011-01-21 10:25:43 +00:00
Emmanuele Bassi
1b1e77b469 event/x11: Rework the way we translate X11 events
This is a lump commit that is fairly difficult to break down without
either breaking bisecting or breaking the test cases.

The new design for handling X11 event translation works this way:

  - ClutterBackend::translate_event() has been added as the central
    point used by a ClutterBackend implementation to translate a
    native event into a ClutterEvent;

  - ClutterEventTranslator is a private interface that should be
    implemented by backend-specific objects, like stage
    implementations and ClutterDeviceManager sub-classes, and
    allows dealing with class-specific event translation;

  - ClutterStageX11 implements EventTranslator, and deals with the
    stage-relative X11 events coming from the X11 event source;

  - ClutterStageGLX overrides EventTranslator, in order to
    deal with the INTEL_GLX_swap_event extension, and it chains up
    to the X11 default implementation;

  - ClutterDeviceManagerX11 has been split into two separate classes,
    one that deals with core and (optionally) XI1 events, and the
    other that deals with XI2 events; the selection is done at run-time,
    since the core+XI1 and XI2 mechanisms are mutually exclusive.

All the other backends we officially support still use their own
custom event source and translation function, but the end goal is to
migrate them to the translate_event() virtual function, and have the
event source be a shared part of Clutter core.
2011-01-21 10:25:43 +00:00
Emmanuele Bassi
94b905b9e1 build: Generate an instealled config header
Clutter has some platform-specific API that is accessible only if the
right backend has been compiled in. Third party applications that wish
to be portable across backends might want to use defines and other
pre-processor tricks to determine header inclusion and API usage.

While Clutter has an internal set of symbols it can use, third party
applications don't have the luxury of being able to access the config.h
generated by Clutter's configure script.

For this reason, Clutter should install a configuration header with a
series of namespaced defines that can be picked up by applications and
other third party code.
2011-01-19 14:33:27 +00:00
Emmanuele Bassi
12ceae548d Post-release version bump to 1.5.13 2011-01-11 21:34:37 +00:00
Emmanuele Bassi
09d5c309ca Release 1.5.12 2011-01-11 20:29:47 +00:00
Neil Roberts
b3058c097d cogl-util: Add an internal wrapper for the ffs function
The ffs function is defined in C99 so if we want to use it in Cogl we
need to provide a fallback for MSVC. This adds a configure check for
the function and then a fallback using a while loop if it is not
available.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2491
2011-01-10 16:55:00 +00:00
Emmanuele Bassi
b9f7ef1110 build: Remove Cogl2 reference from the build scripts
Keeping the Cogl 2.0 API reference in the build is getting far more
troublesome than it's worth.

It's breaking distcheck far too often, and it makes it impossible to
rebuild the build environment from tarballs - which is something that
some distributions (namely: the Debian-based ones, but not limited to
them) do in order to change build scripts using their own rules.
2010-12-18 21:33:37 +00:00