Mesa (staging/19.0): d3d: meson: do not prefix user provided d3d-drivers-path

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: ee18a3ec10b9e90b7599298bb324a14e20b2c109
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee18a3ec10b9e90b7599298bb324a14e20b2c109

Author: Sergii Romantsov <sergii.romantsov at globallogic.com>
Date:   Fri Feb 22 11:23:08 2019 +0200

d3d: meson: do not prefix user provided d3d-drivers-path

The user can select the location where there d3d drivers
are installed by the d3d-drivers-path meson option.

By default path will be $prefix/$libdir/d3d.

Currently we add $prefix to the user provided path.
Resulting in an incorrect or even missing path.

Based on logic of
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698
CC: Kenneth Graunke <kenneth at whitecape.org>
CC: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Sergii Romantsov <sergii.romantsov at globallogic.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
(cherry picked from commit dcc48664197c7e44684ccfb970a4ae083974d145)

---

 meson.build                                 | 2 +-
 src/gallium/targets/d3dadapter9/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 9272590201d..53d02e31097 100644
--- a/meson.build
+++ b/meson.build
@@ -608,7 +608,7 @@ with_gallium_xa = _xa != 'false'
 
 d3d_drivers_path = get_option('d3d-drivers-path')
 if d3d_drivers_path == ''
-  d3d_drivers_path = join_paths(get_option('libdir'), 'd3d')
+  d3d_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'd3d')
 endif
 
 with_gallium_st_nine =  get_option('gallium-nine')
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index bc72b1110a0..b3c31c5dc6d 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -68,5 +68,5 @@ pkg.generate(
   description : 'Native D3D driver modules',
   version : '.'.join(nine_version),
   requires_private : 'libdrm >= ' + dep_libdrm.version(),
-  variables : ['moduledir=${prefix}/@0@'.format(d3d_drivers_path)],
+  variables : ['moduledir=@0@'.format(d3d_drivers_path)],
 )