Commit Graph

269 Commits

Author SHA1 Message Date
Robert Bragg
6757f41c86 configure: Improves GLES 1.x checks
We now always aim to use pkg-config based configuration when possible,
but when not configure.ac now knows the difference between GLES_CM
libraries that contain EGL symbols (I.e. a separate EGL library doesn't
need to be found) and GLESv1_CM libraries that don't contain EGL
symbols.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2160
2010-07-06 15:02:36 +01:00
Damien Lespiau
1860d45087 build: Allow to run the tests from any directory
I was fed up to cd into the tests/conform or tests/interactive directories
to launch a specific test. Now, with the power the abs_ variants of
builddir and srcdir we can run specific test from any directory.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2159
2010-07-06 12:39:15 +01:00
Emmanuele Bassi
40c45ef29b Post-release version bump to 1.3.7 2010-06-30 12:53:20 +01:00
Emmanuele Bassi
a534ef65b1 Release 1.3.6 2010-06-30 12:41:54 +01:00
Neil Roberts
fae4d60106 cogl: Pull in the code for GLU tesselator from Mesa/SGI
This copies the files for the GLU tesselator from Mesa. The Mesa code
is based on the original SGI code and is released under a BSD license.

The memalloc.h header has been replaced with one that forces the code
to use g_malloc and friends. The rest of the files are not altered
from the original so it should be possible to later upgrade the files
by simply overwriting them.

There is a tesselator.h header which is expected to be included by
rest of Cogl to use the tesselator. This contains a trimmed down
version of glu.h that only includes parts that pertain to the
tesselator. There is also a stub glu.h in the GL directory which is
just provided so that the tesselator code can include <GL/gl.h>
without depending on the system header. It just redirects to
tesselator.h
2010-06-29 20:37:13 +01:00
Emmanuele Bassi
f60999becf Change the Bugzilla link in the configure script 2010-06-23 18:47:14 +01:00
Emmanuele Bassi
3734408962 Use -Bsymbolic-functions
The -Bsymbolic-functions linker flag allows to avoid intra-library
PLT jumps on ELF platforms. It is similar to the aliasing hack in
GLib and GTK+, but definitely less messy.

The configure script should look for the flags, in order to support
platforms/linkers that do not have it.
2010-06-22 13:32:11 +01:00
Neil Roberts
7fae8ac051 cogl-defines.h: Add a COGL_HAS_X11 define
This will be defined in cogl-defines.h whenever Cogl is built using a
winsys that supports X11. This implies CoglTexturePixmapX11 will be
available.

To make this work the two separate cogl-defines.h.in files have been
merged into one. The configure script now makes a @COGL_DEFINES@
substitution variable which contains the #define lines to put in
rather than directly having them in the seperate files.
2010-06-22 12:22:47 +01:00
Emmanuele Bassi
db1434ab71 json: Bump up the requirement of json-glib
We're actually using a symbol (the JSON_NODE_HOLDS macro) that was
defined in json-glib 0.10, so we need to bump up the dependency.
2010-06-22 08:00:40 +01:00
Robert Bragg
e4e6a6dfe5 configure.ac only explicitly add -lGL if no pkgconfig file
When configuring the glx flavour we were always explicitly adding -lGL
to the linker flags even when a pkg-config file was found which should
take care of that option for us.
2010-06-18 17:38:41 +01:00
Robert Bragg
c767feecbb configure.ac: Use pkg-config for gles1/2 if available
When building for gles1/2 we now always try and look for a libglesv1_cm
or libglesv2 .pc file with details about where to find the library and
headers.
2010-06-18 17:38:41 +01:00
Robert Bragg
d45ac12628 egl: Consolidates eglx and eglnative into one "egl" winsys
This remove quite a lot of redundant code by consolidating the eglx and
eglnative window system backends.
2010-06-18 17:38:41 +01:00
Robert Bragg
46bed23302 tslib: Add USE_TSLIB conditional for clutter-event-tslib.c
This adds an automake USE_TSLIB condition to decide when we should
compile clutter-event-tslib.c. This is in preparation for consolidating
the eglx and eglnative backends.
2010-06-18 17:38:40 +01:00
Robert Bragg
53bf95466b build: Adds a new opengl-egl-xlib build flavour
With this patch if you ./configure clutter using
--with-flavour=opengl-egl-xlib then it will use EGL + OpenGL instead of
the default GLX and OpenGL.

These days upstream driver work is more focused on improving EGL than it
is GLX so likewise we want to make sure Clutter has good support for
EGL.
2010-06-18 17:38:40 +01:00
Robert Bragg
bf9d5f3949 build: distinguish CLUTTER_WINSYS and CLUTTER_SONAME_INFIX
This adds a separate variable name "CLUTTER_SONAME_INFIX" to define the
infix for the clutter library that gets linked. Currently the WINSYS
corresponds to the directory we enter when building to compile the
window system and input support, but it is desirable to be able to
define multiple flavours that use the same WINSYS but should result in
different library names.

