summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-11 10:45:07 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-11 10:45:07 +0100
commit2c259b0907fa9b3b6cc625dc1ea4ca4b7bddcef7 (patch)
tree1556963d5f4896b5fcae12fd6e0118051826fd95
parentf0b05021bf061df7936f7b8f14c702ce708cc284 (diff)
downloadpoky-2c259b0907fa9b3b6cc625dc1ea4ca4b7bddcef7.tar.gz
clutter: Add recipe for 1.0 release branch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/clutter/clutter-1.0_git.bb15
-rw-r--r--meta/packages/clutter/clutter/enable_tests-1.0.patch32
2 files changed, 47 insertions, 0 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 @@
1require clutter.inc
2
3PV = "1.0+git${SRCPV}"
4PR = "r0"
5
6PACKAGES =+ "clutter-examples-1.0"
7FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
8
9SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
10 file://enable_tests-1.0.patch;patch=1 "
11
12S = "${WORKDIR}/git"
13
14BASE_CONF += "--disable-introspection"
15
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 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
11@@ -77,7 +77,7 @@
12 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
13 AM_LDFLAGS = $(CLUTTER_LIBS)
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = \
19 test-main.c \
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
24@@ -182,7 +182,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
29+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
30 if (real_hand == NULL)
31 {
32 g_error ("image load failed: %s", error->message);