diff options
| author | Jon Turney <[email protected]> | 2018-01-25 18:53:08 +0000 |
|---|---|---|
| committer | Jon Turney <[email protected]> | 2018-01-27 18:13:18 +0000 |
| commit | 4a0bab1d7f942ad0ac9b98ab34e6a9e4694f3c04 (patch) | |
| tree | 0c8cc782ea4d802f3c77077580a014061f335d90 | |
| parent | e5a81ac70431502bc592c05e4ae639c0504ec816 (diff) | |
meson: libdrm shouldn't appear in Requires.private: if it wasn't found
Otherwise, using pkg-config to retrieve flags will fail, e.g.
$ pkg-config gl --cflags
Package libdrm was not found in the pkg-config search path.
Perhaps you should add the directory containing `libdrm.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libdrm', required by 'gl', not found
Fixes: 3218056e0eb3 ("meson: Build i965 and dri stack")
Reviewed-by: Dylan Baker <[email protected]>
Signed-off-by: Jon Turney <[email protected]>
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/meson.build | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/meson.build b/meson.build index bc5996992a3..824e3c46bc5 100644 --- a/meson.build +++ b/meson.build @@ -1213,8 +1213,10 @@ inc_include = include_directories('include') gl_priv_reqs = [ 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', - 'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75', -] + 'xcb-glx >= 1.8.1'] +if dep_libdrm.found() + gl_priv_reqs += 'libdrm >= 2.4.75' +endif if dep_xxf86vm != [] and dep_xxf86vm.found() gl_priv_reqs += 'xxf86vm' endif diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index 94798b0f5da..87021fba885 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -67,12 +67,17 @@ endif # This needs to be installed if any dri drivers (including gallium dri drivers) # are built. if with_dri + dri_req_private = [] + if dep_libdrm.found() + dri_req_private = ['libdrm >= 2.4.75'] # FIXME: don't hardcode this + endif + pkg.generate( name : 'dri', filebase : 'dri', description : 'Direct Rendering Infrastructure', version : meson.project_version(), variables : ['dridriverdir=${prefix}/' + dri_drivers_path], - requires_private : ['libdrm >= 2.4.75'], # FIXME: don't hardcode this + requires_private : dri_req_private, ) endif |