[Mesa-stable] [PATCH] Fix imx autotools build dependencies

[Emil Velikov]

On Tue, 30 Apr 2019 at 14:17, Marco Felsch <m.felsch at pengutronix.de> wrote:
>
> Since commit 41a0acd6 ("Switch imx to kmsro and remove the imx winsys")
> the imx-drm is covered by kmsro. During the switch some autotools
> dependencies are missed. Autotools are marked as deprecated but since
> yocto still uses them we need to cover this.
>
> Signed-off-by: Marco Felsch <m.felsch at pengutronix.de>
> ---
>  configure.ac                           | 4 ++--
>  src/gallium/drivers/kmsro/Automake.inc | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 1ef68fe68e6..1623976ab5c 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2861,8 +2861,8 @@ AM_CONDITIONAL(HAVE_SWR_BUILTIN, test "x$HAVE_SWR_BUILTIN" = xyes)
>
>  dnl We need to validate some needed dependencies for renderonly drivers.
>
> -if test "x$HAVE_GALLIUM_VC4" != xyes -a "x$HAVE_GALLIUM_KMSRO" = xyes  ; then
> -    AC_MSG_ERROR([Building with kmsro requires vc4])
> +if test "x$HAVE_GALLIUM_VC4" != xyes -a "x$HAVE_GALLIUM_ETNAVIV" != xyes -a "x$HAVE_GALLIUM_KMSRO" = xyes  ; then
> +    AC_MSG_ERROR([Building with kmsro requires vc4 or etnaviv])
>  fi
>
>  if test "x$HAVE_GALLIUM_NOUVEAU" != xyes -a "x$HAVE_GALLIUM_TEGRA" = xyes; then
> diff --git a/src/gallium/drivers/kmsro/Automake.inc b/src/gallium/drivers/kmsro/Automake.inc
> index d5961c90765..ebed42408c2 100644
> --- a/src/gallium/drivers/kmsro/Automake.inc
> +++ b/src/gallium/drivers/kmsro/Automake.inc
> @@ -2,6 +2,7 @@ if HAVE_GALLIUM_KMSRO
>
>  TARGET_DRIVERS += pl111
>  TARGET_DRIVERS += hx8357d
> +TARGET_DRIVERS += imx-drm
>  TARGET_CPPFLAGS += -DGALLIUM_KMSRO
>  TARGET_LIB_DEPS += \
>      $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \
> --

Patch is spot on. It needs to go to the 19.0 branch directly since
autotools was removed on master.
Dylan, can you take care of this? Feel free to add

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Fixes: 41a0acd6a14 ("Switch imx to kmsro and remove the imx winsys")

Thanks
Emil