diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-10 16:59:56 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-10 16:59:56 +0000 |
commit | 57bf2cf3b6df82181a82a1dce391780c34b56f68 (patch) | |
tree | c62e95edf27d2af168622f68247f25e61e7a9339 /meta/packages | |
parent | 5386327d3442738ce6cff75e5f0cb92564d98624 (diff) | |
download | poky-57bf2cf3b6df82181a82a1dce391780c34b56f68.tar.gz |
clutter: Fix locked down revision patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 32 | ||||
-rw-r--r-- | meta/packages/clutter/clutter_git.bb | 5 |
2 files changed, 35 insertions, 2 deletions
diff --git a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch new file mode 100644 index 0000000000..953edf6bbc --- /dev/null +++ b/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.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 | |||
7 | Index: 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 \ | ||
20 | Index: 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); | ||
diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb index 9432615e28..b27fc11ccc 100644 --- a/meta/packages/clutter/clutter_git.bb +++ b/meta/packages/clutter/clutter_git.bb | |||
@@ -2,10 +2,11 @@ require clutter.inc | |||
2 | require clutter-package.inc | 2 | require clutter-package.inc |
3 | 3 | ||
4 | PV = "1.0.0+git${SRCPV}" | 4 | PV = "1.0.0+git${SRCPV}" |
5 | PR = "r6" | 5 | PR = "r7" |
6 | 6 | ||
7 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ | 7 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ |
8 | file://enable_tests.patch;patch=1 " | 8 | file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ |
9 | file://enable_tests.patch;patch=1;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 " | ||
9 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
10 | 11 | ||
11 | BASE_CONF += "--disable-introspection" | 12 | BASE_CONF += "--disable-introspection" |