diff options
| author | Dylan Baker <[email protected]> | 2017-12-01 14:51:11 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-12-04 13:15:02 -0800 |
| commit | d2e9ba278259469038c0945f341b8bacafe9e2ac (patch) | |
| tree | 76e9122825e03296ea05664041a2cb55a99ed8e4 | |
| parent | b08a35b15087e0a51f4afe9f7f17c48c43a352bc (diff) | |
meson: fix underlinkage without dri3
There are some case where the dri3 loader is covering for underlinkage
for GLX and EGL, provide the linkage that they actually need.
v2: - remove dep_xcb_dri3 from glx. This was an oversight in v1 and is
not needed.
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Jon Turney <[email protected]> (v1)
Reviewed-by: Eric Engestrom <[email protected]> (v1)
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/egl/meson.build | 2 | ||||
| -rw-r--r-- | src/glx/meson.build | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build index f32715265ce..df6e8b49dac 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -106,7 +106,7 @@ if with_platform_x11 files_egl += files('drivers/dri2/platform_x11_dri3.c') link_for_egl += libloader_dri3_helper endif - deps_for_egl += [dep_xcb_dri2, dep_xcb_xfixes] + deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes] endif if with_platform_drm files_egl += files('drivers/dri2/platform_drm.c') diff --git a/src/glx/meson.build b/src/glx/meson.build index 02bd79082fc..cdb388e9837 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -171,7 +171,8 @@ if with_glx == 'dri' 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, + dep_x11_xcb, dep_xcb_dri2, dep_xext, dep_xfixes, dep_xdamage, + extra_deps_libgl, ], version : gl_lib_version, install : true, |