Module: Mesa Branch: staging/20.2 Commit: 1784d889f23a68ef71e99a7c7601a2e14c6baf02 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1784d889f23a68ef71e99a7c7601a2e14c6baf02
Author: Philipp Zabel <[email protected]> Date: Tue Aug 18 15:28:41 2020 +0200 meson: fix power8 option Do not throw a deprecation warning if the power8 option is set to the new 'disabled' value. Instead, warn if it is still set to the legacy value 'false'. Fixes: 138c003d2273 ("meson: deprecated 'true' and 'false' in combo options for 'enabled' and 'disabled'") Signed-off-by: Philipp Zabel <[email protected]> Reviewed-by: Vinson Lee <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6370> (cherry picked from commit 03bea54e02901f188d03d5432f47fc9c57c4e12e) --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fc6bb3ef6cc..572642751a1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -652,7 +652,7 @@ "description": "meson: fix power8 option", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "138c003d22739b0d1e6860ed398dd511a44cde04" }, diff --git a/meson.build b/meson.build index 5779f68518f..fbd3c4b8e8d 100644 --- a/meson.build +++ b/meson.build @@ -752,7 +752,7 @@ _power8 = get_option('power8') if _power8 == 'true' _power8 = 'enabled' warning('power8 option "true" deprecated, please use "enabled" instead.') -elif _power8 == 'disabled' +elif _power8 == 'false' _power8 = 'disabled' warning('power8 option "false" deprecated, please use "disabled" instead.') endif _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
