mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

meson: regroup glvnd lines to get an easier-to-review diff in the next commit 

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26367>
This commit is contained in:
Eric Engestrom 2023-11-26 08:45:21 +00:00 committed by Marge Bot
parent a6392c06c0
commit 3a4a16e9e8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -543,8 +543,8 @@ if with_glx != 'disabled'
endif
endif
dep_glvnd = null_dep
with_glvnd = get_option('glvnd')
glvnd_vendor_name = get_option('glvnd-vendor-name')
if with_glvnd
if with_platform_windows
error('glvnd cannot be used on Windows')
@ -556,7 +556,10 @@ if with_glvnd
if get_option('egl-lib-suffix') != ''
error('''EGL lib suffix can't be used with libglvnd''')
endif
dep_glvnd = dependency('libglvnd', version : '>= 1.3.2')
pre_args += '-DUSE_LIBGLVND=1'
endif
glvnd_vendor_name = get_option('glvnd-vendor-name')
if with_vulkan_icd_dir == ''
with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
@ -1894,12 +1897,6 @@ elif with_gallium_radeonsi
error('Gallium driver radeonsi requires libelf')
endif
dep_glvnd = null_dep
if with_glvnd
dep_glvnd = dependency('libglvnd', version : '>= 1.3.2')
pre_args += '-DUSE_LIBGLVND=1'
endif
dep_valgrind = dependency('valgrind', required : get_option('valgrind'))
if dep_valgrind.found()
pre_args += '-DHAVE_VALGRIND'