summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-07 11:55:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:31:34 +0000
commit18ada13f7b47b2c00681289a20161452ad4d3fdf (patch)
tree47c5102e454eee5a61657174e64bcf570d8e75c8 /meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
parentae03f3161f5b3dbaa35935e09e7dab848de0ba66 (diff)
downloadpoky-18ada13f7b47b2c00681289a20161452ad4d3fdf.tar.gz
clutter: upgrade
Delete fix-wayland-deps.patch, it was a backport from upstream. Delete enable_tests which installed the non-inuititive interactive test suite, instead install the examples. (From OE-Core rev: 927a0065c7ce03465125b5b91258c337d2ac7bd2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
new file mode 100644
index 0000000000..d96b038999
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
@@ -0,0 +1,28 @@
1Install the examples to $libdir/clutter/.
2
3Signed-off-by: Ross Burton <ross.burton@intel.com>
4Upstream-Status: Inappropriate
5
6diff --git a/examples/Makefile.am b/examples/Makefile.am
7index 4b9b449..232cd19 100644
8--- a/examples/Makefile.am
9+++ b/examples/Makefile.am
10@@ -31,7 +31,7 @@ LDADD = \
11 AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
12
13 AM_CPPFLAGS = \
14- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
15+ -DTESTS_DATADIR=\""$(exampledir)"\" \
16 -DG_DISABLE_SINGLE_INCLUDES \
17 -DGLIB_DISABLE_DEPRECATION_WARNINGS \
18 -I$(top_srcdir) \
19@@ -39,6 +39,8 @@ AM_CPPFLAGS = \
20 -I$(top_srcdir)/clutter \
21 -I$(top_builddir)/clutter
22
23-noinst_PROGRAMS = $(all_examples)
24+exampledir = $(pkglibdir)/examples
25+example_PROGRAMS = $(all_examples)
26+example_DATA = $(top_srcdir)/tests/data/redhand.png
27
28 -include $(top_srcdir)/build/autotools/Makefile.am.gitignore