mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

clutter: upgrade

Browse Source 
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.

(From OE-Core rev: 927a0065c7ce03465125b5b91258c337d2ac7bd2)

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>
This commit is contained in:
Ross Burton
2013-11-07 11:55:32 +00:00
committed by Richard Purdie
parent ae03f3161f
commit 18ada13f7b
6 changed files with 39 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
+28
View File
@@ -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