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 <dylanx.c.baker@intel.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> (v1)
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> (v1)
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/egl/meson.build b/src/egl/meson.build
index f32715265ce1a09c022622d9b89bf07a70d1011e..df6e8b49dac7eb7511782924f6a0ea2ba0b49e0b 100644 (file)
--- 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 02bd79082fcfc1285f62a70a8faf46de33e02998..cdb388e98372feadfe620ab9eea0ead867a13e79 100644 (file)
--- 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,