summaryrefslogtreecommitdiff
path: root/meson_options.txt
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-03-06 10:11:38 -0800
committerDylan Baker <dylan@pnwbakers.com>2018-03-07 13:30:53 -0800
commit34e852d5b50772199797ea839fc8d6b3805633ff (patch)
tree96f0ab6a38e34ba04084fc4397a454e808f623e4 /meson_options.txt
parent7598dedfde49391564cdb3d355e7bd98e1880782 (diff)
meson: Re-add auto option for omx
This re-adds the auto option for omx, without it we default to tizonia and the build fails almost immediately, this is especially obnoxious those building a driver that doesn't support the OMX state tracker to begin with. v2: - Only define OMX_FOO for auto cases if the dependencies are found. This fixes building tizonia with auto (Julien, Eric) CC: Gurkirpal Singh <gurkirpal204@gmail.com> Fixes: bb5e27fab6087a5c1528a5faf507acce700e883c ("st/omx/bellagio: Rename st and target directories") Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> (v1) Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Tested-by: Julien Isorce <julien.isorce@gmail.com> Tested-by: Karol Herbst <kherbst@redhat.com> (v1)
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt
index 50ae19685e..a573290b77 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -90,8 +90,8 @@ option(
option(
'gallium-omx',
type : 'combo',
- value : 'tizonia',
- choices : ['disabled', 'bellagio', 'tizonia'],
+ value : 'auto',
+ choices : ['auto', 'disabled', 'bellagio', 'tizonia'],
description : 'enable gallium omx state tracker.',
)
option(