Mesa (main): targets/graw-xlib: Add missing dep_x11
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jul 23 15:24:47 UTC 2021
Module: Mesa
Branch: main
Commit: 061508d3105a320514fa8415a418229ae5250a3e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=061508d3105a320514fa8415a418229ae5250a3e
Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date: Thu Jul 22 11:28:44 2021 -0400
targets/graw-xlib: Add missing dep_x11
Required to build Mesa on macOS with
-Dbuild-tests=true -Dglx=gallium-xlib
Without this change, the build fails with
In file included from ../src/gallium/targets/graw-xlib/graw_xlib.c:8:
../src/gallium/include/frontend/xlibsw_api.h:5:10: fatal error: 'X11/Xlib.h' file not found
#include <X11/Xlib.h>
With `brew sh` X11 is found but linking fails due to `llvm-ar` missing
in the path. That issue appears to be unrelated to this missing
dependency. X11 is installed via XQuartz, so Homebrew should not be
required.
Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12022>
---
src/gallium/targets/graw-xlib/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build
index d7b5fc91d1a..c3308d90b3c 100644
--- a/src/gallium/targets/graw-xlib/meson.build
+++ b/src/gallium/targets/graw-xlib/meson.build
@@ -26,7 +26,7 @@ libgraw_xlib = shared_library(
link_with : [
libgraw_util, libgallium, libws_xlib
],
- dependencies : [idep_mesautil, driver_swrast],
+ dependencies : [idep_mesautil, driver_swrast, dep_x11],
version : '1.0',
)
More information about the mesa-commit
mailing list