summaryrefslogtreecommitdiffstats
path: root/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-04-29 10:26:05 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2013-04-30 10:10:14 +0200
commitbe33cb9ecae2b4427a23b213f44b96c3dbd1d540 (patch)
tree5d4f9b5a15e69003541c3c2b20fa08706bd31b2a /package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
parent41c0864646327d6f28d7379b119ae09e58e9acfe (diff)
downloadbuildroot-novena-be33cb9ecae2b4427a23b213f44b96c3dbd1d540.tar.gz
buildroot-novena-be33cb9ecae2b4427a23b213f44b96c3dbd1d540.zip
weston: new package
[Peter: fix udev comment, add upstream URL] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch')
-rw-r--r--package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch b/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
new file mode 100644
index 000000000..d390b025f
--- /dev/null
+++ b/package/weston/weston-0001-Pull-DRM-dependent-code-only-when-the-DRM-compositor.patch
@@ -0,0 +1,47 @@
+From b8a831387a37f09ea5479eeb1d435a26680299c6 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 19 Apr 2013 06:19:05 +0200
+Subject: [PATCH] Pull DRM dependent code only when the DRM compositor is
+ enabled
+
+The <xf86drm.h> header and the drm*() functions may not be available
+at all when the DRM compositor is not enabled, so they should not be
+used. Fixes build failures when building the fbdev compositor on
+systems where DRM is not available.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/launcher-util.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/launcher-util.c b/src/launcher-util.c
+index 9196e4f..d2fb160 100644
+--- a/src/launcher-util.c
++++ b/src/launcher-util.c
+@@ -31,7 +31,9 @@
+ #include <sys/uio.h>
+ #include <fcntl.h>
+
++#ifdef BUILD_DRM_COMPOSITOR
+ #include <xf86drm.h>
++#endif
+
+ #include "compositor.h"
+ #include "launcher-util.h"
+@@ -103,6 +105,7 @@ weston_launcher_open(struct weston_compositor *compositor,
+ return data->fd;
+ }
+
++#ifdef BUILD_DRM_COMPOSITOR
+ int
+ weston_launcher_drm_set_master(struct weston_compositor *compositor,
+ int drm_fd, char master)
+@@ -157,4 +160,4 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor,
+
+ return ret;
+ }
+-
++#endif
+--
+1.7.9.5
+