For example we are planning to combine the eglx and eglnative window
systems into one "egl" winsys but we will need to preserve the current
library names for the eglx and eglnative flavours.
2010-06-18 17:38:40 +01:00
Robert Bragg
4bd44738fd configure.ac: avoid some duplication
When we check the flavour we now just set boolean variables for the
following things:

SUPPORT_X11=1
SUPPORT_XLIB=1
SUPPORT_GLX=1
SUPPORT_EGL=1
SUPPORT_EGL_POWERVR_X11=1
SUPPORT_EGL_POWERVR_NULL=1

This lets us avoid some duplication and also some error prone tests for
lists of flavours used, for example, to determine when we need to check
for x libraries.
2010-06-18 17:38:40 +01:00
Robert Bragg
25ed304567 configure.ac: distinguish CLUTTER_FLAVOUR and CLUTTER_WINSYS
It's desirable to have a separation between the "flavour" and the
"winsys". The flavour is a concept internal to the configure script and
is a convenient name to represent the users choice of window system,
opengl driver and input backend. The CLUTTER_WINSYS currently defines
the subdirectory under clutter/ that should be compiled to handle the
window system and input.

With a separation we could add a flavour with no correspondence to which
clutter/subdirectory needs to be built.
2010-06-18 17:38:40 +01:00
Robert Bragg
c3e43a7e47 configure.ac: move the special handling of the fruity flavour
After checking the flavour option the user gives we were checking for
the fruity flavour to override the glesversion. Now that the glsl
checking has been moved this can instead just wait until the AS_CASE
that handles all the flavour configuration.
2010-06-18 17:38:40 +01:00
Robert Bragg
e3293abcd4 configure.ac: move gles checks after the flavour checks
The flavour AS_CASE should define whether a flavour uses the gl or gles
COGL_DRIVER and so we shouldn't need to have an expanding list of
tests to gate when we check for a gles driver because if we move the
checks for gles after the flavour checks we can just look at
$COGL_DRIVER.
2010-06-18 17:38:39 +01:00
Robert Bragg
c151fa2efd configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.

This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 17:38:39 +01:00
Kristian Høgsberg
21820d50ca Don't add GL libs for EGL X11 backend
Configure uses the GL .pc file to add GL includes and libs for the eglx
backend.

http://bugzilla.openedhand.com/show_bug.cgi?id=2104

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2010-06-14 13:14:14 +01:00
Emmanuele Bassi
759ea5ce45 Post-release bump to 1.3.5 2010-06-07 23:26:03 +01:00
Emmanuele Bassi
bd3b8c2349 Release 1.3.4 2010-06-07 23:19:02 +01:00
Emmanuele Bassi
d2e91c9935 Post-release version bump to 1.3.3 2010-05-24 16:57:35 +01:00
Emmanuele Bassi
cc907a99c9 Release 1.3.2 (snapshot) 2010-05-24 16:50:36 +01:00
Alejandro Piñeiro
fd584e1841 Added Atk dependency
Added Atk dependency, in order to implement a built-in
accessibility support on Clutter.
2010-05-24 15:52:22 +01:00
Emmanuele Bassi
5e3dc55666 Merge branch 'wip/constraints'
* wip/constraints: (24 commits)
  Add the Cogl API reference to the fixxref extra directories
  Document the internal MetaGroup class
  Remove the construct-only flag from ActorMeta:name
  doc: Remove gtk-doc annotations from the json-glib copy
  doc: Fix parameter documentation
  Add named modifiers for Action and Constraint
  Remove a redundant animation
  Set the stage resizable in test-constraints
  Use a 9 grid for the constraints test
  Miscellaneous documentation fixes
  docs: Document animating action and constraint properties
  docs: Document BindConstraint and AlignConstraint
  constraint: Rename BindConstraint:bind-axis
  constraints: Add AlignConstraint
  tests: Add a constraints interactive test
  constraint: Add BindConstraint
  actor: Implement Animatable
  animation: Use the new Animatable API for custom properties
  animatable: Add custom properties to Animatable
  constraint: Add ClutterConstraint base class
  ...

Conflicts:
	configure.ac
2010-05-21 10:55:09 +01:00
Emmanuele Bassi
6457f66976 Miscellaneous documentation fixes 2010-05-19 16:10:05 +01:00
Robert Bragg
f2f2e9b7e6 build: expose automake conditionals for cogl winsys
Expose the ./configured window system/backend options to the Cogl
automake files via some new SUPPORT_XYZ conditionals.
2010-05-19 15:08:14 +01:00
Robert Bragg
a29d1b799a configure.ac: Adds some COGL_HAS_XYZ_SUPPORT defines
This exposes the ./configured window system/backend options to Cogl via
a set of new COGL_HAS_XYZ_SUPPORT defines:

