Update Clutter to 0.6

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3897 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 2bb519b66103244eeefca6996756a7402292be8c..a3a00c03e7e166719d17c4ec5b44da5438853a5d 100644 (file)
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -39,6 +39,5 @@ do_configure_prepend() {
 }
 
 do_stage () {
-       cp ${S}/clutter.pc ${S}/clutter-0.5.pc
         autotools_stage_all
 }

diff --git a/meta/packages/clutter/clutter/enable_tests-0.6.patch b/meta/packages/clutter/clutter/enable_tests-0.6.patch
new file mode 100644 (file)
index 0000000..544a7e5
--- /dev/null
+++ b/meta/packages/clutter/clutter/enable_tests-0.6.patch
@@ -0,0 +1,40 @@
+---
+ tests/Makefile.am   |    7 ++++++-
+ tests/test-actors.c |    2 +-
+ tests/test-text.c   |    2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter-0-6/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am     2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/Makefile.am      2007-11-06 12:30:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+                   test-actors test-behave test-text test-entry test-project \
+                 test-boxes test-perspective test-rotate test-depth \
+                 test-threads test-timeline test-score test-script
+@@ -26,4 +26,9 @@ test_timeline_SOURCES  = test-timeline.c
+ test_score_SOURCES     = test-score.c
+ test_script_SOURCES    = test-script.c
+ 
++test_textdir           = $(pkgdatadir)
++test_text_DATA         = test-text.c
++test_actorsdir         = $(pkgdatadir)
++test_actors_DATA       = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter-0-6/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c   2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/test-actors.c    2007-11-06 12:29:21.000000000 +0000
+@@ -143,7 +143,7 @@ main (int argc, char *argv[])
+   stage = clutter_stage_get_default ();
+   clutter_actor_set_size (stage, 800, 600);
+ 
+-  pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
++  pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
+ 
+   if (!pixbuf)
+     g_error("pixbuf load failed");
+

diff --git a/meta/packages/clutter/clutter_0.6svn.bb b/meta/packages/clutter/clutter_0.6svn.bb
new file mode 100644 (file)
index 0000000..4d5b915
--- /dev/null
+++ b/meta/packages/clutter/clutter_0.6svn.bb
@@ -0,0 +1,12 @@
+require clutter.inc
+
+PV = "0.6.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \
+          file://enable_tests-0.6.patch;patch=1 "
+
+S = "${WORKDIR}/clutter-0-6"
+
+do_stage () {
+        autotools_stage_all
+}

diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index a0015ba42e5625bff153b8ae6af2129d38c16760..76ad7ce50fb67ddc481b8a906706cbe7bc128b20 100644 (file)
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -2,7 +2,7 @@ require clutter.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.5.0+svnr${SRCREV}"
+PV = "0.7.0+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
           file://enable_tests.patch;patch=1 "