diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-01-16 10:36:28 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-02-02 11:01:42 -0800 |
| commit | d7235ef83b92175537e3b538634ffcff29bf0dce (patch) | |
| tree | 7bab3c8d00f6e2d50123685ff59e17de6957be50 /src | |
| parent | 847d0a393d7f0f967f39302900d5330f32b804c8 (diff) | |
Currently there is not a separate option for setting the search path of
DRI drivers in meson, like there is in scons and autotools. This is an
oversight and needs to be fixed. This adds an extra option
`dri-search-path`, which will default to the value of
`dri-drivers-path`, like autotools does.
v2: - Split input list before joining.
v3: - use : instead of ; as the delimiter. The autotools help string
incorrectly says ; but the code uses :
v4: - Take list in pre : delimited form (Ilia)
- Ensure that the dri-search-path is absolute when using
dri_drivers_path
Fixes: db9788420d4bc7b4 ("meson: Add support for configuring dri drivers directory.")
Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net> (v2)
Reviewed-by: Eric Engestrom <eric@engestrom.ch> (v3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/meson.build | 2 | ||||
| -rw-r--r-- | src/gbm/meson.build | 2 | ||||
| -rw-r--r-- | src/glx/meson.build | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build index df6e8b49da..6cd04567b0 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -160,7 +160,7 @@ libegl = shared_library( c_args : [ c_vis_args, c_args_for_egl, - '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir), + '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path), '-D_EGL_BUILT_IN_DRIVER_DRI2', '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()), ], diff --git a/src/gbm/meson.build b/src/gbm/meson.build index 14b9e96036..2f5d1c6ddd 100644 --- a/src/gbm/meson.build +++ b/src/gbm/meson.build @@ -38,7 +38,7 @@ incs_gbm = [ if with_dri2 files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h') deps_gbm += dep_libdrm # TODO: pthread-stubs - args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir) + args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path) endif if with_platform_wayland deps_gbm += dep_wayland_server diff --git a/src/glx/meson.build b/src/glx/meson.build index e645b22b5f..82141d3d4e 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -113,7 +113,6 @@ elif with_dri_platform == 'windows' extra_ld_args_libgl = '-Wl,--disable-stdcall-fixup' endif -dri_driver_dir = join_paths(get_option('prefix'), dri_drivers_path) if not with_glvnd gl_lib_name = 'GL' gl_lib_version = '1.2.0' @@ -130,7 +129,8 @@ else endif gl_lib_cargs = [ - '-D_REENTRANT', '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir), + '-D_REENTRANT', + '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path), ] if dep_xxf86vm != [] and dep_xxf86vm.found() |