diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-05-01 16:06:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-01 16:06:24 +0000 |
| commit | 648cb99667d719a14a601536b26f664b2db63819 (patch) | |
| tree | 4fb4e22b232dbfa9691f63704e9e2fcdde59e944 /meta | |
| parent | 3f3eaca7eebd937b47a4dd7a673c8a721df11888 (diff) | |
| download | openembedded-core-648cb99667d719a14a601536b26f664b2db63819.tar.gz openembedded-core-648cb99667d719a14a601536b26f664b2db63819.tar.bz2 openembedded-core-648cb99667d719a14a601536b26f664b2db63819.tar.xz openembedded-core-648cb99667d719a14a601536b26f664b2db63819.zip | |
clutter: Fix configure with trunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4399 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/clutter/clutter/configure_fix.patch | 47 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter_svn.bb | 4 |
2 files changed, 50 insertions, 1 deletions
diff --git a/meta/packages/clutter/clutter/configure_fix.patch b/meta/packages/clutter/clutter/configure_fix.patch new file mode 100644 index 000000000..f1f44bf87 --- /dev/null +++ b/meta/packages/clutter/clutter/configure_fix.patch @@ -0,0 +1,47 @@ +Index: clutter/doc/reference/clutter/Makefile.am +=================================================================== +--- clutter.orig/doc/reference/clutter/Makefile.am 2008-05-01 16:02:49.000000000 +0100 ++++ clutter/doc/reference/clutter/Makefile.am 2008-05-01 16:03:00.000000000 +0100 +@@ -124,7 +124,7 @@ + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += \ ++EXTRA_DIST = \ + 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 76ad7ce50..bb36b6573 100644 --- a/meta/packages/clutter/clutter_svn.bb +++ b/meta/packages/clutter/clutter_svn.bb @@ -3,9 +3,11 @@ require clutter.inc DEFAULT_PREFERENCE = "-1" PV = "0.7.0+svnr${SRCREV}" +PR = "r2" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ - file://enable_tests.patch;patch=1 " + file://configure_fix.patch;patch=1 \ + file://enable_tests.patch;patch=1 " S = "${WORKDIR}/clutter" |