Module: Mesa Branch: staging/23.3 Commit: dbb2f6ed669b5effbecc82d920924a61033bbfb5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dbb2f6ed669b5effbecc82d920924a61033bbfb5
Author: Matt Turner <[email protected]> Date: Tue Nov 14 13:29:47 2023 -0500 r600: Add missing dep on git_sha1.h Bug: https://bugs.gentoo.org/917116 Fixes: 3ab51c7ebd1 ("r600: Add callbacks for get_driver_uuid and get_device_uuid") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26195> (cherry picked from commit b66b299edac109d2bbfdb886f01ce5945f362289) --- .pick_status.json | 2 +- src/gallium/drivers/r600/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8493a1d145c..fde4e9acd3d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -184,7 +184,7 @@ "description": "r600: Add missing dep on git_sha1.h", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3ab51c7ebd1e7a65bd928b6142423123c7552927", "notes": null diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build index ae2081a2f8e..3555ea2edb0 100644 --- a/src/gallium/drivers/r600/meson.build +++ b/src/gallium/drivers/r600/meson.build @@ -174,7 +174,7 @@ endif libr600 = static_library( 'r600', - [files_r600, egd_tables_h], + [files_r600, egd_tables_h, sha1_h], c_args : [r600_c_args, '-Wstrict-overflow=0'], cpp_args: r600_cpp_args, gnu_symbol_visibility : 'hidden',
