frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Use dependency version_compare() 

We can check the version on an existing dependency, rather than spinning
up pkg-config again just to check the right version.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2017-09-20 07:22:13 -07:00 committed by Adam Jackson
parent 86a89dd602
commit d770f92932
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/meson.build
View File

@ -72,13 +72,12 @@ conf_data.set_quoted('SHMDIR', '/tmp')
conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found()) conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found())
conf_data.set('WITH_LIBDRM', libdrm_dep.found()) conf_data.set('WITH_LIBDRM', libdrm_dep.found())
conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2', conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2',
dependency('libdrm', version: '>= 2.4.74', required: false).found()) libdrm_dep.found() and libdrm_dep.version().version_compare('>= 2.4.74'))
conf_data.set('GLXEXT', build_glx) conf_data.set('GLXEXT', build_glx)
conf_data.set('GLAMOR', build_glamor) conf_data.set('GLAMOR', build_glamor)
conf_data.set('GLAMOR_HAS_GBM', gbm_dep.found()) conf_data.set('GLAMOR_HAS_GBM', gbm_dep.found())
if gbm_dep.found() and dependency('gbm', version: '>= 10.6', required: false).found() conf_data.set('GLAMOR_HAS_GBM_LINEAR',
conf_data.set('GLAMOR_HAS_GBM_LINEAR', build_glamor) gbm_dep.found() and gbm_dep.version().version_compare('>= 10.6'))
endif
conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir) conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
conf_data.set_quoted('PROJECTROOT', get_option('prefix')) conf_data.set_quoted('PROJECTROOT', get_option('prefix'))

3
meson.build
View File

@ -210,9 +210,6 @@ endif
gbm_dep = dependency('', required:false) gbm_dep = dependency('', required:false)
if build_glamor if build_glamor
gbm_dep = dependency('gbm', version: '>= 10.2', required: false) gbm_dep = dependency('gbm', version: '>= 10.2', required: false)
if gbm_dep.found()
gbm_linear_dep = dependency('gbm', version: '>= 10.6', required: false)
endif
endif endif
# XXX: Add more sha1 options, because Linux is about choice # XXX: Add more sha1 options, because Linux is about choice