COGL_HAS_{X11,XLIB,GLX,EGL,EGL_PLATFORM_XYZ,OSX,WIN32,WGL}_SUPPORT
2010-05-19 15:08:08 +01:00
Neil Roberts
07880d8b74 configure: Check the result of AM_PATH_GLIB_2_0
The AM_PATH_GLIB_2_0 doesn't automatically cause the configure script
to fail if the test fails. This wouldn't usually cause any problems
because we later check for the right glib version using
PKG_CHECK_MODULES directly. However AM_PATH_GLIB_2_0 is more thorough
when checking because it also tries to run a program against the
library to read the version. If the macro fails but the pkg-config
check passes then nothing will define GLIB_GENMARSHAL and the build
step will fail in a confusing way.

This adds a check for the result and gives an AC_MSG_ERROR if it
fails. The glib dependencies have been moved out of CLUTTER_DEPS to
AM_PATH_GLIB_2_0.

http://bugzilla.openedhand.com/show_bug.cgi?id=2127
2010-05-18 14:49:05 +01:00
Emmanuele Bassi
755625c758 build: Clean up build dependencies
• Depend on autoconf 2.63
• Depend on automake 1.11
• Depend on gobject-introspection 0.6.7
• Depend on gtk-doc 1.13
• Remove Shave from the build
2010-05-05 11:52:20 +01:00
Emmanuele Bassi
05afe139a5 Require GLib >= 2.18
We use g_signal_override_class_handler(), which was added in GLib 2.18,
so we should bump up our requirements.
2010-04-19 17:56:19 +01:00
Emmanuele Bassi
9e0385304f build: Mark --with-json=internal as experimental
The system JSON-GLib installation should be the preferred way of parsing
JSON in Clutter. The internal copy is limited by re-synchronization from
upstream, and by the fact that upstream contains a fork of GScanner that
allows parsing escaped UTF-8. We should warn users compiling Clutter
with the internal copy, just like we warn about the internal image
backend.
2010-03-18 20:36:02 +00:00
Emmanuele Bassi
7e700be7b8 build: Require xcomposite
The X11TexturePixmap actor uses XComposite API directly, without guards.
It has been doing so for a while, against the fact that we do check for
the XComposite extension - but we don't depend on it. As soon as you try
building Clutter on X11 without the XComposite extension available all
hell breaks loose.

The obvious fix is to make Clutter depend on XComposite - basically
ratifying what's the current state of things.
2010-03-18 20:27:18 +00:00
Emmanuele Bassi
035d571e95 Branch master for 1.3 2010-03-16 10:44:40 +00:00
Emmanuele Bassi
4e946f538c Post-release version bump to 1.2.3 2010-03-15 16:40:50 +00:00
Emmanuele Bassi
7b5692f8b3 Release 1.2.2 2010-03-15 16:25:46 +00:00
Emmanuele Bassi
fa6070ec1a Post-release version bump to 1.2.1 2010-03-02 19:41:44 +00:00
Emmanuele Bassi
ab61842980 Release 1.2.0 (stable) 2010-03-02 19:29:42 +00:00
Emmanuele Bassi
e3fba5f2e8 build: Require libtool >= 2.2.6
Update the configure.ac to use the LT_INIT() instead of the deprecated
AC_PROG_LIBTOOL. This also allows us to depend on a specific libtool
version, namely one that doesn't thoroughly suck.
2010-03-02 13:32:46 +00:00
Emmanuele Bassi
23867875a1 build: Remove unused checks on platform functions
There is no need for us to check for low-level functions and header
files, especially since we haven't been checking the results until
now. This makes cross-compiling slightly more bearable.
2010-03-01 11:12:16 +00:00
Emmanuele Bassi
c8c62af0cf build: More options for Automake
Require automake >= 1.10, and add the following options:

  » dist-bzip2: create a bz2 tarball in the dist process
  » check-news: check that we changed the NEWS file prior to dist,
    to avoid another release without NEWS updates, like 1.1.10
2010-02-26 15:00:47 +00:00
Emmanuele Bassi
fd6f670743 Post-release version bump to 1.1.15 2010-02-24 14:40:22 +00:00
Emmanuele Bassi
18659b008c Release 1.1.14 2010-02-24 14:26:46 +00:00
Robert Bragg
a58d6e8ee5 cogl debug: Support "minimum" level debugging by default
We basically want all Clutter applications out in the wild to at least
have the basic set of COGL_DEBUG/--cogl-debug options available for
investigating issues.
2010-02-23 22:09:07 +00:00
Emmanuele Bassi
dd36c3ad5c Post-release version bump to 1.1.13 2010-02-16 12:32:37 +00:00
Emmanuele Bassi
21354b2b75 Release 1.1.12 (developers snapshot) 2010-02-16 12:21:15 +00:00
Emmanuele Bassi
27e6c3b1e0 build: Use -Wuninitialized instead of -Wno-uninitialized
We want to be warned about uninitialized variables.
2010-02-12 14:57:56 +00:00
Emmanuele Bassi
1d28ed035f Post-release bump to 1.1.11 2010-02-09 13:39:08 +00:00