projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600: add ARB_query_buffer_object support
[mesa.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index 56ff916c4bd8b55334a8789a5d80b8fdc6f561ea..824e3c46bc5524b743ded186e0de8fc945409f90 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-353,15
+353,9
@@
endif
with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
with_dri3 = get_option('dri3')
if with_dri3 == 'auto'
with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
with_dri3 = get_option('dri3')
if with_dri3 == 'auto'
- if system_has_kms_drm and with_dri2
- with_dri3 = true
- else
- with_dri3 = false
- endif
-elif with_dri3 == 'true'
- with_dri3 = true
+ with_dri3 = system_has_kms_drm and with_dri2
else
else
- with_dri3 =
false
+ with_dri3 =
with_dri3 == 'true'
endif
if with_any_vk and (with_platform_x11 and not with_dri3)
endif
if with_any_vk and (with_platform_x11 and not with_dri3)
@@
-1022,11
+1016,15
@@
else
endif
if with_llvm
_llvm_version = dep_llvm.version().split('.')
endif
if with_llvm
_llvm_version = dep_llvm.version().split('.')
- # Development versions of LLVM have an 'svn' suffix, we don't want that for
- # our version checks.
+ # Development versions of LLVM have an 'svn' or 'git' suffix, we don't want
+ # that for our version checks.
+ # svn suffixes are stripped by meson as of 0.43, and git suffixes are
+ # strippped as of 0.44, but we support older meson versions.
_llvm_patch = _llvm_version[2]
if _llvm_patch.endswith('svn')
_llvm_patch = _llvm_patch.split('s')[0]
_llvm_patch = _llvm_version[2]
if _llvm_patch.endswith('svn')
_llvm_patch = _llvm_patch.split('s')[0]
+ elif _llvm_patch.contains('git')
+ _llvm_patch = _llvm_patch.split('g')[0]
endif
pre_args += [
'-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]),
endif
pre_args += [
'-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]),
@@
-1215,8
+1213,10
@@
inc_include = include_directories('include')
gl_priv_reqs = [
'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb',
gl_priv_reqs = [
'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb',
- 'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75',
-]
+ 'xcb-glx >= 1.8.1']
+if dep_libdrm.found()
+ gl_priv_reqs += 'libdrm >= 2.4.75'
+endif
if dep_xxf86vm != [] and dep_xxf86vm.found()
gl_priv_reqs += 'xxf86vm'
endif
if dep_xxf86vm != [] and dep_xxf86vm.found()
gl_priv_reqs += 'xxf86vm'
endif