fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

targets/graw-xlib: Add missing dep_x11

Browse source 
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@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12022>
(cherry picked from commit 061508d310)
This commit is contained in:
Alyssa Rosenzweig 2021-07-22 11:28:44 -04:00 • committed by Eric Engestrom
parent 10556f735c
commit 1325d95923
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -319,7 +319,7 @@
"description": "targets/graw-xlib: Add missing dep_x11",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

2
src/gallium/targets/graw-xlib/meson.build
View file

@ -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',
)