summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-03-12 16:39:01 -0700
committerDylan Baker <[email protected]>2018-03-29 10:20:52 -0700
commita3a16d4aa7e5a22816226d8e7417138164b10525 (patch)
tree475a73ada07b600865ff441fbb74bc7280638e85
parentc445b1d56f47922206de55e557444aadb62e11f6 (diff)
meson: use dep_libdrm version for pkg-config
This corrects pkg-config to use the libdrm version (as computed by the previous patch) instead of using a hardcoded value that may or may not (probably not) be right. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
-rw-r--r--src/gallium/targets/d3dadapter9/meson.build2
-rw-r--r--src/mesa/drivers/dri/meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index e3f4ae58f53..2cdc0e0e1f4 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -71,6 +71,6 @@ pkg.generate(
name : 'd3d',
description : 'Native D3D driver modules',
version : '.'.join(nine_version),
- requires_private : 'libdrm >= 2.4.75',
+ requires_private : 'libdrm >= ' + dep_libdrm.version(),
variables : ['moduledir=${prefix}/@0@'.format(d3d_drivers_path)],
)
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index 6342168ab33..8e23fd43ad6 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -69,7 +69,7 @@ endif
if with_dri
dri_req_private = []
if dep_libdrm.found()
- dri_req_private = ['libdrm >= 2.4.75'] # FIXME: don't hardcode this
+ dri_req_private = ['libdrm >= ' + dep_libdrm.version()]
endif
pkg.generate(