summaryrefslogtreecommitdiff
path: root/.pick_status.json
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa@collabora.com>2021-07-22 11:28:44 -0400
committerDylan Baker <dylan.c.baker@intel.com>2021-07-26 12:01:59 -0700
commit765ef56f34ad93273bd803cf0252b57f3997dd86 (patch)
tree01d3c261a3c1b19f777d8148628984149163a698 /.pick_status.json
parent277718fa8cae7cb8d27c24ca56c624b54c744071 (diff)
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@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 061508d3105a320514fa8415a418229ae5250a3e)
Diffstat (limited to '.pick_status.json')
-rw-r--r--.pick_status.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 728fda82dc1..365fb18e3e2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -706,7 +706,7 @@
"description": "targets/graw-xlib: Add missing dep_x11",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},