meson: add wrap for libdrm
authorDylan Baker <dylan@pnwbakers.com>
Fri, 13 Apr 2018 19:18:10 +0000 (12:18 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Tue, 17 Apr 2018 20:46:15 +0000 (13:46 -0700)
Currently this requires libdrm from git, since the version reported by
meson is wrong.

meson.build
subprojects/libdrm.wrap [new file with mode: 0644]

index a4dfa62255c632569ab4bf7d56aa864ec1b6ea5c..70b93a9891a4003ebe65f7713613ac4eca9eec78 100644 (file)
@@ -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 (file)
index 0000000..3fcd65c
--- /dev/null
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libdrm
+url=https://anongit.freedesktop.org/git/mesa/drm.git
+revision=head