1 files changed, 86 insertions, 0 deletions
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
+