summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland/weston/0001-DRM-condition.patch
diff options
context:
space:
mode:
authorLauren Post <lauren.post@freescale.com>2013-10-01 12:01:54 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2013-11-18 13:45:36 -0200
commitbce654fbc44d931494eb8f2662ada6d57c57d9dc (patch)
tree496d6a3f044d90aac5673a363dcf26c31310eae9 /recipes-graphics/wayland/weston/0001-DRM-condition.patch
parentc285cc44b1c0a51c3c29a1a0bf778e45b3a71ccd (diff)
downloadmeta-fsl-arm-bce654fbc44d931494eb8f2662ada6d57c57d9dc.tar.gz
wayland: Update weston 1.1.0 for i.MX waylanddora-next
Change-Id: Ief472ec91a57afb39e6e9a2d33898ca75fb13218 Signed-off-by: Lauren Post <lauren.post@freescale.com>
Diffstat (limited to 'recipes-graphics/wayland/weston/0001-DRM-condition.patch')
-rw-r--r--recipes-graphics/wayland/weston/0001-DRM-condition.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/recipes-graphics/wayland/weston/0001-DRM-condition.patch b/recipes-graphics/wayland/weston/0001-DRM-condition.patch
new file mode 100644
index 0000000..93eab54
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0001-DRM-condition.patch
@@ -0,0 +1,46 @@
1From e1bfeb25d4d2d2ef6002986cca615817848b27dd Mon Sep 17 00:00:00 2001
2From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
3Date: Thu, 11 Apr 2013 23:27:31 -0500
4Subject: [PATCH] DRM condition
5
6Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
7---
8 src/launcher-util.c | 8 ++++++--
9 1 file changed, 6 insertions(+), 2 deletions(-)
10
11diff --git a/src/launcher-util.c b/src/launcher-util.c
12index 9196e4f..7168f60 100644
13--- a/src/launcher-util.c
14+++ b/src/launcher-util.c
15@@ -30,9 +30,9 @@
16 #include <sys/stat.h>
17 #include <sys/uio.h>
18 #include <fcntl.h>
19-
20+#if defined(DRM)
21 #include <xf86drm.h>
22-
23+#endif
24 #include "compositor.h"
25 #include "launcher-util.h"
26 #include "weston-launch.h"
27@@ -107,6 +107,7 @@ int
28 weston_launcher_drm_set_master(struct weston_compositor *compositor,
29 int drm_fd, char master)
30 {
31+#if defined(DRM)
32 struct msghdr msg;
33 struct cmsghdr *cmsg;
34 struct iovec iov;
35@@ -156,5 +157,8 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor,
36 return -1;
37
38 return ret;
39+#else
40+ return 0;
41+#endif
42 }
43
44--
451.8.1.4
46