Update patches

2 files changed, 55 insertions, 0 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 078243c..26c0208 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -366,6 +366,7 @@ def BuilderList(slaves):
                   'xserver-meson' : [ '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-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch' ],
 	        }
 
       if name in patches:
diff --git a/patches/mesa-mesa-meson/0001-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch b/patches/mesa-mesa-meson/0001-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch
new file mode 100644
index 0000000..6388608
--- /dev/null
+++ b/patches/mesa-mesa-meson/0001-meson-libdrm-shouldn-t-appear-in-.pc-Requires.privat.patch
@@ -0,0 +1,54 @@
+From 49e9789d23cfda47f1017fa30b1d7e3e41cd42e2 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 25 Jan 2018 18:53:08 +0000
+Subject: [PATCH] meson: libdrm shouldn't appear in .pc Requires.private: if it
+ wasn't found
+
+---
+ meson.build                      | 6 ++++--
+ src/mesa/drivers/dri/meson.build | 7 ++++++-
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index bc5996992a3..824e3c46bc5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1213,8 +1213,10 @@ inc_include = include_directories('include')
+ 
+ gl_priv_reqs = [
+   'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb',
+-  'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75',
+-]
++  'xcb-glx >= 1.8.1']
++if dep_libdrm.found()
++  gl_priv_reqs += 'libdrm >= 2.4.75'
++endif
+ if dep_xxf86vm != [] and dep_xxf86vm.found()
+   gl_priv_reqs += 'xxf86vm'
+ endif
+diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
+index 94798b0f5da..87021fba885 100644
+--- a/src/mesa/drivers/dri/meson.build
++++ b/src/mesa/drivers/dri/meson.build
+@@ -67,12 +67,17 @@ endif
+ # This needs to be installed if any dri drivers (including gallium dri drivers)
+ # are built.
+ if with_dri
++  dri_req_private = []
++  if dep_libdrm.found()
++    dri_req_private = ['libdrm >= 2.4.75']  # FIXME: don't hardcode this
++  endif
++
+   pkg.generate(
+     name : 'dri',
+     filebase : 'dri',
+     description : 'Direct Rendering Infrastructure',
+     version : meson.project_version(),
+     variables : ['dridriverdir=${prefix}/' + dri_drivers_path],
+-    requires_private : ['libdrm >= 2.4.75'],  # FIXME: don't hardcode this
++    requires_private : dri_req_private,
+   )
+ endif
+-- 
+2.15.1
+