/[packages]/cauldron/mesa/current/SOURCES/0011-d3d-meson-do-not-prefix-user-provided-d3d-drivers-pa.patch
ViewVC logotype

Contents of /cauldron/mesa/current/SOURCES/0011-d3d-meson-do-not-prefix-user-provided-d3d-drivers-pa.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1379265 - (show annotations) (download)
Wed Mar 20 17:08:42 2019 UTC (2 months ago) by tmb
File size: 2035 byte(s)
more fixes from staging/19.0 branch
1 From ee18a3ec10b9e90b7599298bb324a14e20b2c109 Mon Sep 17 00:00:00 2001
2 From: Sergii Romantsov <sergii.romantsov@globallogic.com>
3 Date: Fri, 22 Feb 2019 11:23:08 +0200
4 Subject: [PATCH 11/24] d3d: meson: do not prefix user provided
5 d3d-drivers-path
6
7 The user can select the location where there d3d drivers
8 are installed by the d3d-drivers-path meson option.
9
10 By default path will be $prefix/$libdir/d3d.
11
12 Currently we add $prefix to the user provided path.
13 Resulting in an incorrect or even missing path.
14
15 Based on logic of
16 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698
17 CC: Kenneth Graunke <kenneth@whitecape.org>
18 CC: Emil Velikov <emil.l.velikov@gmail.com>
19 Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
20 Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
21 (cherry picked from commit dcc48664197c7e44684ccfb970a4ae083974d145)
22 ---
23 meson.build | 2 +-
24 src/gallium/targets/d3dadapter9/meson.build | 2 +-
25 2 files changed, 2 insertions(+), 2 deletions(-)
26
27 diff --git a/meson.build b/meson.build
28 index 9272590201d..53d02e31097 100644
29 --- a/meson.build
30 +++ b/meson.build
31 @@ -608,7 +608,7 @@ with_gallium_xa = _xa != 'false'
32
33 d3d_drivers_path = get_option('d3d-drivers-path')
34 if d3d_drivers_path == ''
35 - d3d_drivers_path = join_paths(get_option('libdir'), 'd3d')
36 + d3d_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'd3d')
37 endif
38
39 with_gallium_st_nine = get_option('gallium-nine')
40 diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
41 index bc72b1110a0..b3c31c5dc6d 100644
42 --- a/src/gallium/targets/d3dadapter9/meson.build
43 +++ b/src/gallium/targets/d3dadapter9/meson.build
44 @@ -68,5 +68,5 @@ pkg.generate(
45 description : 'Native D3D driver modules',
46 version : '.'.join(nine_version),
47 requires_private : 'libdrm >= ' + dep_libdrm.version(),
48 - variables : ['moduledir=${prefix}/@0@'.format(d3d_drivers_path)],
49 + variables : ['moduledir=@0@'.format(d3d_drivers_path)],
50 )
51 --
52 2.21.0
53

  ViewVC Help
Powered by ViewVC 1.1.26