Mesa (staging/21.2): meson: add git wrap for libdrm

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Nov 24 22:54:07 UTC 2021


Module: Mesa
Branch: staging/21.2
Commit: a5099ee0559bac4e46d9e0bcda374c529a71801f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5099ee0559bac4e46d9e0bcda374c529a71801f

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Apr 26 09:34:07 2018 -0700

meson: add git wrap for libdrm

Sometimes as a developer when a new version of libdrm is required, it's
nice to not have to install it somewhere and set up pkg-confing, and
just let Meson do it for us.

---

 meson.build             | 8 ++++++--
 subprojects/libdrm.wrap | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index bcc21179a5f..ee07ef7c7b6 100644
--- a/meson.build
+++ b/meson.build
@@ -1559,7 +1559,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
@@ -1568,7 +1571,8 @@ with_gallium_drisw_kms = false
 dep_libdrm = dependency(
   'libdrm', version : '>=' + _drm_ver,
   # GNU/Hurd includes egl_dri2, without drm.
-  required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3
+  required : (with_dri2 and host_machine.system() != 'gnu') 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



More information about the mesa-commit mailing list