Module: Mesa Branch: staging/23.0 Commit: 896d6df474c95fc4a5195f96f92b5eadd3948d8d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=896d6df474c95fc4a5195f96f92b5eadd3948d8d
Author: Eric Engestrom <[email protected]> Date: Mon Feb 27 16:50:50 2023 +0000 glapi/meson: drop duplicate line in deps Fixes: 0842bc879b34414de54b ("meson: wire the new generator for es1 and es2") Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Yonggang Luo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21562> (cherry picked from commit c9f3ba987fee21819a891ba588ba2dd84dab580e) --- .pick_status.json | 2 +- src/mapi/glapi/gen/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c092b1fcbfc..22a182dbb4b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -58,7 +58,7 @@ "description": "glapi/meson: drop duplicate line in deps", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0842bc879b34414de54be9a2299ea8cdb0ecde5e" }, diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 8866701e46b..7baa275ed14 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -22,7 +22,6 @@ glapi_gen_gl_xml = files('../registry/gl.xml') glapi_gen_mapi_deps = [ glapi_gen_gl_xml, genCommon_py, - glapi_gen_gl_xml, ] gl_and_es_api_files = files('gl_and_es_API.xml')
