summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-01 16:06:24 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-01 16:06:24 +0000
commit648cb99667d719a14a601536b26f664b2db63819 (patch)
tree4fb4e22b232dbfa9691f63704e9e2fcdde59e944
parent3f3eaca7eebd937b47a4dd7a673c8a721df11888 (diff)
downloadpoky-648cb99667d719a14a601536b26f664b2db63819.tar.gz
clutter: Fix configure with trunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4399 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/clutter/clutter/configure_fix.patch47
-rw-r--r--meta/packages/clutter/clutter_svn.bb4
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 0000000000..f1f44bf872
--- /dev/null
+++ b/meta/packages/clutter/clutter/configure_fix.patch
@@ -0,0 +1,47 @@
1Index: clutter/doc/reference/clutter/Makefile.am
2===================================================================
3--- clutter.orig/doc/reference/clutter/Makefile.am 2008-05-01 16:02:49.000000000 +0100
4+++ clutter/doc/reference/clutter/Makefile.am 2008-05-01 16:03:00.000000000 +0100
5@@ -124,7 +124,7 @@
6
7 # Other files to distribute
8 # e.g. EXTRA_DIST += version.xml.in
9-EXTRA_DIST += \
10+EXTRA_DIST = \
11 version.xml.in \
12 actor-box.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 76ad7ce50f..bb36b6573a 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -3,9 +3,11 @@ 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"
6 7
7SRC_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 \
8 file://enable_tests.patch;patch=1 " 9 file://configure_fix.patch;patch=1 \
10 file://enable_tests.patch;patch=1 "
9 11
10S = "${WORKDIR}/clutter" 12S = "${WORKDIR}/clutter"
11 13