Commit 880c1718 authored by Mathias Fröhlich's avatar Mathias Fröhlich Committed by Eric Engestrom
Browse files

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: 83d4a5d5 "st/omx/tizonia: Add H.264 decoder"
Fixes: b2f2236d "st/omx/tizonia: Add H.264 encoder"
Fixes: c62cf1f1

 "st/omx/tizonia/h264d: Add EGLImage support"
Cc: Gurkirpal Singh <gurkirpal204@gmail.com>
Signed-off-by: default avatarEric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarDylan Baker <dylan@pnwbakers.com>
parent 795b465c
......@@ -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)
......
......@@ -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'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment