mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-01-22 05:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix deps and underlinkage of libGL

Browse Source 
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Jon Turney 2017-11-23 13:51:43 +00:00
parent 5ef75cb02b
commit 6f0ce2617e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -888,7 +888,7 @@ if with_platform_x11
dep_x11 = dependency('x11')
dep_xext = dependency('xext')
dep_xcb = dependency('xcb')
elif with_glx == 'dri' and with_dri_platform == 'drm'
elif with_glx == 'dri'
dep_x11 = dependency('x11')
dep_xext = dependency('xext')
dep_xdamage = dependency('xdamage', version : '>= 1.1')
@ -896,9 +896,11 @@ if with_platform_x11
dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1')
dep_xxf86vm = dependency('xxf86vm', required : false)
endif
if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
if with_any_vk or with_glx == 'dri'
dep_xcb = dependency('xcb')
dep_x11_xcb = dependency('x11-xcb')
endif
if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
if with_dri3

1
src/glx/meson.build
View File

@ -168,6 +168,7 @@ if with_glx == 'dri'
link_whole : libglx,
link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl],
dependencies : [dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11,
dep_xcb_glx, dep_xcb, dep_x11_xcb,
dep_xcb_dri2, dep_xcb_dri3, extra_deps_libgl],
version : gl_lib_version,
install : true,