Add configuration for mesa meson build

3 files changed, 132 insertions, 2 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 0eb63a2..71b758f 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -214,7 +214,7 @@ def SchedulerList():
       repo = get_repo(b)
 
       # high-activity repositories get a tree-stable timer
-      if m.get('id') in [ 'mesa-mesa' ]:
+      if m.get('id') in [ 'mesa-mesa', 'mesa-mesa-meson' ]:
         timer = 300 # 5 minutes
         print("%s %d" % (m.get('id'), timer))
       else:
@@ -275,7 +275,7 @@ def BuilderList(slaves):
     else:
       category = 'misc'
 
-    if name in [ 'mesa-mesa', 'xserver' ]:
+    if name in [ 'mesa-mesa', 'mesa-mesa-meson', 'xserver' ]:
       incremental = True
     else:
       incremental = False
@@ -328,6 +328,7 @@ def BuilderList(slaves):
                       'xts'              : '--disable-shared',
                       'fontconfig'       : '--with-default-fonts=' + os.path.join(prefix, 'share', 'fonts'),
                       'xserver-meson'    : '-Dudev=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true',
+                      'mesa-mesa-meson'  : '-Ddri-drivers= -Dgallium-drivers=swrast -Dglx=dri -Dplatforms=x11,surfaceless -Dvulkan-drivers= -Degl=false',
                     }
 
       extra = []
@@ -363,6 +364,8 @@ def BuilderList(slaves):
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ],
                   'xserver-meson' : [ '0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch' ],
+                  'mesa-mesa-meson' : [ '0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch',
+                                        '0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch' ],
 	        }
 
       if name in patches:
diff --git a/patches/mesa-mesa-meson/0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch b/patches/mesa-mesa-meson/0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch
new file mode 100644
index 0000000..a7baa3d
--- /dev/null
+++ b/patches/mesa-mesa-meson/0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch
@@ -0,0 +1,41 @@
+From f8e7a25bf879c195f61978b352d0dc8e8c9c387b Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 11 Jan 2018 17:41:36 +0000
+Subject: [PATCH 1/2] meson: Fix configuring dri glx with only gallium drivers
+
+'meson -Ddri-drivers= -Dgallium-drivers=swrast -Dglx=dri' fails with 'dri
+based GLX requires at least one DRI driver'
+---
+ meson.build         | 2 +-
+ src/glx/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 77e4e894b23..dd8e6145edb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -323,7 +323,7 @@ if with_glx != 'disabled'
+     if with_dri
+       error('xlib conflicts with any dri driver')
+     endif
+-  elif with_glx == 'dri' and not with_dri
++  elif with_glx == 'dri' and not (with_dri or with_gallium)
+     error('dri based GLX requires at least one DRI driver')
+   endif
+ endif
+diff --git a/src/glx/meson.build b/src/glx/meson.build
+index cdb388e9837..ead6e6138f7 100644
+--- a/src/glx/meson.build
++++ b/src/glx/meson.build
+@@ -65,7 +65,7 @@ extra_libs_libglx = []
+ extra_deps_libgl = []
+ extra_ld_args_libgl = []
+ 
+-if with_dri
++if with_dri or with_gallium
+   files_libglx += files(
+     'dri_common.c',
+     'dri_common.h',
+-- 
+2.15.1
+
diff --git a/patches/mesa-mesa-meson/0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch b/patches/mesa-mesa-meson/0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch
new file mode 100644
index 0000000..8bcd260
--- /dev/null
+++ b/patches/mesa-mesa-meson/0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch
@@ -0,0 +1,86 @@
+From 31e4d4b116be0d5b8f82b3fc668e38c57380a2f0 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu, 11 Jan 2018 19:18:59 +0000
+Subject: [PATCH 2/2] meson: Fix install and linking of gallium swrast only
+ driver
+
+When configured 'meson -Ddri-drivers= -Dgallium-drivers=swrast -Dglx=dri'
+link and install a galliumized swrast_dri.so
+
+Also install dri.pc and internal/dri_interface.h
+---
+ include/meson.build                        | 2 +-
+ src/gallium/meson.build                    | 2 +-
+ src/gallium/state_trackers/dri/meson.build | 2 +-
+ src/gallium/targets/dri/meson.build        | 2 +-
+ src/mesa/drivers/dri/meson.build           | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/meson.build b/include/meson.build
+index a2e7ce6580e..db3b479a94e 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -68,7 +68,7 @@ if with_egl
+   )
+ endif
+ 
+-if with_dri
++if with_dri or with_gallium
+   install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal')
+ endif
+ 
+diff --git a/src/gallium/meson.build b/src/gallium/meson.build
+index 6330c7514af..ba6392467b6 100644
+--- a/src/gallium/meson.build
++++ b/src/gallium/meson.build
+@@ -156,7 +156,7 @@ if with_gallium_opencl
+   subdir('state_trackers/clover')
+   subdir('targets/opencl')
+ endif
+-if with_dri
++if with_dri or with_gallium
+   subdir('state_trackers/dri')
+   subdir('targets/dri')
+ endif
+diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
+index b99314ebf61..6cd70ad6c34 100644
+--- a/src/gallium/state_trackers/dri/meson.build
++++ b/src/gallium/state_trackers/dri/meson.build
+@@ -31,7 +31,7 @@ files_libdri = files(
+   'dri_screen.h',
+ )
+ 
+-if with_dri
++if with_dri or with_gallium_softpipe
+   files_libdri += files('drisw.c')
+ endif
+ 
+diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
+index edf8d67fe39..bf53db4a29d 100644
+--- a/src/gallium/targets/dri/meson.build
++++ b/src/gallium/targets/dri/meson.build
+@@ -42,7 +42,7 @@ if with_ld_dynamic_list
+   gallium_dri_link_depends += files('../dri-vdpau.dyn')
+ endif
+ 
+-if with_dri
++if with_dri or with_gallium_softpipe
+   gallium_dri_link_with += libswdri
+ endif
+ if with_gallium_drisw_kms
+diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
+index 4ec2f343df2..b033d4c536f 100644
+--- a/src/mesa/drivers/dri/meson.build
++++ b/src/mesa/drivers/dri/meson.build
+@@ -63,7 +63,7 @@ endif
+ 
+ # This needs to be installed if any dri drivers (including gallium dri drivers)
+ # are built.
+-if with_dri
++if with_dri or with_gallium
+   pkg.generate(
+     name : 'dri',
+     filebase : 'dri',
+-- 
+2.15.1
+