diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-11-07 11:55:32 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:27:43 +0000 |
| commit | 927a0065c7ce03465125b5b91258c337d2ac7bd2 (patch) | |
| tree | d08218734e35ea62e6ab56d6f4fa61a606ce3c4c /meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch | |
| parent | 598918602cbd65c6d54a6257cd0952c958a93046 (diff) | |
| download | openembedded-core-contrib-927a0065c7ce03465125b5b91258c337d2ac7bd2.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.
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.patch | 28 |
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 @@ +Install the examples to $libdir/clutter/. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Inappropriate + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 4b9b449..232cd19 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -31,7 +31,7 @@ LDADD = \ + AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS) + + AM_CPPFLAGS = \ +- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ ++ -DTESTS_DATADIR=\""$(exampledir)"\" \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DGLIB_DISABLE_DEPRECATION_WARNINGS \ + -I$(top_srcdir) \ +@@ -39,6 +39,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) ++example_DATA = $(top_srcdir)/tests/data/redhand.png + + -include $(top_srcdir)/build/autotools/Makefile.am.gitignore |