Commit f6556ec7 authored by Sergii Romantsov's avatar Sergii Romantsov Committed by Emil Velikov

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

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

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

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

v2: fixed dri_search_path by default, rebased to master

v3: new commit-message (Emil Velikov), cc mesa-stable

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698
CC: Rafael Antognolli <rafael.antognolli@intel.com>
CC: Dylan Baker <dylan@pnwbakers.com>
Cc: 18.3 19.0 <mesa-stable@lists.freedesktop.org>
Fixes: 306914db (meson: Add dridriverdir variable to dri.pc.)
Signed-off-by: default avatarSergii Romantsov <sergii.romantsov@globallogic.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
parent 30828f46
......@@ -61,11 +61,11 @@ endif
dri_drivers_path = get_option('dri-drivers-path')
if dri_drivers_path == ''
dri_drivers_path = join_paths(get_option('libdir'), 'dri')
dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
endif
dri_search_path = get_option('dri-search-path')
if dri_search_path == ''
dri_search_path = join_paths(get_option('prefix'), dri_drivers_path)
dri_search_path = dri_drivers_path
endif
with_gles1 = get_option('gles1')
......
......@@ -78,7 +78,7 @@ if with_dri
filebase : 'dri',
description : 'Direct Rendering Infrastructure',
version : meson.project_version(),
variables : ['dridriverdir=${prefix}/' + dri_drivers_path],
variables : ['dridriverdir=' + dri_drivers_path],
requires_private : dri_req_private,
)
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment