1 files changed, 85 insertions, 0 deletions
diff --git a/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch b/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch
new file mode 100644
index 0000000..5397aa7
--- /dev/null
+++ b/patches/mesa-mesa-meson/0003-meson-Force-.so-extension-for-megadriver-modules.patch
@@ -0,0 +1,85 @@
+From 43c96ce6768f855fdb0cb9647fb12d14bafe47bc Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Sun, 14 Apr 2019 20:46:39 +0100
+Subject: [PATCH] meson: Force '.so' extension for megadriver modules
+
+DRI driver loadable modules are always installed with
+install_megadriver.py with names ending with '.so', irrespective of
+platform.
+
+Force the name the loadable module is built with to match, so
+install_megadriver.py doesn't spin trying to remove non-existent
+symlinks.
+
+Fixes: c77acc3c "meson: remove meson-created megadrivers symlinks"
+---
+ src/gallium/targets/dri/meson.build   | 1 +
+ src/gallium/targets/va/meson.build    | 1 +
+ src/gallium/targets/vdpau/meson.build | 1 +
+ src/gallium/targets/xvmc/meson.build  | 1 +
+ src/mesa/drivers/dri/meson.build      | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
+index 5b4b4bc1ab7..dd40969a166 100644
+--- a/src/gallium/targets/dri/meson.build
++++ b/src/gallium/targets/dri/meson.build
+@@ -63,6 +63,7 @@ libgallium_dri = shared_library(
+   # Will be deleted during installation, see install_megadrivers.py
+   install : true,
+   install_dir : dri_drivers_path,
++  name_suffix : 'so',
+ )
+ 
+ foreach d : [[with_gallium_kmsro, [
+diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
+index 827cfb8d829..4bfb5cbab7a 100644
+--- a/src/gallium/targets/va/meson.build
++++ b/src/gallium/targets/va/meson.build
+@@ -52,6 +52,7 @@ libva_gallium = shared_library(
+   # Will be deleted during installation, see install_megadrivers.py
+   install : true,
+   install_dir : va_drivers_path,
++  name_suffix : 'so',
+ )
+ 
+ foreach d : [[with_gallium_r600, 'r600'],
+diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
+index 3017721bda0..48f01ffba6c 100644
+--- a/src/gallium/targets/vdpau/meson.build
++++ b/src/gallium/targets/vdpau/meson.build
+@@ -58,6 +58,7 @@ libvdpau_gallium = shared_library(
+   # Will be deleted during installation, see install_megadrivers.py
+   install : true,
+   install_dir : vdpau_drivers_path,
++  name_suffix : 'so',
+ )
+ foreach d : [[with_gallium_r300, 'r300'],
+              [with_gallium_r600, 'r600'],
+diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
+index 845f3a421b7..537275aab57 100644
+--- a/src/gallium/targets/xvmc/meson.build
++++ b/src/gallium/targets/xvmc/meson.build
+@@ -50,6 +50,7 @@ libxvmc_gallium = shared_library(
+   # Will be deleted during installation, see install_megadrivers.py
+   install : true,
+   install_dir : xvmc_drivers_path,
++  name_suffix : 'so',
+ )
+ 
+ foreach d : [[with_gallium_r600, 'r600'], [with_gallium_nouveau, 'nouveau']]
+diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
+index a0f47bbecee..dddc4ae3dfd 100644
+--- a/src/mesa/drivers/dri/meson.build
++++ b/src/mesa/drivers/dri/meson.build
+@@ -57,6 +57,7 @@ if dri_drivers != []
+     # Will be deleted during installation, see install_megadrivers.py
+     install : true,
+     install_dir : dri_drivers_path,
++    name_suffix : 'so',
+   )
+ 
+   meson.add_install_script(
+-- 
+2.17.0
+