Module: Mesa Branch: staging/21.3 Commit: e85bda02b83b7baafd76d8945e59f8ef5a7d9695 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e85bda02b83b7baafd76d8945e59f8ef5a7d9695
Author: orbea <[email protected]> Date: Wed Nov 3 15:02:11 2021 -0700 build: add sha1_h for lp_texture.c ../mesa-9999/src/gallium/drivers/llvmpipe/lp_texture.c:55:10: fatal error: git_sha1.h: No such file or directory Fixes: 1608a815e3305d229091 ("llvmpipe: add support for EXT_memory_object(_fd)") Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Signed-off-by: orbea <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13665> (cherry picked from commit 0a6f079afe076745309c2b5cf27b39dd5f0d2f08) --- .pick_status.json | 2 +- src/gallium/drivers/llvmpipe/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 98855d707cf..da5fb94aa9d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -157,7 +157,7 @@ "description": "build: add sha1_h for lp_texture.c", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1608a815e3305d229091c346373c379900a8351f" }, diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build index 6a8aa491492..210e2483970 100644 --- a/src/gallium/drivers/llvmpipe/meson.build +++ b/src/gallium/drivers/llvmpipe/meson.build @@ -111,7 +111,7 @@ files_llvmpipe = files( libllvmpipe = static_library( 'llvmpipe', - files_llvmpipe, + [files_llvmpipe, sha1_h], c_args : [c_msvc_compat_args], cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden',
