1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

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>
This commit is contained in:
Tim Orling
2014-06-02 20:33:14 -07:00
committed by Richard Purdie
parent b7a33b798b
commit 6ae56f21f1
3 changed files with 10 additions and 20 deletions
@@ -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
@@ -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"
@@ -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"