From 1325d9592333437f464b7d8f5ab76ec0d32712ad Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 22 Jul 2021 11:28:44 -0400 Subject: [PATCH] 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 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 Reviewed-by: Emma Anholt Cc: mesa-stable Part-of: (cherry picked from commit 061508d3105a320514fa8415a418229ae5250a3e) --- .pick_status.json | 2 +- src/gallium/targets/graw-xlib/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1e707b22c2d..b8d82cd940b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 }, 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', )