[clutter] Removes Cogl from the repository
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Removes Cogl from the repository
- Date: Fri, 6 May 2011 14:49:54 +0000 (UTC)
commit 223e14811c101e8c5821ffb21c0b7978bd8f9c24
Author: Robert Bragg <robert linux intel com>
Date: Thu May 5 20:56:44 2011 +0100
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.
.gitignore | 46 -
README.in | 35 +-
clutter/Makefile.am | 75 +-
clutter/clutter-main.c | 5 -
clutter/clutter-private.h | 4 -
clutter/cogl/Makefile.am | 7 -
clutter/cogl/autogen.sh | 73 -
clutter/cogl/build/autotools/Makefile.am.enums | 51 -
clutter/cogl/build/autotools/Makefile.am.silent | 19 -
clutter/cogl/build/autotools/as-compiler-flag.m4 | 62 -
clutter/cogl/build/autotools/as-linguas.m4 | 24 -
clutter/cogl/build/autotools/introspection.m4 | 94 -
clutter/cogl/cogl/Makefile.am | 419 --
clutter/cogl/cogl/cogl-1.0-clutter.pc.in | 17 -
clutter/cogl/cogl/cogl-1.0.pc.in | 13 -
clutter/cogl/cogl/cogl-atlas-texture-private.h | 80 -
clutter/cogl/cogl/cogl-atlas-texture.c | 806 ---
clutter/cogl/cogl/cogl-atlas.c | 589 --
clutter/cogl/cogl/cogl-atlas.h | 97 -
clutter/cogl/cogl/cogl-attribute-private.h | 103 -
clutter/cogl/cogl/cogl-attribute.c | 1280 ----
clutter/cogl/cogl/cogl-attribute.h | 182 -
clutter/cogl/cogl/cogl-bitmap-fallback.c | 582 --
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 331 -
clutter/cogl/cogl/cogl-bitmap-private.h | 214 -
clutter/cogl/cogl/cogl-bitmap.c | 498 --
clutter/cogl/cogl/cogl-bitmap.h | 131 -
clutter/cogl/cogl/cogl-bitmask.c | 257 -
clutter/cogl/cogl/cogl-bitmask.h | 227 -
clutter/cogl/cogl/cogl-blend-string.c | 984 ---
clutter/cogl/cogl/cogl-blend-string.h | 137 -
clutter/cogl/cogl/cogl-blit.c | 395 --
clutter/cogl/cogl/cogl-blit.h | 89 -
clutter/cogl/cogl/cogl-buffer-private.h | 163 -
clutter/cogl/cogl/cogl-buffer.c | 556 --
clutter/cogl/cogl/cogl-buffer.h | 242 -
clutter/cogl/cogl/cogl-clip-stack.c | 748 ---
clutter/cogl/cogl/cogl-clip-stack.h | 192 -
clutter/cogl/cogl/cogl-clip-state-private.h | 53 -
clutter/cogl/cogl/cogl-clip-state.c | 255 -
clutter/cogl/cogl/cogl-clip-state.h | 50 -
clutter/cogl/cogl/cogl-clutter.c | 79 -
clutter/cogl/cogl/cogl-clutter.h | 57 -
clutter/cogl/cogl/cogl-color-private.h | 45 -
clutter/cogl/cogl/cogl-color.c | 313 -
clutter/cogl/cogl/cogl-color.h | 544 --
clutter/cogl/cogl/cogl-context-private.h | 282 -
clutter/cogl/cogl/cogl-context.c | 501 --
clutter/cogl/cogl/cogl-context.h | 84 -
clutter/cogl/cogl/cogl-debug-options.h | 187 -
clutter/cogl/cogl/cogl-debug.c | 248 -
clutter/cogl/cogl/cogl-debug.h | 121 -
clutter/cogl/cogl/cogl-defines.h.in | 36 -
clutter/cogl/cogl/cogl-deprecated.h | 36 -
clutter/cogl/cogl/cogl-display-glx-private.h | 57 -
clutter/cogl/cogl/cogl-display-private.h | 48 -
clutter/cogl/cogl/cogl-display-xlib-private.h | 35 -
clutter/cogl/cogl/cogl-display.c | 135 -
clutter/cogl/cogl/cogl-display.h | 100 -
clutter/cogl/cogl/cogl-enum-types.c.in | 41 -
clutter/cogl/cogl/cogl-enum-types.h.in | 25 -
clutter/cogl/cogl/cogl-feature-private.c | 144 -
clutter/cogl/cogl/cogl-feature-private.h | 81 -
clutter/cogl/cogl/cogl-fixed.c | 950 ---
clutter/cogl/cogl/cogl-fixed.h | 804 ---
clutter/cogl/cogl/cogl-flags.h | 89 -
clutter/cogl/cogl/cogl-framebuffer-private.h | 358 -
clutter/cogl/cogl/cogl-framebuffer.c | 1731 -----
clutter/cogl/cogl/cogl-framebuffer.h | 226 -
clutter/cogl/cogl/cogl-gtype-private.h | 48 -
clutter/cogl/cogl/cogl-handle.h | 35 -
clutter/cogl/cogl/cogl-index-array-private.h | 39 -
clutter/cogl/cogl/cogl-index-array.c | 131 -
clutter/cogl/cogl/cogl-index-array.h | 79 -
clutter/cogl/cogl/cogl-indices-private.h | 54 -
clutter/cogl/cogl/cogl-indices.c | 253 -
clutter/cogl/cogl/cogl-indices.h | 77 -
clutter/cogl/cogl/cogl-internal.h | 135 -
clutter/cogl/cogl/cogl-journal-private.h | 93 -
clutter/cogl/cogl/cogl-journal.c | 1805 ------
clutter/cogl/cogl/cogl-material-compat.c | 495 --
clutter/cogl/cogl/cogl-material-compat.h | 1397 ----
clutter/cogl/cogl/cogl-matrix-mesa.c | 1700 -----
clutter/cogl/cogl/cogl-matrix-mesa.h | 226 -
clutter/cogl/cogl/cogl-matrix-private.h | 47 -
clutter/cogl/cogl/cogl-matrix-stack.c | 550 --
clutter/cogl/cogl/cogl-matrix-stack.h | 130 -
clutter/cogl/cogl/cogl-matrix.c | 673 --
clutter/cogl/cogl/cogl-matrix.h | 589 --
clutter/cogl/cogl/cogl-object-private.h | 276 -
clutter/cogl/cogl/cogl-object.c | 249 -
clutter/cogl/cogl/cogl-object.h | 127 -
clutter/cogl/cogl/cogl-offscreen.h | 105 -
clutter/cogl/cogl/cogl-onscreen-template-private.h | 37 -
clutter/cogl/cogl/cogl-onscreen-template.c | 62 -
clutter/cogl/cogl/cogl-onscreen-template.h | 48 -
clutter/cogl/cogl/cogl-path-private.h | 115 -
clutter/cogl/cogl/cogl-path.c | 303 -
clutter/cogl/cogl/cogl-path.h | 491 --
.../cogl/cogl-pipeline-fragend-arbfp-private.h | 43 -
clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c | 1109 ----
.../cogl/cogl-pipeline-fragend-fixed-private.h | 36 -
clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c | 366 --
.../cogl/cogl/cogl-pipeline-fragend-glsl-private.h | 39 -
clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c | 899 ---
clutter/cogl/cogl/cogl-pipeline-opengl-private.h | 155 -
clutter/cogl/cogl/cogl-pipeline-opengl.c | 1332 ----
clutter/cogl/cogl/cogl-pipeline-private.h | 1258 ----
.../cogl/cogl/cogl-pipeline-progend-glsl-private.h | 54 -
clutter/cogl/cogl/cogl-pipeline-progend-glsl.c | 949 ---
.../cogl/cogl-pipeline-vertend-fixed-private.h | 36 -
clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c | 125 -
.../cogl/cogl/cogl-pipeline-vertend-glsl-private.h | 39 -
clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c | 420 --
clutter/cogl/cogl/cogl-pipeline.c | 6854 --------------------
clutter/cogl/cogl/cogl-pipeline.h | 1256 ----
clutter/cogl/cogl/cogl-pixel-array-private.h | 55 -
clutter/cogl/cogl/cogl-pixel-array.c | 148 -
clutter/cogl/cogl/cogl-pixel-array.h | 131 -
clutter/cogl/cogl/cogl-point-in-poly-private.h | 40 -
clutter/cogl/cogl/cogl-point-in-poly.c | 100 -
clutter/cogl/cogl/cogl-primitive-private.h | 54 -
clutter/cogl/cogl/cogl-primitive.c | 553 --
clutter/cogl/cogl/cogl-primitive.h | 674 --
clutter/cogl/cogl/cogl-primitives-private.h | 43 -
clutter/cogl/cogl/cogl-primitives.c | 1178 ----
clutter/cogl/cogl/cogl-primitives.h | 190 -
clutter/cogl/cogl/cogl-private.h | 53 -
clutter/cogl/cogl/cogl-profile.c | 78 -
clutter/cogl/cogl/cogl-profile.h | 61 -
clutter/cogl/cogl/cogl-program-private.h | 84 -
clutter/cogl/cogl/cogl-program.c | 633 --
clutter/cogl/cogl/cogl-rectangle-map.c | 752 ---
clutter/cogl/cogl/cogl-rectangle-map.h | 78 -
clutter/cogl/cogl/cogl-renderer-glx-private.h | 61 -
clutter/cogl/cogl/cogl-renderer-private.h | 47 -
clutter/cogl/cogl/cogl-renderer-x11-private.h | 32 -
clutter/cogl/cogl/cogl-renderer-xlib-private.h | 76 -
clutter/cogl/cogl/cogl-renderer-xlib.c | 200 -
clutter/cogl/cogl/cogl-renderer.c | 285 -
clutter/cogl/cogl/cogl-renderer.h | 164 -
clutter/cogl/cogl/cogl-shader-boilerplate.h | 127 -
clutter/cogl/cogl/cogl-shader-private.h | 65 -
clutter/cogl/cogl/cogl-shader.c | 534 --
clutter/cogl/cogl/cogl-shader.h | 453 --
clutter/cogl/cogl/cogl-spans.c | 132 -
clutter/cogl/cogl/cogl-spans.h | 70 -
clutter/cogl/cogl/cogl-sub-texture-private.h | 70 -
clutter/cogl/cogl/cogl-sub-texture.c | 473 --
clutter/cogl/cogl/cogl-swap-chain-private.h | 38 -
clutter/cogl/cogl/cogl-swap-chain.c | 74 -
clutter/cogl/cogl/cogl-swap-chain.h | 51 -
clutter/cogl/cogl/cogl-texture-2d-private.h | 115 -
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 71 -
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1397 ----
clutter/cogl/cogl/cogl-texture-2d.c | 741 ---
clutter/cogl/cogl/cogl-texture-3d-private.h | 98 -
clutter/cogl/cogl/cogl-texture-3d.c | 681 --
clutter/cogl/cogl/cogl-texture-3d.h | 154 -
clutter/cogl/cogl/cogl-texture-driver.h | 213 -
clutter/cogl/cogl/cogl-texture-private.h | 303 -
clutter/cogl/cogl/cogl-texture-rectangle-private.h | 75 -
clutter/cogl/cogl/cogl-texture-rectangle.c | 652 --
clutter/cogl/cogl/cogl-texture.c | 1533 -----
clutter/cogl/cogl/cogl-texture.h | 464 --
clutter/cogl/cogl/cogl-types.h | 674 --
clutter/cogl/cogl/cogl-util.c | 240 -
clutter/cogl/cogl/cogl-util.h | 106 -
clutter/cogl/cogl/cogl-vector.c | 284 -
clutter/cogl/cogl/cogl-vector.h | 389 --
clutter/cogl/cogl/cogl-vertex-array-private.h | 39 -
clutter/cogl/cogl/cogl-vertex-array.c | 77 -
clutter/cogl/cogl/cogl-vertex-array.h | 82 -
clutter/cogl/cogl/cogl-vertex-buffer-private.h | 164 -
clutter/cogl/cogl/cogl-vertex-buffer.c | 1772 -----
clutter/cogl/cogl/cogl-vertex-buffer.h | 409 --
clutter/cogl/cogl/cogl-xlib-private.h | 76 -
clutter/cogl/cogl/cogl-xlib.c | 184 -
clutter/cogl/cogl/cogl-xlib.h | 84 -
clutter/cogl/cogl/cogl.c | 1114 ----
clutter/cogl/cogl/cogl.h | 1262 ----
clutter/cogl/cogl/cogl.pc.in | 13 -
clutter/cogl/cogl/cogl2-clip-state.c | 49 -
clutter/cogl/cogl/cogl2-clip-state.h | 52 -
clutter/cogl/cogl/cogl2-path.c | 1572 -----
clutter/cogl/cogl/cogl2-path.h | 506 --
clutter/cogl/cogl/driver/Makefile.am | 7 -
.../cogl/cogl/driver/gl/cogl-context-driver-gl.h | 53 -
.../cogl/driver/gl/cogl-feature-functions-gl.h | 423 --
clutter/cogl/cogl/driver/gl/cogl-gl.c | 233 -
.../cogl/cogl/driver/gl/cogl-texture-driver-gl.c | 522 --
.../cogl/driver/gles/cogl-context-driver-gles.h | 52 -
.../cogl/driver/gles/cogl-feature-functions-gles.h | 141 -
clutter/cogl/cogl/driver/gles/cogl-gles.c | 150 -
.../cogl/driver/gles/cogl-texture-driver-gles.c | 511 --
clutter/cogl/cogl/stb_image.c | 3891 -----------
clutter/cogl/cogl/tesselator/GL/glu.h | 40 -
clutter/cogl/cogl/tesselator/README | 446 --
clutter/cogl/cogl/tesselator/dict-list.h | 100 -
clutter/cogl/cogl/tesselator/dict.c | 111 -
clutter/cogl/cogl/tesselator/dict.h | 100 -
clutter/cogl/cogl/tesselator/geom.c | 264 -
clutter/cogl/cogl/tesselator/geom.h | 84 -
clutter/cogl/cogl/tesselator/gluos.h | 1 -
clutter/cogl/cogl/tesselator/memalloc.h | 42 -
clutter/cogl/cogl/tesselator/mesh.c | 798 ---
clutter/cogl/cogl/tesselator/mesh.h | 266 -
clutter/cogl/cogl/tesselator/normal.c | 257 -
clutter/cogl/cogl/tesselator/normal.h | 45 -
clutter/cogl/cogl/tesselator/priorityq-heap.c | 256 -
clutter/cogl/cogl/tesselator/priorityq-heap.h | 107 -
clutter/cogl/cogl/tesselator/priorityq-sort.h | 117 -
clutter/cogl/cogl/tesselator/priorityq.c | 260 -
clutter/cogl/cogl/tesselator/priorityq.h | 117 -
clutter/cogl/cogl/tesselator/render.c | 502 --
clutter/cogl/cogl/tesselator/render.h | 52 -
clutter/cogl/cogl/tesselator/sweep.c | 1361 ----
clutter/cogl/cogl/tesselator/sweep.h | 77 -
clutter/cogl/cogl/tesselator/tess.c | 632 --
clutter/cogl/cogl/tesselator/tess.h | 165 -
clutter/cogl/cogl/tesselator/tesselator.h | 121 -
clutter/cogl/cogl/tesselator/tessmono.c | 201 -
clutter/cogl/cogl/tesselator/tessmono.h | 71 -
.../cogl/winsys/cogl-texture-pixmap-x11-private.h | 87 -
clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 972 ---
clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 155 -
.../winsys/cogl-winsys-egl-feature-functions.h | 57 -
clutter/cogl/cogl/winsys/cogl-winsys-egl.c | 1282 ----
.../winsys/cogl-winsys-glx-feature-functions.h | 105 -
clutter/cogl/cogl/winsys/cogl-winsys-glx.c | 1959 ------
clutter/cogl/cogl/winsys/cogl-winsys-private.h | 154 -
clutter/cogl/cogl/winsys/cogl-winsys-sdl.c | 35 -
clutter/cogl/cogl/winsys/cogl-winsys-stub.c | 112 -
clutter/cogl/cogl/winsys/cogl-winsys.c | 45 -
clutter/cogl/configure.ac | 769 ---
clutter/cogl/doc/CODING_STYLE | 49 -
clutter/cogl/examples/Makefile.am | 31 -
clutter/cogl/examples/hello.c | 49 -
clutter/cogl/examples/x11-foreign.c | 156 -
clutter/cogl/pango/Makefile.am | 56 -
clutter/cogl/pango/cogl-pango-display-list.c | 444 --
clutter/cogl/pango/cogl-pango-display-list.h | 69 -
clutter/cogl/pango/cogl-pango-fontmap.c | 209 -
clutter/cogl/pango/cogl-pango-glyph-cache.c | 414 --
clutter/cogl/pango/cogl-pango-glyph-cache.h | 93 -
clutter/cogl/pango/cogl-pango-pipeline-cache.c | 238 -
clutter/cogl/pango/cogl-pango-pipeline-cache.h | 53 -
clutter/cogl/pango/cogl-pango-private.h | 38 -
clutter/cogl/pango/cogl-pango-render.c | 836 ---
clutter/cogl/pango/cogl-pango.h | 85 -
clutter/cogl/po/ChangeLog | 12 -
clutter/cogl/po/Makevars | 41 -
clutter/cogl/po/POTFILES.in | 1 -
clutter/cogl/po/Rules-quot | 47 -
clutter/cogl/po/boldquot.sed | 10 -
clutter/cogl/po/en boldquot header | 25 -
clutter/cogl/po/en quot header | 22 -
clutter/cogl/po/insert-header.sin | 23 -
clutter/cogl/po/quot.sed | 6 -
clutter/cogl/po/remove-potcdate.sin | 19 -
clutter/glx/clutter-glx-texture-pixmap.c | 4 -
clutter/wayland/clutter-backend-wayland.c | 16 +-
clutter/x11/clutter-x11-texture-pixmap.c | 6 +-
configure.ac | 373 +--
doc/reference/Makefile.am | 4 +-
doc/reference/cogl/Makefile.am | 151 -
doc/reference/cogl/blend-strings.xml | 129 -
doc/reference/cogl/cogl-docs.xml.in | 206 -
doc/reference/cogl/cogl-sections.txt | 660 --
doc/reference/cogl/cogl_ortho.png | Bin 12650 -> 0 bytes
doc/reference/cogl/fill-rule-even-odd.png | Bin 3121 -> 0 bytes
doc/reference/cogl/fill-rule-non-zero.png | Bin 3143 -> 0 bytes
doc/reference/cogl/quad-indices-order.png | Bin 2620 -> 0 bytes
doc/reference/cogl/quad-indices-triangles.png | Bin 8018 -> 0 bytes
tests/conform/test-cogl-texture-pixmap-x11.c | 4 +-
tests/interactive/test-box-layout.c | 2 +-
tests/interactive/test-table-layout.c | 2 +-
277 files changed, 25 insertions(+), 89249 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50016d0..6c0b564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,15 +22,8 @@ stamp-marshal
/clutter/clutter-version.h
/clutter/gcov-report.txt
/clutter/clutter-json.h
-/clutter/cogl/cogl/cogl-defines.h
-/clutter/cogl/cogl/cogl-enum-types.[ch]
-/clutter/cogl/cogl/driver/gl/cogl-defines.h
-/clutter/cogl/cogl/driver/gles/cogl-defines.h
-/clutter/cogl/cogl/cogl-fixed-vertex-shader.[ch]
-/clutter/cogl/cogl/cogl-fixed-fragment-shader.[ch]
/clutter/egl/clutter-cex100.h
/build/autotools/*.m4
-/clutter/cogl/build/autotools/*.m4
!/build/autotools/introspection.m4
!/build/autotools/as-linguas.m4
!/build/autotools/as-compiler-flag.m4
@@ -61,32 +54,6 @@ doc/reference/clutter/clutter.signals
doc/reference/clutter/clutter-docs.xml
doc/reference/clutter/*.stamp
doc/reference/clutter/*.bak
-doc/reference/cogl/cogl-*.txt
-!/doc/reference/cogl/cogl-sections.txt
-doc/reference/cogl/html
-doc/reference/cogl/tmpl
-doc/reference/cogl/xml
-doc/reference/cogl/cogl.args
-doc/reference/cogl/cogl.hierarchy
-doc/reference/cogl/cogl.interfaces
-doc/reference/cogl/cogl.prerequisites
-doc/reference/cogl/cogl.signals
-doc/reference/cogl/cogl-docs.xml
-doc/reference/cogl/*.stamp
-doc/reference/cogl/*.bak
-doc/reference/cogl-2.0/cogl-*.txt
-!/doc/reference/cogl-2.0/cogl-sections.txt
-doc/reference/cogl-2.0/html
-doc/reference/cogl-2.0/tmpl
-doc/reference/cogl-2.0/xml
-doc/reference/cogl-2.0/cogl.args
-doc/reference/cogl-2.0/cogl.hierarchy
-doc/reference/cogl-2.0/cogl.interfaces
-doc/reference/cogl-2.0/cogl.prerequisites
-doc/reference/cogl-2.0/cogl.signals
-doc/reference/cogl-2.0/cogl-docs.xml
-doc/reference/cogl-2.0/*.stamp
-doc/reference/cogl-2.0/*.bak
doc/reference/cally/cally-*.txt
!/doc/reference/cally/cally-sections.txt
doc/reference/cally/html
@@ -124,19 +91,6 @@ TAGS
/po/remove-potcdate.sin
/po/remove-potcdate.sed
/po/stamp-po
-/clutter/cogl/po/POTFILES
-/clutter/cogl/po/*.gmo
-/clutter/cogl/po/Makefile.in.in
-/clutter/cogl/po/Makevars.template
-/clutter/cogl/po/Rules-quot
-/clutter/cogl/po/boldquot.sed
-/clutter/cogl/po/en boldquot header
-/clutter/cogl/po/en quot header
-/clutter/cogl/po/insert-header.sin
-/clutter/cogl/po/quot.sed
-/clutter/cogl/po/remove-potcdate.sin
-/clutter/cogl/po/remove-potcdate.sed
-/clutter/cogl/po/stamp-po
*.swn
*.swo
*.swp
diff --git a/README.in b/README.in
index 4444be8..9b8b33c 100644
--- a/README.in
+++ b/README.in
@@ -10,12 +10,11 @@ REQUIREMENTS
Clutter currently requires:
â?¢ GLib â?¥ @GLIB_REQ_VERSION@
+ â?¢ Cogl â?¥ @COGL_REQ_VERSION@
â?¢ JSON-GLib â?¥ @JSON_GLIB_REQ_VERSION@
â?¢ Atk â?¥ @ATK_REQ_VERSION@
â?¢ Cairo â?¥ @CAIRO_REQ_VERSION@
â?¢ PangoCairo â?¥ @PANGO_REQ_VERSION@
- â?¢ OpenGL â?¥ 1.3 (or 1.2 + multitexturing), or OpenGL ES 2.0 (or 1.1)
- â?¢ GLX, AGL, WGL or an EGL implementation
Clutter also has optional dependencies:
@@ -137,21 +136,6 @@ Clutter has additional command line options for the configure script:
debugging notes. Only use in extreme performance and/or size
optimization cases, though it is strongly discouraged.
- --enable-cogl-debug=[no/minimum/yes]
- Controls COGL debugging level (default=minimum):
-
- yes:
- Support for COGL debugging notes through COGL_DEBUG and
- error checking for each GL primitive. This is useful mostly
- to debug COGL itself.
-
- minimum:
- Support for COGL debugging notes through COGL_DEBUG. This is
- the default for developers snapshots.
-
- no:
- Disable support for COGL runtime debugging notes.
-
--enable-maintainer-flags=[no/yes/error]
Use strict compiler flags. This defaults to 'yes' for building from
Git to 'no' for tarball releases. If 'error' is used, then -Werror
@@ -209,23 +193,6 @@ Clutter has additional command line options for the configure script:
win32:
Microsoft Windows(tm) WGL backend.
- --with-imagebackend=[gdk-pixbuf/quartz/internal]
- Select the image loading backend used by COGL
-
- gdk-pixbuf:
- Depend on gdk-pixbuf-2.0 (default for the glx, eglx,
- eglnative, win32 flavours and recommended).
-
- quartz:
- Depend on CoreGraphics (default for the osx flavour).
-
- internal:
- Internal JPEG and PNG loader. Should only be used
- for testing on new platforms
-
- --with-gles=[1.1/2.0]
- Select the GLES version (for EGL backends) (default=1.1)
-
See also the INSTALL file generated by autotools for further information.
VERSIONING
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index f037d12..3a931da 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -3,11 +3,6 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
# preamble
NULL =
-# we recurse only into Cogl
-if !USE_SYSTEM_COGL
-SUBDIRS = cogl
-endif
-
# common definitions
CLEANFILES =
DISTCLEANFILES =
@@ -27,14 +22,6 @@ INCLUDES = \
-I$(top_builddir)/clutter \
$(NULL)
-if !USE_SYSTEM_COGL
-INCLUDES += \
- -I$(top_srcdir)/clutter/cogl \
- -I$(top_srcdir)/clutter/cogl/pango \
- -I$(top_builddir)/clutter/cogl \
- $(NULL)
-endif
-
AM_CPPFLAGS = \
-DCLUTTER_PREFIX=\""$(prefix)"\" \
-DCLUTTER_LIBDIR=\""$(libdir)"\" \
@@ -633,15 +620,6 @@ libclutter_ CLUTTER_SONAME_INFIX@_ CLUTTER_API_VERSION@_la_LIBADD = \
libclutter_ CLUTTER_SONAME_INFIX@_ CLUTTER_API_VERSION@_la_DEPENDENCIES = \
$(win32_resources)
-if !USE_SYSTEM_COGL
-libclutter_ CLUTTER_SONAME_INFIX@_ CLUTTER_API_VERSION@_la_LIBADD += \
- $(top_builddir)/clutter/cogl/cogl/libcogl.la \
- $(top_builddir)/clutter/cogl/pango/libcoglpango.la
-libclutter_ CLUTTER_SONAME_INFIX@_ CLUTTER_API_VERSION@_la_DEPENDENCIES += \
- $(top_builddir)/clutter/cogl/cogl/libcogl.la \
- $(top_builddir)/clutter/cogl/pango/libcoglpango.la
-endif
-
libclutter_ CLUTTER_SONAME_INFIX@_ CLUTTER_API_VERSION@_la_SOURCES = \
$(backend_source_c) \
$(backend_source_h) \
@@ -666,7 +644,7 @@ libclutter_ CLUTTER_SONAME_INFIX@_ CLUTTER_API_VERSION@_la_LDFLAGS = \
$(CLUTTER_LT_LDFLAGS) \
$(GCOV_LDFLAGS) \
-export-dynamic \
- -export-symbols-regex "^(clutter|cogl|cally).*" \
+ -export-symbols-regex "^(clutter|cally).*" \
-rpath $(libdir) \
$(win32_resources_ldflag) \
$(NULL)
@@ -689,36 +667,9 @@ Clutter_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
--warn-all \
--c-include='clutter/clutter.h' \
--pkg-export=clutter- CLUTTER_API_VERSION@
-if USE_SYSTEM_COGL
Clutter_ CLUTTER_API_VERSION_AM@_gir_INCLUDES += Cogl-1.0
-else
-Clutter_ CLUTTER_API_VERSION_AM@_gir_LIBS += \
- $(top_builddir)/clutter/cogl/cogl/libcogl.la \
- $(top_builddir)/clutter/cogl/pango/libcoglpango.la
-Clutter_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS += \
- --include-uninstalled=$(top_builddir)/clutter/cogl/cogl/Cogl-1.0.gir
-COGL_GIR_DEP=Cogl-1.0.gir
-endif
-
-if !USE_SYSTEM_COGL
-# Cogl.gir is used included into Clutter.gir, so it needs to be built
-# before the typelib is generated
-Clutter- CLUTTER_API_VERSION@.typelib: Cogl-1.0.gir
-
-# We build Cogl.gir in the cogl/ subdir, but it needs to reference the shared
-# library that it's built into, so we delay compiling the gir into typelib
-# until after we've built the shared library. To create the final Cogl.gir
-# that we compile and install, we transfer the shared-library="" line from
-# Clutter.gir to Cogl.gir
-Cogl-1.0.gir: Makefile Clutter- CLUTTER_API_VERSION@.gir cogl/cogl/Cogl-1.0.gir
- $(QUIET_GEN) \
- shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter- CLUTTER_API_VERSION@.gir` ; \
- sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< $(top_builddir)/clutter/cogl/cogl/Cogl-1.0.gir > $@
-
-BUILT_GIRSOURCES += Cogl-1.0.gir
-endif
-
-Cally- CLUTTER_API_VERSION@.gir: Makefile Clutter- CLUTTER_API_VERSION@.gir $(COGL_GIR_DEP)
+
+Cally- CLUTTER_API_VERSION@.gir: Makefile Clutter- CLUTTER_API_VERSION@.gir
Cally_ CLUTTER_API_VERSION_AM@_gir_NAMESPACE = Cally
Cally_ CLUTTER_API_VERSION_AM@_gir_VERSION = @CLUTTER_API_VERSION@
@@ -733,22 +684,13 @@ Cally_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
# Note: it's important to pass --include-uninstalled for the Cogl-1.0.gir
# before the Clutter gir otherwise g-ir-scanner can get upset as it
# immediatly scans the Clutter gir file and may fail to find a Cogl-1.0.gir
-if USE_SYSTEM_COGL
Cally_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS += \
--include-uninstalled=$(top_builddir)/clutter/Clutter- CLUTTER_API_VERSION@.gir
-else
-Cally_ CLUTTER_API_VERSION_AM@_gir_LIBS += \
- $(top_builddir)/clutter/cogl/cogl/libcogl.la \
- $(top_builddir)/clutter/cogl/pango/libcoglpango.la
-Cally_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS += \
- --include-uninstalled=$(top_builddir)/clutter/Cogl-1.0.gir \
- --include-uninstalled=$(top_builddir)/clutter/Clutter- CLUTTER_API_VERSION@.gir
-endif
INTROSPECTION_GIRS += Cally- CLUTTER_API_VERSION@.gir
if SUPPORT_X11
-ClutterX11- CLUTTER_API_VERSION@.gir: Makefile Clutter- CLUTTER_API_VERSION@.gir $(COGL_GIR_DEP)
+ClutterX11- CLUTTER_API_VERSION@.gir: Makefile Clutter- CLUTTER_API_VERSION@.gir
ClutterX11_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS = \
--identifier-prefix=ClutterX11 \
@@ -763,17 +705,8 @@ ClutterX11_ CLUTTER_API_VERSION_AM@_gir_CFLAGS = $(INCLUDES) $(CLUTTER_CFLAGS) $
# Note: it's important to pass --include-uninstalled for the Cogl-1.0.gir
# before the Clutter gir otherwise g-ir-scanner can get upset as it
# immediatly scans the Clutter gir file and may fail to find a Cogl-1.0.gir
-if USE_SYSTEM_COGL
-ClutterX11_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS += \
- --include-uninstalled=$(top_builddir)/clutter/Clutter- CLUTTER_API_VERSION@.gir
-else
ClutterX11_ CLUTTER_API_VERSION_AM@_gir_SCANNERFLAGS += \
- --include-uninstalled=$(top_builddir)/clutter/Cogl-1.0.gir \
--include-uninstalled=$(top_builddir)/clutter/Clutter- CLUTTER_API_VERSION@.gir
-ClutterX11_ CLUTTER_API_VERSION_AM@_gir_LIBS += \
- $(top_builddir)/clutter/cogl/cogl/libcogl.la \
- $(top_builddir)/clutter/cogl/pango/libcoglpango.la
-endif
INTROSPECTION_GIRS += ClutterX11- CLUTTER_API_VERSION@.gir
endif # SUPPORT_X11
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index c7d2f30..5373027 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -110,12 +110,7 @@
#include "clutter-version.h" /* For flavour define */
#include <cogl/cogl.h>
-
-#ifdef CLUTTER_USING_SYSTEM_COGL
#include <cogl/cogl-pango.h>
-#else
-#include "pango/cogl-pango.h"
-#endif
#include "cally.h" /* For accessibility support */
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index 7476f0e..6854700 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -30,11 +30,7 @@
#include <glib/gi18n-lib.h>
-#ifdef CLUTTER_USING_SYSTEM_COGL
#include <cogl/cogl-pango.h>
-#else
-#include "pango/cogl-pango.h"
-#endif
#include "clutter-backend.h"
#include "clutter-effect.h"
diff --git a/clutter/glx/clutter-glx-texture-pixmap.c b/clutter/glx/clutter-glx-texture-pixmap.c
index df29156..8d0084c 100644
--- a/clutter/glx/clutter-glx-texture-pixmap.c
+++ b/clutter/glx/clutter-glx-texture-pixmap.c
@@ -53,11 +53,7 @@
#include "x11/clutter-x11-texture-pixmap.h"
-#ifdef CLUTTER_USING_SYSTEM_COGL
#include <cogl/cogl-texture-pixmap-x11.h>
-#else
-#include "cogl/winsys/cogl-texture-pixmap-x11.h"
-#endif
G_DEFINE_TYPE (ClutterGLXTexturePixmap, \
clutter_glx_texture_pixmap, \
diff --git a/clutter/wayland/clutter-backend-wayland.c b/clutter/wayland/clutter-backend-wayland.c
index 0f791cd..c21b81a 100644
--- a/clutter/wayland/clutter-backend-wayland.c
+++ b/clutter/wayland/clutter-backend-wayland.c
@@ -336,12 +336,12 @@ clutter_backend_wayland_post_parse (ClutterBackend *backend,
return TRUE;
}
-#if defined(HAVE_COGL_GL)
+#if defined(COGL_HAS_GL)
#define _COGL_RENDERABLE_BIT EGL_OPENGL_BIT
-#elif defined(HAVE_COGL_GLES2)
+#elif defined(COGL_HAS_GLES2)
#define _COGL_GLES_VERSION 2
#define _COGL_RENDERABLE_BIT EGL_OPENGL_ES2_BIT
-#elif defined(HAVE_COGL_GLES)
+#elif defined(COGL_HAS_GLES1)
#define _COGL_GLES_VERSION 1
#define _COGL_RENDERABLE_BIT EGL_OPENGL_ES_BIT
#endif
@@ -383,7 +383,7 @@ try_create_context (ClutterBackend *backend,
if (backend_wayland->egl_context == EGL_NO_CONTEXT)
{
-#if defined(HAVE_COGL_GL)
+#if defined(COGL_HAS_GL)
static const EGLint *attribs = NULL;
#else
static const EGLint attribs[] =
@@ -427,11 +427,11 @@ fail:
}
}
-#if defined(HAVE_COGL_GL)
+#if defined(COGL_HAS_GL)
#define _COGL_SURFACELESS_EXTENSION "EGL_KHR_surfaceless_opengl"
-#elif defined(HAVE_COGL_GLES)
+#elif defined(COGL_HAS_GLES1)
#define _COGL_SURFACELESS_EXTENSION "EGL_KHR_surfaceless_gles1"
-#elif defined(HAVE_COGL_GLES2)
+#elif defined(COGL_HAS_GLES2)
#define _COGL_SURFACELESS_EXTENSION "EGL_KHR_surfaceless_gles2"
#endif
@@ -449,7 +449,7 @@ clutter_backend_wayland_create_context (ClutterBackend *backend,
if (backend_wayland->egl_context != EGL_NO_CONTEXT)
return TRUE;
-#if defined(HAVE_COGL_GL)
+#if defined(COGL_HAS_GL)
eglBindAPI (EGL_OPENGL_API);
#else
eglBindAPI (EGL_OPENGL_ES_API);
diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c
index 9965fb0..0b459fc 100644
--- a/clutter/x11/clutter-x11-texture-pixmap.c
+++ b/clutter/x11/clutter-x11-texture-pixmap.c
@@ -51,13 +51,9 @@
#include "clutter-paint-volume-private.h"
#include "clutter-private.h"
-#include "cogl/cogl.h"
+#include <cogl/cogl.h>
-#ifdef CLUTTER_USING_SYSTEM_COGL
#include <cogl/cogl-texture-pixmap-x11.h>
-#else
-#include "cogl/winsys/cogl-texture-pixmap-x11.h"
-#endif
#include <X11/extensions/Xdamage.h>
diff --git a/configure.ac b/configure.ac
index 23d5d04..3753971 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,18 +70,6 @@ AC_SUBST([CLUTTER_API_VERSION], [clutter_api_version])
AC_SUBST([CLUTTER_API_VERSION_AM], [$CLUTTER_MAJOR_VERSION\_0])
AC_SUBST([CLUTTER_RELEASE_STATUS], [clutter_release_status])
-dnl For Makefile.am compatibility with the standalone build of Cogl:
-AC_SUBST([COGL_1_MINOR_VERSION],[clutter_minor_version])
-AC_SUBST([COGL_1_MICRO_VERSION],[clutter_micro_version])
-AC_SUBST([COGL_1_VERSION],[clutter_version])
-
-AC_SUBST([COGL_MAJOR_VERSION],[2])
-AC_SUBST([COGL_MINOR_VERSION],[0])
-AC_SUBST([COGL_MICRO_VERSION],[0])
-AC_SUBST([COGL_VERSION],[2.0.0])
-AC_SUBST([COGL_API_VERSION],[2.0])
-AC_SUBST([COGL_API_VERSION_AM],[2_0])
-
m4_define([lt_current], [m4_eval(100 * clutter_minor_version + clutter_micro_version - clutter_interface_age)])
m4_define([lt_revision], [clutter_interface_age])
m4_define([lt_age], [m4_eval(clutter_binary_age - clutter_interface_age)])
@@ -128,6 +116,7 @@ AC_HEADER_STDC
# required versions for dependencies
m4_define([glib_req_version], [2.26.0])
+m4_define([cogl_req_version], [1.6.0])
m4_define([json_glib_req_version], [0.12.0])
m4_define([atk_req_version], [1.17])
m4_define([cairo_req_version], [1.10])
@@ -140,6 +129,7 @@ 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([JSON_GLIB_REQ_VERSION], [json_glib_req_version])
AC_SUBST([ATK_REQ_VERSION], [atk_req_version])
AC_SUBST([CAIRO_REQ_VERSION], [cairo_req_version])
@@ -190,7 +180,6 @@ FLAVOUR_CFLAGS=""
CLUTTER_WINSYS_BASE=
CLUTTER_WINSYS_BASE_LIB=
CLUTTER_WINSYS=
-cogl_gl_headers=""
glesversion=1.1
use_gles2_wrapper=no
experimental_backend=no
@@ -206,23 +195,8 @@ AC_ARG_WITH([gles],
[Select Clutter GLES version (for EGL backends)])],
[glesversion=$with_gles])
-COGL_REQ=""
-AC_ARG_WITH([system-cogl],
- [AS_HELP_STRING([--with-system-cogl=@<:@yes/no@:>@],
- [Use a system installed Cogl library])],
- [
- if test "x$with_system_cogl" = "xyes"; then
- COGL_REQ="cogl-1.0"
- fi
- ],
- [with_system_cogl=no])
-
-AM_CONDITIONAL(USE_SYSTEM_COGL, [test "x$with_system_cogl" = "xyes"])
-AS_IF([test "x$with_system_cogl" = "xyes"],
- [ AC_DEFINE([CLUTTER_USING_SYSTEM_COGL], [1], [Built against the system Cogl library])])
-
# base dependencies for core
-CLUTTER_BASE_PC_FILES="cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION json-glib-1.0 >= $JSON_GLIB_REQ_VERSION $COGL_REQ"
+CLUTTER_BASE_PC_FILES="cogl-1.0 cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION json-glib-1.0 >= $JSON_GLIB_REQ_VERSION"
# backend specific pkg-config files
BACKEND_PC_FILES=""
@@ -233,15 +207,12 @@ AS_CASE([$CLUTTER_FLAVOUR],
[glx],
[
- cogl_gl_headers="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_GLX"
SUPPORT_X11=1
SUPPORT_XLIB=1
SUPPORT_GLX=1
- COGL_DRIVER="gl"
-
CLUTTER_WINSYS=glx
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
@@ -265,7 +236,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
[opengl-egl-xlib],
[
- cogl_gl_headers="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
CLUTTER_EGL_BACKEND="generic"
@@ -274,8 +244,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
SUPPORT_EGL=1
SUPPORT_EGL_PLATFORM_POWERVR_X11=1
- COGL_DRIVER="gl"
-
CLUTTER_WINSYS=egl
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
@@ -290,13 +258,10 @@ AS_CASE([$CLUTTER_FLAVOUR],
[wayland],
[
experimental_backend="yes"
- cogl_gl_headers="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_WAYLAND"
SUPPORT_WAYLAND=1
- COGL_DRIVER="gl"
-
CLUTTER_WINSYS=wayland
CLUTTER_SONAME_INFIX=wayland
@@ -308,7 +273,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
[eglx],
[
- # the GL header is defined in the COGL checks above
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
CLUTTER_EGL_BACKEND="generic"
@@ -317,8 +281,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
SUPPORT_EGL=1
SUPPORT_EGL_PLATFORM_POWERVR_X11=1
- COGL_DRIVER="gles"
-
CLUTTER_WINSYS=egl
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
@@ -327,7 +289,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
[eglnative],
[
- # the GL header is defined in the COGL checks above
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
CLUTTER_EGL_BACKEND="generic"
@@ -352,8 +313,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
AS_IF([test "x$have_tslib" = "xyes" -a "x$have_evdev" = "xyes"],
[AC_MSG_ERROR([Can't enable both tslib and evdev events])])
- COGL_DRIVER="gles"
-
FLAVOUR_LIBS="$FLAVOUR_LIBS $TSLIB_LIBS $EVDEV_LIBS"
FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS $TSLIB_CFLAGS $EVDEV_CFLAGS"
@@ -369,8 +328,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
SUPPORT_EGL=1
SUPPORT_EGL_PLATFORM_GDL=1
- COGL_DRIVER="gles"
-
# The cex100 is a small specialization of the EGL backend
CLUTTER_WINSYS=egl
CLUTTER_SONAME_INFIX=cex100
@@ -404,14 +361,9 @@ AS_CASE([$CLUTTER_FLAVOUR],
[osx],
[
experimental_backend="yes"
- cogl_gl_headers="OpenGL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_OSX"
AC_DEFINE([HAVE_CLUTTER_OSX], [1], [Have the OSX backend])
- AC_DEFINE([COGL_HAS_OSX_SUPPORT], [1], [Cogl supports the OSX window system])
-
- COGL_DRIVER="gl"
- AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
FLAVOUR_LIBS="$FLAVOUR_LIBS -framework Cocoa -framework OpenGL"
@@ -421,14 +373,8 @@ AS_CASE([$CLUTTER_FLAVOUR],
[win32],
[
- cogl_gl_headers="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_WIN32"
AC_DEFINE([HAVE_CLUTTER_WIN32], [1], [Have the Win32 backend])
- AC_DEFINE([COGL_HAS_WIN32_SUPPORT], [1], [Cogl supports the win32 window system])
- AC_DEFINE([COGL_HAS_WGL_SUPPORT], [1], [Cogl supports OpenGL using the WGL API])
-
- COGL_DRIVER="gl"
- AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
FLAVOUR_LIBS="$FLAVOUR_LIBS -lopengl32 -lgdi32 -lwinmm"
FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS -D_WIN32_WINNT=0x0500"
@@ -446,21 +392,10 @@ AS_CASE([$CLUTTER_FLAVOUR],
win32, eglx or eglnative])]
)
-AS_IF([test "x$SUPPORT_X11" = "x1"],
- [ AC_DEFINE([COGL_HAS_X11_SUPPORT], [1], [Cogl supports the X11 window system])])
-AS_IF([test "x$SUPPORT_XLIB" = "x1"],
- [ AC_DEFINE([COGL_HAS_XLIB_SUPPORT], [1], [Cogl supports X11 using the Xlib API])])
-
AS_IF([test "x$SUPPORT_GLX" = "x1"],
[
- AC_DEFINE([COGL_HAS_GLX_SUPPORT], [1], [Cogl supports OpenGL using the GLX API])
-
- AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], [Cogl can create its own OpenGL context])
-
AC_DEFINE([HAVE_CLUTTER_GLX], [1], [Have the GLX backend])
- AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], [Cogl can create its own OpenGL context])
-
AC_CHECK_HEADERS([GL/glx.h],
[],
[AC_MSG_ERROR([Unable to locate required GLX headers])])
@@ -478,7 +413,6 @@ AS_IF([test "x$SUPPORT_WAYLAND" = "x1"],
AS_IF([test "x$SUPPORT_EGL" = "x1"],
[
AC_DEFINE([HAVE_CLUTTER_EGL], [1], [Have the EGL backend])
- AC_DEFINE([COGL_HAS_EGL_SUPPORT], [1], [Cogl supports GLES using the EGL API])
])
AS_IF([test "x$CLUTTER_EGL_BACKEND" = "xgeneric"],
@@ -487,28 +421,11 @@ AS_IF([test "x$CLUTTER_EGL_BACKEND" = "xgeneric"],
AS_IF([test "x$CLUTTER_EGL_BACKEND" = "xcex100"],
AC_DEFINE([CLUTTER_EGL_BACKEND_CEX100], [1], [Use CEX100 EGL backend]))
-AS_IF([test "x$SUPPORT_EGL_PLATFORM_POWERVR_X11" = "x1"],
- [
- AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT], [1],
- [Cogl supports OpenGL[ES] using the EGL API with PowerVR X11 platform typedefs])
- AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], [Cogl can create its own OpenGL context])
- ])
-
-AS_IF([test "x$SUPPORT_EGL_PLATFORM_POWERVR_NULL" = "x1"],
- [
- AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT], [1],
- [Cogl supports OpenGL[ES] using the EGL API with PowerVR NULL platform typedefs])
- AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], [Cogl can create its own OpenGL context])
- ])
-
# winsys conditionals for use in automake files...
AM_CONDITIONAL(SUPPORT_GLX, [test "x$SUPPORT_GLX" = "x1"])
AM_CONDITIONAL(SUPPORT_X11, [test "x$SUPPORT_X11" = "x1"])
AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "x1"])
AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_X11" = "x1"])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_NULL" = "x1"])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_GDL, [test "x$SUPPORT_EGL_PLATFORM_GDL" = "x1"])
AM_CONDITIONAL(SUPPORT_OSX, [test "x$CLUTTER_WINSYS" = "xosx"])
AM_CONDITIONAL(SUPPORT_WIN32, [test "x$CLUTTER_WINSYS" = "xwin32"])
AM_CONDITIONAL(SUPPORT_CEX100, [test "x$SUPPORT_EGL_PLATFORM_GDL" = "x1"])
@@ -517,186 +434,9 @@ AM_CONDITIONAL(SUPPORT_STUB, [test "x$CLUTTER_WINSYS" = "xwin32" -o \
"x$CLUTTER_WINSYS" = "xosx" -o \
"x$CLUTTER_WINSYS" = "xwayland"])
-dnl === COGL driver backend =====================================================
-
-AS_IF([test "x$COGL_DRIVER" = "xgl"],
- [ AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
- NEED_SEPARATE_EGL=yes
- ])
-
-cogl_gles_version_define=""
-
-AS_IF([test "x$COGL_DRIVER" = "xgles"],
-
- [
- AS_CASE([$glesversion],
-
- [1*],
- [
- cogl_gl_headers="GLES/gl.h GLES/glext.h"
-
- AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
- cogl_gles_version_define="COGL_HAS_GLES1"
-
- PKG_CHECK_EXISTS([glesv1_cm],
- [BACKEND_PC_FILES="$BACKEND_PC_FILES glesv1_cm"
- NEED_SEPARATE_EGL=yes
- ],
- [
- AC_CHECK_HEADERS([$cogl_gl_headers],
- [],
- [AC_MSG_ERROR([Unable to locate required GLES headers])])
-
- # Check for a GLES 1.x Common Profile library with/without EGL.
- #
- # Note: historically GLES 1 libraries shipped with the
- # EGL and GLES symbols all bundled in one library. Now
- # the Khronos Implementers Guide defines two naming
- # schemes: -lGLES_CM should be used for a library that
- # bundles the GLES and EGL API together and -lGLESv1_CM
- # would be used for a standalone GLES API.
- AC_CHECK_LIB(GLES_CM, [eglInitialize],
- [FLAVOUR_LIBS="$FLAVOUR_LIBS -lGLES_CM"],
- [
- AC_CHECK_LIB(GLESv1_CM, [glFlush],
- [FLAVOUR_LIBS="$FLAVOUR_LIBS -lGLESv1_CM"
- NEED_SEPARATE_EGL=yes
- ],
- [AC_MSG_ERROR([Unable to locate required GLES 1.x Common Profile library])])
- ])
- ])
-
- AS_IF([test "x$NEED_SEPARATE_EGL" = "xyes"],
- [
- PKG_CHECK_EXISTS([egl],
- [BACKEND_PC_FILES="$BACKEND_PC_FILES egl"
- NEED_SEPARATE_EGL=yes
- ],
- [
- AC_CHECK_HEADERS([GLES/egl.h],
- [],
- [AC_MSG_ERROR([Unable to locate required EGL headers])])
-
- AC_CHECK_LIB(EGL, [eglInitialize],
- [FLAVOUR_LIBS="$FLAVOUR_LIBS -lEGL"],
- [AC_MSG_ERROR([Unable to locate required EGL library])])
- ])
- ])
- ],
-
- [2*],
- [
- cogl_gl_headers="GLES2/gl2.h GLES2/gl2ext.h"
- use_gles2_wrapper=yes
- AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering])
- cogl_gles_version_define="COGL_HAS_GLES2"
-
- PKG_CHECK_EXISTS([glesv2],
- [BACKEND_PC_FILES="$BACKEND_PC_FILES glesv2"],
- [
- AC_CHECK_HEADERS([$cogl_gl_headers],
- [],
- [AC_MSG_ERROR([Unable to locate required GLES headers])],
- [[#include <GLES2/gl2.h>
- ]])
-
- FLAVOUR_LIBS="$FLAVOUR_LIBS -lGLESv2"
- ])
-
- PKG_CHECK_EXISTS([egl],
- [BACKEND_PC_FILES="$BACKEND_PC_FILES egl"],
- [
- AC_CHECK_HEADERS([EGL/egl.h],
- [],
- [AC_MSG_ERROR([Unable to locate required EGL headers])])
-
- AC_CHECK_LIB(EGL, [eglInitialize],
- [FLAVOUR_LIBS="$FLAVOUR_LIBS -lEGL"],
- [AC_MSG_ERROR([Unable to locate required EGL library])])
-
- FLAVOUR_LIBS="$FLAVOUR_LIBS -lEGL"
- ]
- )
-
- NEED_SEPARATE_EGL=yes
- ],
-
- [AC_MSG_ERROR([Unknown argument for --with-gles])]
- )
- ]
-)
-
AM_CONDITIONAL(USE_TSLIB, [test "x$have_tslib" = "xyes"])
AM_CONDITIONAL(SUPPORT_EVDEV, [test "x$have_evdev" = "xyes"])
-AM_CONDITIONAL(USE_GLES2_WRAPPER, [test "x$use_gles2_wrapper" = "xyes"])
-
-dnl The value of this variable will directly go in the install
-dnl cogl-defines.h header
-COGL_DEFINES="";
-dnl Space-separated list of symbols that should be defined in
-dnl cogl-defines.h
-COGL_DEFINES_SYMBOLS="";
-
-if test "x$SUPPORT_X11" = "x1"; then
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11 COGL_HAS_X11_SUPPORT"
-fi;
-
-if test "x$SUPPORT_XLIB" = "x1"; then
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_XLIB COGL_HAS_XLIB_SUPPORT"
-fi;
-
-if test "x$SUPPORT_GLX" = "x1"; then
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GLX_SUPPORT"
-fi;
-
-if test "x$SUPPORT_EGL" = "x1"; then
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_SUPPORT"
-fi;
-
-if test "x$NEED_SEPARATE_EGL" = "xyes"; then
- AC_DEFINE([HAVE_STANDALONE_EGL], 1, [Have standalone EGL library])
-fi
-
-if test "x$SUPPORT_EGL_PLATFORM_GDL" = "xyes"; then
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT"
-fi
-
-AS_CASE([$COGL_DRIVER],
- [gl],
- [COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GL"
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GL"],
- [gles],
- [COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GLES"
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GLES"
- COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS $cogl_gles_version_define"
- ],
- [AC_MSG_ERROR([Unknown cogl driver $COGL_DRIVER])])
-
-dnl Copy all of the words in COGL_DEFINES_SYMBOLS as separate #define
-dnl lines in COGL_DEFINES
-for x in $COGL_DEFINES_SYMBOLS; do
- COGL_DEFINES="$COGL_DEFINES
-#define $x 1"
-done;
-
-AC_SUBST(COGL_DEFINES)
-
-AS_IF([test "x$cogl_gl_headers" = "x"], [AC_MSG_ERROR([Internal error: no GL header set])])
-
-dnl cogl_gl_headers is a space separate list of headers to
-dnl include. We'll now convert them to a single variable with a
-dnl #include line for each header
-COGL_GL_HEADER_INCLUDES=""
-for x in $cogl_gl_headers; do
- COGL_GL_HEADER_INCLUDES="$COGL_GL_HEADER_INCLUDES
-#include <$x>"
-done;
-AC_SUBST(COGL_GL_HEADER_INCLUDES)
-
-AM_CONDITIONAL([COGL_DRIVER_GLES], [test "x$COGL_DRIVER" = "xgles"])
-AM_CONDITIONAL([COGL_DRIVER_GL], [test "x$COGL_DRIVER" = "xgl"])
-
dnl Instead of using AM_CFLAGS to ensure
dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter
dnl and cogl code we use a define in config.h instead. This helps ensure
@@ -705,10 +445,6 @@ dnl using the define also.
AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1],
[Can use Cogl 2.0 API internally])
-dnl Cogl can be experimentally be built standalone and there are a few
-dnl tweaks we need to make in the Makefiles when building standalone
-AM_CONDITIONAL(COGL_STANDALONE_BUILD, [false])
-
dnl === Clutter configuration =================================================
CLUTTER_CONFIG_DEFINES=
@@ -753,50 +489,12 @@ AC_SUBST([CLUTTER_WINSYS_LIB])
dnl === Clutter substitutions kept for backwards compatibility ================
AC_SUBST([CLUTTER_FLAVOUR])
-CLUTTER_COGL=$COGL_DRIVER
+CLUTTER_COGL=undefined
AC_SUBST([CLUTTER_COGL])
-dnl === Cogl substitutions ====================================================
-AC_SUBST([COGL_IMAGE_BACKEND])
-COGL_WINSYS=$CLUTTER_WINSYS
-AC_SUBST([COGL_WINSYS])
-AC_SUBST([COGL_DRIVER])
-
dnl === Image loading backend =================================================
IMAGE_PC_FILES=""
-# Peek which winsys the user wants so that we can couple the osx winsys with
-# quartz imageloader.
-AS_IF([test "x$COGL_WINSYS" = "xosx"], [COGL_IMAGE_BACKEND=quartz], [COGL_IMAGE_BACKEND=gdk-pixbuf])
-
-AC_ARG_WITH([imagebackend],
- [AC_HELP_STRING([--with-imagebackend=@<:@gdk-pixbuf/quartz/internal@:>@],
- [Select COGL image loading backend])],
- [COGL_IMAGE_BACKEND=$with_imagebackend])
-
-AS_CASE([$COGL_IMAGE_BACKEND],
-
- [quartz],
- [
- experimental_image=yes
- AC_DEFINE([USE_QUARTZ], 1, [Use Core Graphics (Quartz) for loading image data])
- ],
-
- [gdk-pixbuf],
- [
- AC_DEFINE([USE_GDKPIXBUF], 1, [Use GdkPixbuf for loading image data])
- IMAGE_PC_FILES="gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQ_VERSION"
- ],
-
- [internal],
- [
- experimental_image=yes
- AC_DEFINE([USE_INTERNAL], 1, [Use internal image decoding for loading image data])
- ],
-
- [AC_MSG_ERROR([Unknown argument for --with-imagebackend])]
-)
-
dnl === X11 checks, only for X11-based backends ===============================
X11_PC_FILES=""
x11_tests=no
@@ -995,29 +693,6 @@ AS_CASE([$enable_debug],
AC_SUBST(CLUTTER_DEBUG_CFLAGS)
-m4_define([cogl_debug_default], [minimum])
-AC_ARG_ENABLE([cogl-debug],
- [AC_HELP_STRING([--enable-cogl-debug=@<:@no/yes@:>@],
- [Control COGL debugging level @<:@default=cogl_debug_default@:>@])],
- [],
- [enable_cogl_debug=cogl_debug_default])
-
-AS_CASE([$enable_cogl_debug],
-
- [yes],
- [COGL_EXTRA_CFLAGS="-DCOGL_GL_DEBUG -DCOGL_OBJECT_DEBUG -DCOGL_HANDLE_DEBUG -DCOGL_ENABLE_DEBUG"],
-
- [minimum],
- [COGL_EXTRA_CFLAGS="-DCOGL_ENABLE_DEBUG"],
-
- [no],
- [COGL_EXTRA_CFLAGS=""],
-
- [AC_MSG_ERROR([Invalid value for --enable-cogl-debug])]
-)
-
-AC_SUBST(COGL_EXTRA_CFLAGS)
-
dnl === Conformance test suite ================================================
AC_ARG_ENABLE([conformance],
@@ -1044,7 +719,7 @@ AS_CASE([$enable_profile],
AS_IF([test "x$GCC" = "xyes"],
[
PKG_CHECK_MODULES([PROFILE_DEP], [uprof-0.3])
- CLUTTER_PROFILE_CFLAGS="-DCLUTTER_ENABLE_PROFILE -DCOGL_ENABLE_PROFILE $PROFILE_DEP_CFLAGS"
+ CLUTTER_PROFILE_CFLAGS="-DCLUTTER_ENABLE_PROFILE $PROFILE_DEP_CFLAGS"
CLUTTER_PROFILE_LDFLAGS="$PROFILE_DEP_LIBS"
AS_IF([test "x$enable_debug" = "xyes"], [CLUTTER_PROFILE_CFLAGS+=" -DUPROF_DEBUG"])
@@ -1150,11 +825,6 @@ CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_PROFILE_LDFLAGS $GLIB_LI
AC_SUBST(CLUTTER_CFLAGS)
AC_SUBST(CLUTTER_LIBS)
-dnl For Makefile.am compatibility with the standalone build of Cogl:
-AC_SUBST([COGL_DEP_CFLAGS], [$CLUTTER_CFLAGS])
-AC_SUBST([COGL_DEP_LIBS], [$CLUTTER_LIBS])
-AC_SUBST([COGL_PKG_REQUIRES],[$CLUTTER_REQUIRES])
-
dnl === GObject-Introspection check ===========================================
@@ -1243,14 +913,6 @@ AC_CONFIG_FILES([
clutter/cally/cally-$CLUTTER_API_VERSION.pc:clutter/cally/cally.pc.in
- clutter/cogl/Makefile
- clutter/cogl/po/Makefile.in
- clutter/cogl/examples/Makefile
- clutter/cogl/cogl/Makefile
- clutter/cogl/cogl/cogl-defines.h
- clutter/cogl/cogl/cogl-1.0.pc:clutter/cogl/cogl/cogl-1.0-clutter.pc.in
- clutter/cogl/pango/Makefile
-
clutter/egl/clutter-cex100.h
tests/Makefile
@@ -1266,8 +928,6 @@ AC_CONFIG_FILES([
doc/reference/Makefile
doc/reference/clutter/Makefile
doc/reference/clutter/clutter-docs.xml
- doc/reference/cogl/Makefile
- doc/reference/cogl/cogl-docs.xml
doc/reference/cally/Makefile
doc/reference/cally/cally-docs.xml
doc/common/Makefile
@@ -1291,14 +951,13 @@ echo "Clutter - $VERSION (${CLUTTER_RELEASE_STATUS})"
echo ""
echo " â?¢ Global:"
echo " Prefix: ${prefix}"
-echo " Flavour: ${CLUTTER_WINSYS}/${COGL_DRIVER}"
+echo " Flavour: ${CLUTTER_WINSYS}"
echo " Target library: ${CLUTTER_WINSYS_LIB}"
# Compiler/Debug related flags
echo ""
echo " â?¢ Compiler options:"
echo " Clutter debug level: ${enable_debug}"
-echo " COGL debug level: ${enable_cogl_debug}"
echo " Compiler flags: ${CFLAGS} ${MAINTAINER_CFLAGS}"
echo " Profiling enabled: ${enable_profile}"
echo " Enable coverage tests: ${enable_gcov}"
@@ -1315,26 +974,6 @@ echo " â?¢ Extra:"
echo " Build introspection data: ${enable_introspection}"
echo " Build conformance test suite: ${enable_conformance}"
-# Cogl flags
-echo ""
-echo " â?¢ Cogl Backend:"
-echo " Driver: ${COGL_DRIVER}"
-echo " GL header: ${cogl_gl_headers}"
-
-if test "x$COGL_DRIVER" = "xgles"; then
- if test "x$use_gles2_wrapper" = "xyes"; then
-echo " GLES version: 2.0"
- else
-echo " GLES version: 1.1"
- fi
-fi
-
-if test "x$experimental_image" = "xno"; then
-echo " Image backend: ${COGL_IMAGE_BACKEND}"
-else
-echo " Image backend: ${COGL_IMAGE_BACKEND} (WARNING: Experimental)"
-fi
-
# Clutter backend related flags
echo ""
echo " â?¢ Clutter Backend:"
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index ab9b86b..5c120d9 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = cogl clutter cally
+SUBDIRS = clutter cally
-DIST_SUBDIRS = cogl clutter cally
+DIST_SUBDIRS = clutter cally
diff --git a/tests/conform/test-cogl-texture-pixmap-x11.c b/tests/conform/test-cogl-texture-pixmap-x11.c
index f9b4099..abdef12 100644
--- a/tests/conform/test-cogl-texture-pixmap-x11.c
+++ b/tests/conform/test-cogl-texture-pixmap-x11.c
@@ -7,9 +7,7 @@ static const ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
#ifdef COGL_HAS_XLIB
#include <clutter/x11/clutter-x11.h>
-/* This gets installed to a different location so a real application
- would use <cogl/cogl-texture-pixmap-x11.h> */
-#include "cogl/winsys/cogl-texture-pixmap-x11.h"
+#include <cogl/cogl-texture-pixmap-x11.h>
#define PIXMAP_WIDTH 512
#define PIXMAP_HEIGHT 256
diff --git a/tests/interactive/test-box-layout.c b/tests/interactive/test-box-layout.c
index 5e46b28..e354faf 100644
--- a/tests/interactive/test-box-layout.c
+++ b/tests/interactive/test-box-layout.c
@@ -23,7 +23,7 @@
#include <clutter/clutter.h>
#include <cogl/cogl.h>
-#include "pango/cogl-pango.h"
+#include <cogl/cogl-pango.h>
#define INSTRUCTIONS \
"Press v\t\342\236\236\tSwitch horizontal/vertical\n" \
diff --git a/tests/interactive/test-table-layout.c b/tests/interactive/test-table-layout.c
index c3c1877..d0a0312 100644
--- a/tests/interactive/test-table-layout.c
+++ b/tests/interactive/test-table-layout.c
@@ -5,7 +5,7 @@
#include <clutter/clutter.h>
#include <cogl/cogl.h>
-#include "pango/cogl-pango.h"
+#include <cogl/cogl-pango.h>
#define FONT "Sans 12"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
