diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-05-01 16:26:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-01 16:26:01 +0000 |
| commit | 97c2950928ed5a165dd14a1fdb55d9460422c800 (patch) | |
| tree | a38ad77901c5acacacbe884f985c436c86a2c3dc /meta | |
| parent | 648cb99667d719a14a601536b26f664b2db63819 (diff) | |
| download | openembedded-core-97c2950928ed5a165dd14a1fdb55d9460422c800.tar.gz openembedded-core-97c2950928ed5a165dd14a1fdb55d9460422c800.tar.bz2 openembedded-core-97c2950928ed5a165dd14a1fdb55d9460422c800.zip | |
clutter: Update to latest trunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4401 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/clutter/clutter/configure_fix.patch | 34 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter_svn.bb | 2 |
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 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="" - ;; 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 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 \ |