summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter-1.0.inc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-07 11:55:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:31:34 +0000
commit18ada13f7b47b2c00681289a20161452ad4d3fdf (patch)
tree47c5102e454eee5a61657174e64bcf570d8e75c8 /meta/recipes-graphics/clutter/clutter-1.0.inc
parentae03f3161f5b3dbaa35935e09e7dab848de0ba66 (diff)
downloadpoky-18ada13f7b47b2c00681289a20161452ad4d3fdf.tar.gz
clutter: upgrade
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>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-1.0.inc')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 1356586fd8..d9311fea4d 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -4,11 +4,8 @@ LICENSE = "LGPLv2.1+"
4 4
5inherit clutter 5inherit clutter
6 6
7SRC_URI += "file://enable_tests.patch \
8 file://fix-wayland-deps.patch"
9
10DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" 7DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
11PACKAGES =+ "${PN}-examples" 8PACKAGE_BEFORE_PN += "${PN}-examples"
12AUTOTOOLS_AUXDIR = "${S}/build" 9AUTOTOOLS_AUXDIR = "${S}/build"
13 10
14EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" 11EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
@@ -39,7 +36,8 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla
39PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 36PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
40 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" 37 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
41 38
42FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 39FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
40FILES_${PN}-examples = "${libdir}/clutter/examples"
43 41
44do_configure_prepend() { 42do_configure_prepend() {
45 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this 43 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this