[Mesa-dev] [PATCH 24/28] configure: error out if building OMX w/o supported platform

Nayan Deshmukh nayan26deshmukh at gmail.com
Tue Dec 13 18:28:37 UTC 2016


Reviewed-by: Nayan Deshmukh <nayan26deshmukh at gmail.com>

On Tue, Dec 13, 2016 at 11:58 PM, Nayan Deshmukh
<nayan26deshmukh at gmail.com> wrote:
> Reviewed-by: Nayan Deshmukh <nayan26deshmukh at gmail.com>
>
> On Fri, Dec 9, 2016 at 1:30 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>>  configure.ac | 11 ++++++++++-
>>  1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 602b2ce..4e4e965 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -2095,6 +2095,12 @@ if test "x$enable_xa" = xyes; then
>>  fi
>>  AM_CONDITIONAL(HAVE_ST_XA, test "x$enable_xa" = xyes)
>>
>> +if echo $platforms | grep -q "x11\|drm"; then
>> +    have_omx_platform=yes
>> +else
>> +    have_omx_platform=no
>> +fi
>> +
>>  if echo $platforms | grep -q "x11\|drm\|wayland"; then
>>      have_va_platform=yes
>>  else
>> @@ -2113,7 +2119,7 @@ if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then
>>         PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes], [enable_vdpau=no])
>>      fi
>>
>> -    if test "x$enable_omx" = xauto; then
>> +    if test "x$enable_omx" = xauto -a "x$have_omx_platform" = xyes; then
>>         PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx=yes], [enable_omx=no])
>>      fi
>>
>> @@ -2154,6 +2160,9 @@ fi
>>  AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes)
>>
>>  if test "x$enable_omx" = xyes; then
>> +    if test "x$have_omx_platform" != xyes; then
>> +        AC_MSG_ERROR([OMX requires at least one of the x11 or drm platforms])
>> +    fi
>>      PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED])
>>      gallium_st="$gallium_st omx"
>>  fi
>> --
>> 2.10.2
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list