diff options
author | Tim Orling <TicoTimo@gmail.com> | 2014-06-02 20:33:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-06 09:26:03 +0100 |
commit | 6ae56f21f1f4930b8c7e23c5ca9ff529155f8bfb (patch) | |
tree | 5d0e948f012667d54555abd13f01b7b35b933eab /meta/recipes-graphics/clutter/clutter-1.0 | |
parent | b7a33b798b7e190db3440d55487bc143a4649606 (diff) | |
download | poky-6ae56f21f1f4930b8c7e23c5ca9ff529155f8bfb.tar.gz |
clutter: update to 1.18.2
* Updated Ross's install-examples.patch to current
** AM_CPPFLAGS changes no longer needed
** example_DATA = ... redhand.png no longer needed
** minor line # changes
(From OE-Core rev: 7a15b1855021eec9dd292bb76c0543a886e9c2ad)
Signed-off-by: Tim Orling <TicoTimo@gmail.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')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch | 14 |
1 files changed, 2 insertions, 12 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 index d96b038999..3b6a70ef0a 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch +++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch | |||
@@ -7,22 +7,12 @@ diff --git a/examples/Makefile.am b/examples/Makefile.am | |||
7 | index 4b9b449..232cd19 100644 | 7 | index 4b9b449..232cd19 100644 |
8 | --- a/examples/Makefile.am | 8 | --- a/examples/Makefile.am |
9 | +++ b/examples/Makefile.am | 9 | +++ b/examples/Makefile.am |
10 | @@ -31,7 +31,7 @@ LDADD = \ | 10 | @@ -38,6 +38,7 @@ AM_CPPFLAGS = \ |
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 \ | 11 | -I$(top_srcdir)/clutter \ |
21 | -I$(top_builddir)/clutter | 12 | -I$(top_builddir)/clutter |
22 | 13 | ||
23 | -noinst_PROGRAMS = $(all_examples) | 14 | -noinst_PROGRAMS = $(all_examples) |
24 | +exampledir = $(pkglibdir)/examples | 15 | +exampledir = $(pkglibdir)/examples |
25 | +example_PROGRAMS = $(all_examples) | 16 | +example_PROGRAMS = $(all_examples) |
26 | +example_DATA = $(top_srcdir)/tests/data/redhand.png | ||
27 | 17 | ||
28 | -include $(top_srcdir)/build/autotools/Makefile.am.gitignore | 18 | EXTRA_DIST = redhand.png |