0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From da691ec75cc8a7b2d0ac0c5894521afda4bc601d Mon Sep 17 00:00:00 2001
  2. From: Duncan Hopkins <duncan@duncanhopkins.me.uk>
  3. Date: Thu, 15 Oct 2020 12:14:57 +0100
  4. Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes
  5. undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c
  6. loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3.
  7. But the source meson file does not set this up dependent on with_dri3.
  8. The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast.
  9. Reviewed-by: Eric Anholt <eric@anholt.net>
  10. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164>
  11. (cherry picked from commit cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c)
  12. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  13. ---
  14. meson.build | 3 ++-
  15. 1 file changed, 2 insertions(+), 1 deletion(-)
  16. diff --git a/meson.build b/meson.build
  17. index fbd3c4b8e8d..670cb521a2b 100644
  18. --- a/meson.build
  19. +++ b/meson.build
  20. @@ -1742,7 +1742,8 @@ if with_platform_x11
  21. dep_xxf86vm = dependency('xxf86vm')
  22. endif
  23. endif
  24. - if (with_egl or (
  25. + if (with_egl or
  26. + with_dri3 or (
  27. with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or
  28. with_gallium_omx != 'disabled'))
  29. dep_xcb_xfixes = dependency('xcb-xfixes')
  30. --
  31. 2.25.4