diff options
| author | Dylan Baker <[email protected]> | 2018-03-06 10:11:38 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-03-07 13:30:53 -0800 |
| commit | 34e852d5b50772199797ea839fc8d6b3805633ff (patch) | |
| tree | 96f0ab6a38e34ba04084fc4397a454e808f623e4 /src/gallium | |
| parent | 7598dedfde49391564cdb3d355e7bd98e1880782 (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 <[email protected]>
Fixes: bb5e27fab6087a5c1528a5faf507acce700e883c
("st/omx/bellagio: Rename st and target directories")
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Jon Turney <[email protected]> (v1)
Reviewed-by: Eric Engestrom <[email protected]>
Tested-by: Julien Isorce <[email protected]>
Tested-by: Karol Herbst <[email protected]> (v1)
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/omx/meson.build | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/meson.build b/src/gallium/meson.build index d3cbb76d94d..108234ad322 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -170,7 +170,7 @@ if with_gallium_xvmc subdir('state_trackers/xvmc') subdir('targets/xvmc') endif -if with_gallium_omx +if with_gallium_omx != 'disabled' subdir('state_trackers/omx') subdir('targets/omx') endif diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build index 9470468d753..b0c71a895ff 100644 --- a/src/gallium/state_trackers/omx/meson.build +++ b/src/gallium/state_trackers/omx/meson.build @@ -28,7 +28,7 @@ files_omx = files( 'vid_omx_common.c' ) -if gallium_omx == 'bellagio' +if with_gallium_omx == 'bellagio' files_omx += files( 'bellagio/entrypoint.c', 'bellagio/vid_dec.c', @@ -37,16 +37,16 @@ files_omx += files( 'bellagio/vid_dec_h265.c', 'bellagio/vid_enc.c' ) -elif gallium_omx == 'tizonia' +elif with_gallium_omx == 'tizonia' files_omx += files( 'tizonia/entrypoint.c', - 'tizonia/h264d.c', - 'tizonia/h264dprc.c', - 'tizonia/h264dinport.c', - 'tizonia/h264e.c', - 'tizonia/h264eprc.c', - 'tizonia/h264einport.c', - 'tizonia/h264eoutport.c' + 'tizonia/h264d.c', + 'tizonia/h264dprc.c', + 'tizonia/h264dinport.c', + 'tizonia/h264e.c', + 'tizonia/h264eprc.c', + 'tizonia/h264einport.c', + 'tizonia/h264eoutport.c' ) inc_st_omx = [ inc_st_omx, |