Module: Mesa Branch: master Commit: 6217eedc9bac86856d5048c43b5f5a3f6976c13e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6217eedc9bac86856d5048c43b5f5a3f6976c13e
Author: Dylan Baker <[email protected]> Date: Fri Apr 13 12:18:10 2018 -0700 meson: add wrap for libdrm Currently this requires libdrm from git, since the version reported by meson is wrong. --- meson.build | 8 ++++++-- subprojects/libdrm.wrap | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index a4dfa62255..70b93a9891 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 0000000000..3fcd65c7ec --- /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 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
