summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch57
1 files changed, 57 insertions, 0 deletions
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 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba Mon Sep 17 00:00:00 2001
5From: Emmanuele Bassi <ebassi@gnome.org>
6Date: Thu, 27 Jun 2013 16:42:40 +0100
7Subject: [PATCH] build: Enable Cogl support with Wayland
8
9The Wayland backend is based on Cogl, so we need to turn on the
10SUPPORT_COGL flag to avoid breaking the build; this always went
11unnoticed because we usually build the Wayland client backend
12with the X11 backend.
13
14Reported-by: Ross Burton <ross.burton@intel.com>
15(cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27)
16
17Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
18---
19 configure.ac | 6 +++++-
20 1 file changed, 5 insertions(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index 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--
561.7.10.4
57