From ce490a20e7310ff55dd76d77841cfd3275d90b3a Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan.c.baker@intel.com>
Date: Tue, 20 Dec 2022 16:06:10 -0800
Subject: [PATCH] meson: use a feature option for power8

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20409>
---
 meson.build       | 11 ++---------
 meson_options.txt |  4 +---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/meson.build b/meson.build
index 314aee5d046ba..f050cc66a39aa 100644
--- a/meson.build
+++ b/meson.build
@@ -766,14 +766,7 @@ if with_gallium_st_d3d10umd
   endif
 endif
 _power8 = get_option('power8')
-if _power8 == 'true'
-  _power8 = 'enabled'
-  warning('power8 option "true" deprecated, please use "enabled" instead.')
-elif _power8 == 'false'
-  _power8 = 'disabled'
-  warning('power8 option "false" deprecated, please use "disabled" instead.')
-endif
-if _power8 != 'disabled'
+if _power8.allowed()
   if host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
     if cc.get_id() == 'gcc' and cc.version().version_compare('< 4.8')
       error('Altivec is not supported with gcc version < 4.8.')
@@ -789,7 +782,7 @@ if _power8 != 'disabled'
         args : '-mpower8-vector',
         name : 'POWER8 intrinsics')
       pre_args += ['-D_ARCH_PWR8', '-mpower8-vector']
-    elif get_option('power8') == 'enabled'
+    elif _power8.enabled()
       error('POWER8 intrinsic support required but not found.')
     endif
   endif
diff --git a/meson_options.txt b/meson_options.txt
index 209a8093057f4..2fe9a07ca80f6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -407,9 +407,7 @@ option(
 )
 option(
   'power8',
-  type : 'combo',
-  value : 'auto',
-  choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
+  type : 'feature',
   description : 'Enable power8 optimizations.',
 )
 option(