diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-01-30 12:06:59 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-01-30 12:25:15 +0000 |
| commit | 3d0a2473a29b60c7d339837f0fed6e92a9fad9d1 (patch) | |
| tree | d52882c54e17947891ec00c0ec77b91ff155dcfe | |
| parent | 55fe293b2f4e9ee73b74557b272384cd7ba8223b (diff) | |
| download | clutter-3d0a2473a29b60c7d339837f0fed6e92a9fad9d1.tar.gz | |
Require Cogl = 1.8
Cogl's API has been changed in the 1.9 cycle; specifically the
CoglVector3 type has been removed and replaced by a float[3]. This
introduced an upper bound on the version of Cogl that we can use
when building Clutter.
To remain on the safe side, let's specify that we can only build
Clutter 1.8 with a Cogl version newer than 1.8.0, but older than
1.9.2.
Distro teams will hate us, but that's how we roll.
| -rw-r--r-- | README.in | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -10,7 +10,7 @@ REQUIREMENTS Clutter currently requires: • GLib ≥ @GLIB_REQ_VERSION@ - • Cogl ≥ @COGL_REQ_VERSION@ + • Cogl ≤ @COGL_MIN_REQ_VERSION@ ≥ @COGL_MAX_REQ_VERSION@ • JSON-GLib ≥ @JSON_GLIB_REQ_VERSION@ • Atk ≥ @ATK_REQ_VERSION@ • Cairo ≥ @CAIRO_REQ_VERSION@ diff --git a/configure.ac b/configure.ac index a17c72890..423c6ec64 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,8 @@ AC_HEADER_STDC # required versions for dependencies m4_define([glib_req_version], [2.28.0]) -m4_define([cogl_req_version], [1.8.0]) +m4_define([cogl_min_req_version], [1.8.0]) +m4_define([cogl_max_req_version], [1.9.2]) m4_define([json_glib_req_version], [0.12.0]) m4_define([atk_req_version], [2.1.5]) m4_define([cairo_req_version], [1.10]) @@ -126,7 +127,8 @@ m4_define([xfixes_req_version], [3]) m4_define([xcomposite_req_version], [0.4]) AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) -AC_SUBST([COGL_REQ_VERSION], [cogl_req_version]) +AC_SUBST([COGL_MIN_REQ_VERSION], [cogl_min_req_version]) +AC_SUBST([COGL_MAX_REQ_VERSION], [cogl_max_req_version]) AC_SUBST([JSON_GLIB_REQ_VERSION], [json_glib_req_version]) AC_SUBST([ATK_REQ_VERSION], [atk_req_version]) AC_SUBST([CAIRO_REQ_VERSION], [cairo_req_version]) @@ -195,7 +197,7 @@ AC_ARG_WITH([gles], [glesversion=$with_gles]) # base dependencies for core -CLUTTER_BASE_PC_FILES="cogl-1.0 >= $COGL_REQ_VERSION cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION cogl-pango-1.0 json-glib-1.0 >= $JSON_GLIB_REQ_VERSION" +CLUTTER_BASE_PC_FILES="cogl-1.0 >= $COGL_MIN_REQ_VERSION cogl-1.0 <= $COGL_MAX_REQ_VERSION cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION cogl-pango-1.0 json-glib-1.0 >= $JSON_GLIB_REQ_VERSION" # backend specific pkg-config files BACKEND_PC_FILES="" |