summaryrefslogtreecommitdiffstats
path: root/meta/packages/clutter
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/clutter')
-rw-r--r--meta/packages/clutter/clutter/configure_fix.patch34
-rw-r--r--meta/packages/clutter/clutter_svn.bb2
2 files changed, 1 insertions, 35 deletions
diff --git a/meta/packages/clutter/clutter/configure_fix.patch b/meta/packages/clutter/clutter/configure_fix.patch
index f1f44bf872..d37b64cd3a 100644
--- a/meta/packages/clutter/clutter/configure_fix.patch
+++ b/meta/packages/clutter/clutter/configure_fix.patch
@@ -11,37 +11,3 @@ Index: clutter/doc/reference/clutter/Makefile.am
11 version.xml.in \ 11 version.xml.in \
12 actor-box.png \ 12 actor-box.png \
13 alpha-func.png \ 13 alpha-func.png \
14Index: clutter/configure.ac
15===================================================================
16--- clutter.orig/configure.ac (revision 2666)
17+++ clutter/configure.ac (working copy)
18@@ -321,6 +321,9 @@
19 CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
20 AC_DEFINE([HAVE_CLUTTER_EGL], 1, [Have the EGL backend])
21
22+ CLUTTER_COGL="gles"
23+ AC_DEFINE([HAVE_COGL_GLES], [1], [Have GLES for rendering])
24+
25 EGL_LIBS="$GLES_LIBS $X11_LIBS"
26 EGL_CFLAGS="$GLES_CFLAGS $X11_CFLAGS"
27 backendextra=x11
28@@ -333,6 +336,9 @@
29 CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGLNATIVE"
30 AC_DEFINE([HAVE_CLUTTER_EGL], 1, [Have the EGL backend])
31
32+ CLUTTER_COGL="gles"
33+ AC_DEFINE([HAVE_COGL_GLES], [1], [Have GLES for rendering])
34+
35 PKG_CHECK_MODULES(TSLIB, tslib-1.0, [have_tslib=yes], [have_tslib=no])
36 if test x$have_tslib = xyes; then
37 AC_DEFINE([HAVE_TSLIB], 1, [Have tslib for touchscreen handling])
38@@ -348,6 +354,9 @@
39 CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
40 AC_DEFINE([HAVE_CLUTTER_FRUITY], 1, [We're building a fruity version of the eglnative backend])
41
42+ CLUTTER_COGL="gles"
43+ AC_DEFINE([HAVE_COGL_GLES], [1], [Have GLES for rendering])
44+
45 EGL_LIBS="-ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit"
46 EGL_CFLAGS=""
47 ;;
diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index bb36b6573a..edc0259dff 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -3,7 +3,7 @@ require clutter.inc
3DEFAULT_PREFERENCE = "-1" 3DEFAULT_PREFERENCE = "-1"
4 4
5PV = "0.7.0+svnr${SRCREV}" 5PV = "0.7.0+svnr${SRCREV}"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ 8SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
9 file://configure_fix.patch;patch=1 \ 9 file://configure_fix.patch;patch=1 \