Update patches

3 files changed, 102 insertions, 1 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 8150022..063be1c 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -364,7 +364,9 @@ def BuilderList(slaves):
                   'app-sessreg' : [ '0001-Don-t-try-to-use-utmpx-functions-if-WTMPX_FILE-isn-t.patch' ],
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ],
-                  'xserver-meson' : [ '0002-Bodge-GL-include-path.patch',
+                  'xserver':      [ '0001-RRCreateLease-cannot-succeed-if-XTRANS_SEND_FDS-is-n.patch' ],
+                  'xserver-meson' : [ '0001-meson-Require-libdrm-for-dri1-2-3-when-configured-au.patch',
+                                      '0002-Bodge-GL-include-path.patch',
                                       '0003-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch',
                                       '0004-Investigate-ignore-weirdness-with-request-length-tes.patch' ],
                   'mesa-mesa-meson' : [ '0001-Fix-use-of-alloca-without-include-c99_alloca.h.patch' ],
diff --git a/patches/xserver-meson/0001-meson-Require-libdrm-for-dri1-2-3-when-configured-au.patch b/patches/xserver-meson/0001-meson-Require-libdrm-for-dri1-2-3-when-configured-au.patch
new file mode 100644
index 0000000..f48ec78
--- /dev/null
+++ b/patches/xserver-meson/0001-meson-Require-libdrm-for-dri1-2-3-when-configured-au.patch
@@ -0,0 +1,62 @@
+From 3a36386e634d75041a2d151bbb9f8f19de7ae233 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 28 Feb 2018 14:21:14 +0000
+Subject: [PATCH xserver] meson: Require libdrm for dri1/2/3 when configured
+ 'auto' as well as 'true'
+
+If dri1/2/3 are configured for auto-detection, libdrm is required, as well
+as the corresponding proto.  (Practically we will always have the
+corresponding protos now, as they are part of xorgproto).
+
+Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+---
+ meson.build | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 77d3c9def..b87cb9be5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -277,20 +277,22 @@ endif
+ 
+ build_glx = get_option('glx')
+ 
++libdrm_dep = dependency('libdrm', version: '>= 2.3.1', required: false)
++
+ if get_option('dri1') == 'auto'
+-    build_dri1 = xf86driproto_dep.found()
++    build_dri1 = xf86driproto_dep.found() and libdrm_dep.found()
+ else
+     build_dri1 = get_option('dri1') == 'true'
+ endif
+ 
+ if get_option('dri2') == 'auto'
+-    build_dri2 = dri2proto_dep.found()
++    build_dri2 = dri2proto_dep.found() and libdrm_dep.found()
+ else
+     build_dri2 = get_option('dri2') == 'true'
+ endif
+ 
+ if get_option('dri3') == 'auto'
+-    build_dri3 = dri3proto_dep.found() and xshmfence_dep.found()
++    build_dri3 = dri3proto_dep.found() and xshmfence_dep.found() and libdrm_dep.found()
+ else
+     build_dri3 = get_option('dri3') == 'true'
+     if build_dri3
+@@ -300,8 +302,11 @@ else
+     endif
+ endif
+ 
+-libdrm_required = (get_option('dri1') == 'true') or (get_option('dri2') == 'true') or (get_option('dri3') == 'true')
+-libdrm_dep = dependency('libdrm', version: '>= 2.3.1', required: libdrm_required)
++libdrm_required = build_dri1 or build_dri2 or build_dri3
++if not libdrm_dep.found() and libdrm_required
++    error('DRI requested, but LIBDRM not found')
++endif
++
+ build_modesetting = false
+ if libdrm_dep.found()
+   if build_dri2
+-- 
+2.16.2
+
diff --git a/patches/xserver/0001-RRCreateLease-cannot-succeed-if-XTRANS_SEND_FDS-is-n.patch b/patches/xserver/0001-RRCreateLease-cannot-succeed-if-XTRANS_SEND_FDS-is-n.patch
new file mode 100644
index 0000000..52cc0d5
--- /dev/null
+++ b/patches/xserver/0001-RRCreateLease-cannot-succeed-if-XTRANS_SEND_FDS-is-n.patch
@@ -0,0 +1,37 @@
+From 5132c1f5c83e2960cdc75d9a4ed3abf11f70431f Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 28 Feb 2018 14:54:02 +0000
+Subject: [PATCH xserver] RRCreateLease cannot succeed if XTRANS_SEND_FDS is
+ not enabled
+
+XXX: note XTRANS_SEND_FDS is hardwired on in meson build at the moment
+---
+ randr/rrlease.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/randr/rrlease.c b/randr/rrlease.c
+index b4a8827cc..2584aa04f 100644
+--- a/randr/rrlease.c
++++ b/randr/rrlease.c
+@@ -242,6 +242,10 @@ ProcRRCreateLease(ClientPtr client)
+     if (!scr_priv->rrCreateLease)
+         return BadMatch;
+ 
++#ifndef XTRANS_SEND_FDS
++    return BadRequest;
++#else
++
+     /* Allocate a structure to hold all of the lease information */
+ 
+     lease = RRLeaseAlloc(screen, stuff->lid, stuff->nCrtcs, stuff->nOutputs);
+@@ -329,6 +333,7 @@ ProcRRCreateLease(ClientPtr client)
+ bail_lease:
+     free(lease);
+     return rc;
++#endif
+ }
+ 
+ int
+-- 
+2.16.2
+