aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-04-13 12:18:10 -0700
committerDylan Baker <[email protected]>2018-04-17 13:46:15 -0700
commit6217eedc9bac86856d5048c43b5f5a3f6976c13e (patch)
tree4321faf81500d8d2295072ccb07d57cdd1443667
parent21e2e73f71096fd4607051c060cf82c593663d50 (diff)
meson: add wrap for libdrm
Currently this requires libdrm from git, since the version reported by meson is wrong.
-rw-r--r--meson.build8
-rw-r--r--subprojects/libdrm.wrap4
2 files changed, 10 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index a4dfa62255c..70b93a9891a 100644
--- a/meson.build
+++ b/meson.build
@@ -1066,7 +1066,10 @@ foreach d : _libdrm_checks
if d[1]
set_variable(
'dep_libdrm_' + d[0],
- dependency('libdrm_' + d[0], version : '>=' + _drm_ver)
+ dependency(
+ 'libdrm_' + d[0], version : '>=' + _drm_ver,
+ fallback : ['libdrm', 'ext_libdrm_' + d[0]]
+ )
)
endif
endforeach
@@ -1074,7 +1077,8 @@ endforeach
with_gallium_drisw_kms = false
dep_libdrm = dependency(
'libdrm', version : '>=' + _drm_ver,
- required : with_dri2 or with_dri3
+ required : with_dri2 or with_dri3,
+ fallback : ['libdrm', 'ext_libdrm']
)
if dep_libdrm.found()
pre_args += '-DHAVE_LIBDRM'
diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap
new file mode 100644
index 00000000000..3fcd65c7ec9
--- /dev/null
+++ b/subprojects/libdrm.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libdrm
+url=https://anongit.freedesktop.org/git/mesa/drm.git
+revision=head