From: Emil Velikov <emil.veli...@collabora.com>
Cc: <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
configure.ac | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 9674f590ba4..39995f8155d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2067,6 +2067,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
@@ -2085,7 +2091,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
@@ -2126,6 +2132,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.12.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
