From: Dylan Baker <dylan@pnwbakers.com>
Date: Tue, 17 Apr 2018 20:47:17 +0000 (-0700)
Subject: Revert "meson: add wrap for libdrm"
X-Git-Tag: android-x86-8.1-r1~4016
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b9ad5282bafd22e00cdfd14539046a6fad24490a;p=android-x86%2Fexternal-mesa.git

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 <dylan.c.baker@intel.com>
---

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