5 files changed, 54 insertions, 34 deletions

diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb
new file mode 100644
index 0000000000..bfa41cd30c
--- /dev/null
+++ b/meta/packages/clutter/clutter-1.0_git.bb
@@ -0,0 +1,15 @@
+require clutter.inc
+
+PV = "1.0+git${SRCPV}"
+PR = "r0"
+
+PACKAGES =+ "clutter-examples-1.0"
+FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
+           file://enable_tests-1.0.patch;patch=1 "
+
+S = "${WORKDIR}/git"
+
+BASE_CONF += "--disable-introspection"
+
diff --git a/meta/packages/clutter/clutter-mozembed/clutter10.patch b/meta/packages/clutter/clutter-mozembed/clutter10.patch
deleted file mode 100644
index e6034f696d..0000000000
--- a/meta/packages/clutter/clutter-mozembed/clutter10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac       2009-07-31 10:17:45.000000000 +0100
-+++ git/configure.ac    2009-07-31 10:18:05.000000000 +0100
-@@ -29,7 +29,7 @@
- 
- PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= 2.12.0 gio-2.0)
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
--PKG_CHECK_MODULES(CLUTTER, clutter-0.9 >= 0.9.0)
-+PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= 1.0.0)
- PKG_CHECK_MODULES(MOZILLA, mozilla-js mozilla-headless >= 1.9.2a1pre)
- PKG_CHECK_MODULES(MHS, mhs-1.0)
- 
-Index: git/cluttermozembed/cluttermozembed.pc.in
-===================================================================
---- git.orig/cluttermozembed/cluttermozembed.pc.in      2009-07-31 11:44:08.000000000 +0100
-+++ git/cluttermozembed/cluttermozembed.pc.in   2009-07-31 11:44:17.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- Name: cluttermozembed
- Description: A Clutter actor that embeds Mozilla
--Requires: clutter-0.9 mozilla-js mozilla-headless
-+Requires: clutter-1.0 mozilla-js mozilla-headless
- Version: @VERSION@
- Libs: -L${libdir} -lcluttermozembed
- Cflags: -I${includedir}/cluttermozembed
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
index dfb2b5659f..cc9d43a674 100644
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
@@ -1,7 +1,7 @@
 Index: git/cluttermozembed/Makefile.am
 ===================================================================
---- git.orig/cluttermozembed/Makefile.am        2009-07-24 16:58:24.000000000 +0100
-+++ git/cluttermozembed/Makefile.am     2009-07-24 17:00:53.000000000 +0100
+--- git.orig/clutter-mozembed/Makefile.am       2009-07-24 16:58:24.000000000 +0100
++++ git/clutter-mozembed/Makefile.am    2009-07-24 17:00:53.000000000 +0100
 @@ -66,7 +66,7 @@
         clutter-mozembed.c \
         clutter-mozembed-comms.c \
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb
index bdd96a8cbf..4a51422e2e 100644
--- a/meta/packages/clutter/clutter-mozembed_git.bb
+++ b/meta/packages/clutter/clutter-mozembed_git.bb
@@ -1,15 +1,14 @@
 require clutter-mozembed.inc
 
 PV = "0.8.0+git${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
            file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
-           file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
-           file://clutter10.patch;patch=1;notrev=84a39de2020003464c67e3df29312c09222cff0e"
+           file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
 S = "${WORKDIR}/git"
 
 do_configure_prepend () {
-        touch ${S}/cluttermozembed/dummy.cpp
-        touch ${S}/cluttermozembed/dummy2.cpp
-}
\ No newline at end of file
+        touch ${S}/clutter-mozembed/dummy.cpp
+        touch ${S}/clutter-mozembed/dummy2.cpp
+}
diff --git a/meta/packages/clutter/clutter/enable_tests-1.0.patch b/meta/packages/clutter/clutter/enable_tests-1.0.patch
new file mode 100644
index 0000000000..953edf6bbc
--- /dev/null
+++ b/meta/packages/clutter/clutter/enable_tests-1.0.patch
@@ -0,0 +1,32 @@
+---
+ tests/Makefile.am   |    7 ++++++-
+ tests/test-actors.c |    2 +-
+ tests/test-text.c   |    2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: git/tests/interactive/Makefile.am
+===================================================================
+--- git.orig/tests/interactive/Makefile.am      2009-03-12 11:01:36.000000000 +0000
++++ git/tests/interactive/Makefile.am   2009-03-12 11:04:12.000000000 +0000
+@@ -77,7 +77,7 @@
+ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
+ AM_LDFLAGS = $(CLUTTER_LIBS)
+ 
+-noinst_PROGRAMS = test-interactive
++bin_PROGRAMS = test-interactive
+ 
+ test_interactive_SOURCES = \
+        test-main.c \
+Index: git/tests/interactive/test-actors.c
+===================================================================
+--- git.orig/tests/interactive/test-actors.c    2009-03-12 11:01:36.000000000 +0000
++++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
+@@ -182,7 +182,7 @@
+   oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
+   oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
+ 
+-  real_hand = clutter_texture_new_from_file ("redhand.png", &error);
++  real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
+   if (real_hand == NULL)
+     {
+       g_error ("image load failed: %s", error->message);