| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame] | 1 | From cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c 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 | |
| 7 | 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. |
| 8 | But the source meson file does not set this up dependent on with_dri3. |
| 9 | The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast. |
| 10 | |
| 11 | Reviewed-by: Eric Anholt <eric@anholt.net> |
| 12 | Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7164> |
| 13 | |
| 14 | Upstream-Status: Backport [cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c] |
| 15 | |
| 16 | --- |
| 17 | meson.build | 3 ++- |
| 18 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/meson.build b/meson.build |
| 21 | index cfe02fa6373..3cb3c904927 100644 |
| 22 | --- a/meson.build |
| 23 | +++ b/meson.build |
| 24 | @@ -1782,7 +1782,8 @@ if with_platform_x11 |
| 25 | dep_xxf86vm = dependency('xxf86vm') |
| 26 | endif |
| 27 | endif |
| 28 | - if (with_egl or ( |
| 29 | + if (with_egl or |
| 30 | + with_dri3 or ( |
| 31 | with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or |
| 32 | with_gallium_omx != 'disabled')) |
| 33 | dep_xcb_xfixes = dependency('xcb-xfixes') |
| 34 | -- |
| 35 | 2.17.1 |
| 36 | |