summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-06-02 20:33:14 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 09:26:03 +0100
commit6ae56f21f1f4930b8c7e23c5ca9ff529155f8bfb (patch)
tree5d0e948f012667d54555abd13f01b7b35b933eab
parentb7a33b798b7e190db3440d55487bc143a4649606 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch14
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb8
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb8
3 files changed, 10 insertions, 20 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
7index 4b9b449..232cd19 100644 7index 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
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb
deleted file mode 100644
index 584f9d03f3..0000000000
--- a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require clutter-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4
5SRC_URI[archive.md5sum] = "976614a2f7e60af088a0a460fe9d267e"
6SRC_URI[archive.sha256sum] = "0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42"
7
8SRC_URI += "file://install-examples.patch"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
new file mode 100644
index 0000000000..452e7eefd0
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
@@ -0,0 +1,8 @@
1require clutter-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4
5SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29"
6SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"
7
8SRC_URI += "file://install-examples.patch"