diff options
| author | Dylan Baker <[email protected]> | 2018-04-17 13:47:17 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-04-17 13:48:55 -0700 |
| commit | b9ad5282bafd22e00cdfd14539046a6fad24490a (patch) | |
| tree | 8eced4798053e6456b56049eab72fe89396b43a2 | |
| parent | efcbcfa7c800f6a67bfa0557ced2a2c84e7dab5f (diff) | |
Revert "meson: add wrap for libdrm"
This reverts commit 6217eedc9bac86856d5048c43b5f5a3f6976c13e.
I was using this for testing and accidentally put it on master
Signed-off-by: Dylan Baker <[email protected]>
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | subprojects/libdrm.wrap | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 70b93a9891a..a4dfa62255c 100644 --- a/meson.build +++ b/meson.build @@ -1066,10 +1066,7 @@ foreach d : _libdrm_checks if d[1] set_variable( 'dep_libdrm_' + d[0], - dependency( - 'libdrm_' + d[0], version : '>=' + _drm_ver, - fallback : ['libdrm', 'ext_libdrm_' + d[0]] - ) + dependency('libdrm_' + d[0], version : '>=' + _drm_ver) ) endif endforeach @@ -1077,8 +1074,7 @@ endforeach with_gallium_drisw_kms = false dep_libdrm = dependency( 'libdrm', version : '>=' + _drm_ver, - required : with_dri2 or with_dri3, - fallback : ['libdrm', 'ext_libdrm'] + required : with_dri2 or with_dri3 ) if dep_libdrm.found() pre_args += '-DHAVE_LIBDRM' diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap deleted file mode 100644 index 3fcd65c7ec9..00000000000 --- a/subprojects/libdrm.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory=libdrm -url=https://anongit.freedesktop.org/git/mesa/drm.git -revision=head |