fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 05:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: libdrm shouldn't appear in Requires.private: if it wasn't found

Browse source 
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: 3218056e0e ("meson: Build i965 and dri stack")

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon Turney 2018-01-25 18:53:08 +00:00
parent e5a81ac704
commit 4a0bab1d7f
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -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

7
src/mesa/drivers/dri/meson.build
View file

@ -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