diff options
author | Petter Mabäcker <petter@technux.se> | 2013-10-17 16:58:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-26 15:59:13 +0100 |
commit | 823299e5a7a30377d3e5f6b60883c4eedb656965 (patch) | |
tree | 8e7e67b1470ef28e99f20138c492eecdbd91b31b /meta/recipes-graphics/clutter/clutter-1.0-1.14.4 | |
parent | f995febd2ebd43774cb1cc5917f3f3c46a744519 (diff) | |
download | poky-823299e5a7a30377d3e5f6b60883c4eedb656965.tar.gz |
clutter: remove usage of FILESPATH
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in clutter the default paths solves the problem if we
put all patches in ${BP} directory instead.
(From OE-Core rev: cc41cb61707da1b4ae029de70c922802067166c2)
Signed-off-by: Petter Mabäcker <petter@technux.se>
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-1.14.4')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch | 36 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch | 57 |
2 files changed, 93 insertions, 0 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch new file mode 100644 index 0000000000..f97d598090 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Make tests installable | ||
2 | |||
3 | The test applications are useful for image testing. | ||
4 | |||
5 | Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, | ||
6 | commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
10 | |||
11 | Index: git/tests/interactive/Makefile.am | ||
12 | =================================================================== | ||
13 | --- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000 | ||
14 | +++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000 | ||
15 | @@ -88,7 +88,7 @@ | ||
16 | |||
17 | common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la | ||
18 | |||
19 | -noinst_PROGRAMS = test-interactive | ||
20 | +bin_PROGRAMS = test-interactive | ||
21 | |||
22 | test_interactive_SOURCES = test-main.c $(UNIT_TESTS) | ||
23 | test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) | ||
24 | Index: git/tests/interactive/test-actors.c | ||
25 | =================================================================== | ||
26 | --- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000 | ||
27 | +++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000 | ||
28 | @@ -178,7 +178,7 @@ | ||
29 | oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); | ||
30 | oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); | ||
31 | |||
32 | - file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); | ||
33 | + file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL); | ||
34 | real_hand = clutter_texture_new_from_file (file, &error); | ||
35 | if (real_hand == NULL) | ||
36 | g_error ("image load failed: %s", error->message); | ||
diff --git a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch new file mode 100644 index 0000000000..f5af73c9fc --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba Mon Sep 17 00:00:00 2001 | ||
5 | From: Emmanuele Bassi <ebassi@gnome.org> | ||
6 | Date: Thu, 27 Jun 2013 16:42:40 +0100 | ||
7 | Subject: [PATCH] build: Enable Cogl support with Wayland | ||
8 | |||
9 | The Wayland backend is based on Cogl, so we need to turn on the | ||
10 | SUPPORT_COGL flag to avoid breaking the build; this always went | ||
11 | unnoticed because we usually build the Wayland client backend | ||
12 | with the X11 backend. | ||
13 | |||
14 | Reported-by: Ross Burton <ross.burton@intel.com> | ||
15 | (cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27) | ||
16 | |||
17 | Signed-off-by: Emmanuele Bassi <ebassi@gnome.org> | ||
18 | --- | ||
19 | configure.ac | 6 +++++- | ||
20 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index f5afe12..355c95b 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -310,6 +310,7 @@ AS_IF([test "x$enable_wayland" = "xyes"], | ||
27 | experimental_backend="yes" | ||
28 | |||
29 | SUPPORT_WAYLAND=1 | ||
30 | + SUPPORT_COGL=1 | ||
31 | |||
32 | PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0], | ||
33 | [ | ||
34 | @@ -337,7 +338,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"], | ||
35 | [ | ||
36 | PKG_CHECK_EXISTS([wayland-server], | ||
37 | [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], []) | ||
38 | + | ||
39 | SUPPORT_WAYLAND_COMPOSITOR=1 | ||
40 | + SUPPORT_COGL=1 | ||
41 | + | ||
42 | CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES | ||
43 | #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1" | ||
44 | AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support]) | ||
45 | @@ -359,8 +363,8 @@ AS_IF([test "x$enable_cex100" = "xyes"], | ||
46 | |||
47 | experimental_backend="yes" | ||
48 | |||
49 | - SUPPORT_COGL=1 | ||
50 | SUPPORT_CEX100=1 | ||
51 | + SUPPORT_COGL=1 | ||
52 | |||
53 | have_gdl=no | ||
54 | AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes]) | ||
55 | -- | ||
56 | 1.7.10.4 | ||
57 | |||