diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-01-28 10:01:39 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 23:59:39 +0000 |
commit | 3bb0b9ae97f89507b742cd9b3e03f37c2d928270 (patch) | |
tree | 024f846b86bce7074173390ab9b81e0c0a11d612 /meta/recipes-graphics/clutter/clutter | |
parent | ba06cc8943d021f406c3d292ce415b77319ca5c6 (diff) | |
download | poky-3bb0b9ae97f89507b742cd9b3e03f37c2d928270.tar.gz |
clutter-1.0: Upgrade to 1.4 - latest stable version
* Use tar ball release rather than git, as it is more stable. Added dependence
on gettext, and one patch to fix the cross-compile failure due to
conformance-test.
* configure "--with-json=check" avoid extra dependence on external json lib.
* rename examples package (clutter-examples-1.x => clutter-1.x-example) to lead
the right deploy package name
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch | 13 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch | 66 |
2 files changed, 79 insertions, 0 deletions
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch new file mode 100644 index 0000000000..52fdcb4c1f --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: git/tests/interactive/Makefile.am | ||
2 | =================================================================== | ||
3 | --- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800 | ||
4 | +++ git/tests/interactive/Makefile.am 2011-01-28 14:26:59.000000000 +0800 | ||
5 | @@ -107,7 +107,7 @@ | ||
6 | |||
7 | common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la | ||
8 | |||
9 | -noinst_PROGRAMS = test-interactive | ||
10 | +bin_PROGRAMS = test-interactive | ||
11 | |||
12 | test_interactive_SOURCES = test-main.c $(UNIT_TESTS) | ||
13 | test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) | ||
diff --git a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch new file mode 100644 index 0000000000..ce412ff5af --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | Compiling conformance test leads running test-conformance target binary, and | ||
2 | gets failure in cross-compile environment. Introduce this commit from upstream | ||
3 | to fix it. | ||
4 | |||
5 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
6 | |||
7 | |||
8 | commit 7fd6273c25569fe4f37ad371532d93e5170e51f7 | ||
9 | Author: Neil Roberts <neil@linux.intel.com> | ||
10 | Date: Mon Oct 11 16:16:45 2010 +0100 | ||
11 | |||
12 | tests: Generate the stub scripts using sed | ||
13 | |||
14 | Instead of trying to run ./test-conformance with the -l option to | ||
15 | generate a list of available tests it now runs sed on the | ||
16 | test-conform-main.c file instead. Running the generated executable is | ||
17 | a pain for cross-compiling so it would be nice to avoid it unless it's | ||
18 | absolutely necessary. Although you could tell people who are cross | ||
19 | compiling to just disable the conformance tests, this seems a shame | ||
20 | because they could still be useful along with the wrappers for example | ||
21 | if the cross compile is built to a shared network folder where the | ||
22 | tests can be run on the actual device. | ||
23 | |||
24 | The sed script is a little more ugly than it could be because it tries | ||
25 | to avoid using the GNU extensions '\+' and '\|'. | ||
26 | |||
27 | The script ends up placing restrictions on the format of the C file | ||
28 | because the tests must all be listed on one line each. There is now a | ||
29 | comment to explain this. Hopefully the trade off is worth it. | ||
30 | |||
31 | http://bugzilla.clutter-project.org/show_bug.cgi?id=2363 | ||
32 | |||
33 | diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am | ||
34 | index 3036639..1e723e7 100644 | ||
35 | --- a/tests/conform/Makefile.am | ||
36 | +++ b/tests/conform/Makefile.am | ||
37 | @@ -89,9 +89,11 @@ test_conformance_SOURCES = $(common_sources) $(units_sources) | ||
38 | |||
39 | wrappers: stamp-test-conformance | ||
40 | @true | ||
41 | -stamp-test-conformance: Makefile test-conformance$(EXEEXT) | ||
42 | +stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c | ||
43 | @mkdir -p wrappers | ||
44 | - @( $(abs_builddir)/test-conformance$(EXEEXT) -l -m thorough | $(GREP) '^/' ) > unit-tests | ||
45 | + @sed -n -e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \ | ||
46 | + -e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \ | ||
47 | + $(srcdir)/test-conform-main.c > unit-tests | ||
48 | @chmod +x test-launcher.sh | ||
49 | @( echo "/stamp-test-conformance" ; \ | ||
50 | echo "/test-conformance" ; \ | ||
51 | diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c | ||
52 | index a8b3cf8..2ae7a04 100644 | ||
53 | --- a/tests/conform/test-conform-main.c | ||
54 | +++ b/tests/conform/test-conform-main.c | ||
55 | @@ -92,6 +92,11 @@ main (int argc, char **argv) | ||
56 | { | ||
57 | clutter_test_init (&argc, &argv); | ||
58 | |||
59 | + /* This file is run through a sed script during the make step so the | ||
60 | + lines containing the tests need to be formatted on a single line | ||
61 | + each. To comment out a test use the SKIP or TODO macros. Using | ||
62 | + #if 0 would break the script. */ | ||
63 | + | ||
64 | TEST_CONFORM_SIMPLE ("/timeline", test_timeline); | ||
65 | TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_interpolate); | ||
66 | TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_rewind); | ||