From 9967c83f0ba8eb3b0d924b5fa569f14df81aedcf Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Thu, 17 Apr 2025 02:38:57 +0200
Subject: [PATCH] meson: remove duplicate `deprecated` for `gallium-xa` option

Fixes: cf40099730c4af304227 ("meson: deprecate gallium-xa")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34565>
(cherry picked from commit b9472db4963d3d434dc02a2adc7f6ce1e99ddaa1)
---
 .pick_status.json | 2 +-
 meson.options     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 03e13f3b2d0..c2aba25f2f4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1504,7 +1504,7 @@
         "description": "meson: remove duplicate `deprecated` for `gallium-xa` option",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "cf40099730c4af304227c30c891834cec220abff",
         "notes": null
diff --git a/meson.options b/meson.options
index 18da31eff50..6adac2b8eaf 100644
--- a/meson.options
+++ b/meson.options
@@ -127,7 +127,6 @@ option(
 option(
   'gallium-xa',
   type : 'feature',
-  deprecated: {'true': 'enabled', 'false': 'disabled'},
   description : 'enable gallium xa frontend.',
   deprecated: true,
 )