diff options
| author | Mathias Fröhlich <[email protected]> | 2018-03-16 06:34:35 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2018-03-22 11:39:28 +0000 |
| commit | 880c1718b6d14b33fe5ba918af70fea5be890c6b (patch) | |
| tree | 786f518b0ec5f8699f053a4d8407c880b8dbea51 | |
| parent | 795b465c50930a39e9040e219c0f7ee405be6ae1 (diff) | |
omx: always define ENABLE_ST_OMX_{BELLAGIO,TIZONIA}
We're trying to be -Wundef clean so that we can turn it on (and
eventually make it an error).
Note that the OMX code already used `#if ENABLE_ST_OMX_BELLAGIO` instead
of #ifdef; I could've changed these, but the point of -Wundef is to
catch typos, so we might as well make the change the right way.
Fixes: 83d4a5d5aea5a8a05be2 "st/omx/tizonia: Add H.264 decoder"
Fixes: b2f2236dc565dd1460f0 "st/omx/tizonia: Add H.264 encoder"
Fixes: c62cf1f165919bc74296 "st/omx/tizonia/h264d: Add EGLImage support"
Cc: Gurkirpal Singh <[email protected]>
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5074275211e..29d3c3457a7 100644 --- a/configure.ac +++ b/configure.ac @@ -2286,6 +2286,8 @@ if test "x$enable_omx_bellagio" = xyes; then PKG_CHECK_MODULES([OMX_BELLAGIO], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED]) gallium_st="$gallium_st omx_bellagio" AC_DEFINE([ENABLE_ST_OMX_BELLAGIO], 1, [Use Bellagio for OMX IL]) +else + AC_DEFINE([ENABLE_ST_OMX_BELLAGIO], 0) fi AM_CONDITIONAL(HAVE_ST_OMX_BELLAGIO, test "x$enable_omx_bellagio" = xyes) @@ -2299,6 +2301,8 @@ if test "x$enable_omx_tizonia" = xyes; then libtizplatform >= $LIBOMXIL_TIZONIA_REQUIRED]) gallium_st="$gallium_st omx_tizonia" AC_DEFINE([ENABLE_ST_OMX_TIZONIA], 1, [Use Tizoina for OMX IL]) +else + AC_DEFINE([ENABLE_ST_OMX_TIZONIA], 0) fi AM_CONDITIONAL(HAVE_ST_OMX_TIZONIA, test "x$enable_omx_tizonia" = xyes) diff --git a/meson.build b/meson.build index 0a94eec514a..871b0d8d22f 100644 --- a/meson.build +++ b/meson.build @@ -503,7 +503,6 @@ if ['auto', 'bellagio'].contains(_omx) 'libomxil-bellagio', required : _omx == 'bellagio' ) if dep_omx.found() - pre_args += '-DENABLE_ST_OMX_BELLAGIO' with_gallium_omx = 'bellagio' endif endif @@ -518,7 +517,6 @@ if ['auto', 'tizonia'].contains(_omx) dependency('tizilheaders', required : _omx == 'tizonia'), ] if dep_omx.found() and dep_omx_other[0].found() and dep_omx_other[1].found() - pre_args += '-DENABLE_ST_OMX_TIZONIA' with_gallium_omx = 'tizonia' endif elif _omx == 'tizonia' @@ -531,7 +529,14 @@ else with_gallium_omx = _omx endif +pre_args += [ + '-DENABLE_ST_OMX_BELLAGIO=' + (with_gallium_omx == 'bellagio' ? '1' : '0'), + '-DENABLE_ST_OMX_TIZONIA=' + (with_gallium_omx == 'tizonia' ? '1' : '0'), +] + + omx_drivers_path = get_option('omx-libs-path') + if with_gallium_omx != 'disabled' # Figure out where to put the omx driver. # FIXME: this could all be vastly simplified by adding a 'defined_variable' |