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>

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+"
 
 inherit clutter
 
-SRC_URI += "file://enable_tests.patch \
-            file://fix-wayland-deps.patch"
-
 DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
-PACKAGES =+ "${PN}-examples"
+PACKAGE_BEFORE_PN += "${PN}-examples"
 AUTOTOOLS_AUXDIR = "${S}/build"
 
 EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
@@ -39,7 +36,8 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
 
-FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
+FILES_${PN}-examples = "${libdir}/clutter/examples"
 
 do_configure_prepend() {
         # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this