aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-06-02 20:12:03 -0700
committerTim Orling <TicoTimo@gmail.com>2014-06-02 20:18:10 -0700
commitd622e809289dc0d21cc39f77f585b82525dcd6f1 (patch)
treed8dc69d9dfed8476e888317b5d29ef252c5308b6
parent404398a9a076b8c039f88f1d79a85847495a805e (diff)
downloadopenembedded-core-contrib-timo/cogl-clutter-1.18.tar.gz
openembedded-core-contrib-timo/cogl-clutter-1.18.tar.bz2
openembedded-core-contrib-timo/cogl-clutter-1.18.zip
clutter: update to 1.18.2timo/cogl-clutter-1.18
* Updated Ross's install-examples.patch to current ** AM_CPPFLAGS changes no longer needed ** example_DATA = ... redhand.png no longer needed ** minor line # changes Signed-off-by: Tim Orling <TicoTimo@gmail.com>
-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
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 = \
+@@ -38,6 +38,7 @@ 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
+ 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 @@
-require clutter-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI[archive.md5sum] = "976614a2f7e60af088a0a460fe9d267e"
-SRC_URI[archive.sha256sum] = "0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42"
-
-SRC_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 @@
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29"
+SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"
+
+SRC_URI += "file://install-examples.patch"