Mesa (master): meson: use dep_libdrm version for pkg-config
Dylan Baker
dbaker at kemper.freedesktop.org
Thu Mar 29 17:21:10 UTC 2018
Module: Mesa
Branch: master
Commit: a3a16d4aa7e5a22816226d8e7417138164b10525
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3a16d4aa7e5a22816226d8e7417138164b10525
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Mon Mar 12 16:39:01 2018 -0700
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 <dylan.c.baker at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
src/gallium/targets/d3dadapter9/meson.build | 2 +-
src/mesa/drivers/dri/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index e3f4ae58f5..2cdc0e0e1f 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 6342168ab3..8e23fd43ad 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(
More information about the mesa-commit
mailing list