clutter: Update to latest trunk

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4401 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-05-01 16:26:01 +00:00
parent 648cb99667
commit 97c2950928
2 changed files with 1 additions and 35 deletions

View File

@@ -11,37 +11,3 @@ Index: clutter/doc/reference/clutter/Makefile.am
version.xml.in \
actor-box.png \
alpha-func.png \
Index: clutter/configure.ac
===================================================================
--- clutter.orig/configure.ac (revision 2666)
+++ clutter/configure.ac (working copy)
@@ -321,6 +321,9 @@
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
AC_DEFINE([HAVE_CLUTTER_EGL], 1, [Have the EGL backend])
+ CLUTTER_COGL="gles"
+ AC_DEFINE([HAVE_COGL_GLES], [1], [Have GLES for rendering])
+
EGL_LIBS="$GLES_LIBS $X11_LIBS"
EGL_CFLAGS="$GLES_CFLAGS $X11_CFLAGS"
backendextra=x11
@@ -333,6 +336,9 @@
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGLNATIVE"
AC_DEFINE([HAVE_CLUTTER_EGL], 1, [Have the EGL backend])
+ CLUTTER_COGL="gles"
+ AC_DEFINE([HAVE_COGL_GLES], [1], [Have GLES for rendering])
+
PKG_CHECK_MODULES(TSLIB, tslib-1.0, [have_tslib=yes], [have_tslib=no])
if test x$have_tslib = xyes; then
AC_DEFINE([HAVE_TSLIB], 1, [Have tslib for touchscreen handling])
@@ -348,6 +354,9 @@
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
AC_DEFINE([HAVE_CLUTTER_FRUITY], 1, [We're building a fruity version of the eglnative backend])
+ CLUTTER_COGL="gles"
+ AC_DEFINE([HAVE_COGL_GLES], [1], [Have GLES for rendering])
+
EGL_LIBS="-ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit"
EGL_CFLAGS=""
;;

View File

@@ -3,7 +3,7 @@ require clutter.inc
DEFAULT_PREFERENCE = "-1"
PV = "0.7.0+svnr${SRCREV}"
PR = "r2"
PR = "r3"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
file://configure_fix.patch;patch=1 \