Mesa (staging/19.0): meson: Force '.so' extension for DRI drivers
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 25 20:49:03 UTC 2019
Module: Mesa
Branch: staging/19.0
Commit: a8aa18aa231e77d18bce76bfb96ef1ee9f89f270
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8aa18aa231e77d18bce76bfb96ef1ee9f89f270
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date: Sun Apr 14 20:46:39 2019 +0100
meson: Force '.so' extension for DRI drivers
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"
(cherry picked from commit 5d310015c57536224600252e4ceadcf964bfc4fa)
---
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 318192f9ddc..edd0c007e48 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, 'pl111_dri.so'],
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(
More information about the mesa-commit
mailing list