[ptxdist] [PATCH] Weston: Fix compilation for certain DRM targets

[ptxdist] [PATCH] Weston: Fix compilation for certain DRM targets

[Guillermo Rodríguez]

If none of LIBDRM_INTEL, LIBDRM_FREEDRENO, or LIBDRM_ETNAVIV is defined,
the simple-dmabuf-drm Meson option is set to an empty list, which breaks
compilation. Fix this by setting the option to 'auto' in this case.

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 rules/weston.make | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/weston.make b/rules/weston.make
index eaabebe61..45b9c6ea6 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -35,6 +35,10 @@ endif
 WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_FREEDRENO) += freedreno
 WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_ETNAVIV) += etnaviv
 
+ifeq ($(WESTON_SIMPLE_DMABUF_DRM-y),)
+WESTON_SIMPLE_DMABUF_DRM-y := auto
+endif
+
 WESTON_SIMPLE_CLIENTS-y := damage im shm touch
 WESTON_SIMPLE_CLIENTS-$(PTXCONF_WESTON_GL) += egl dmabuf-egl
 
-- 
2.21.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Weston: Fix compilation for certain DRM targets

[Michael Olbrich]

On Wed, Jan 08, 2020 at 04:47:47PM +0100, Guillermo Rodríguez wrote:
> If none of LIBDRM_INTEL, LIBDRM_FREEDRENO, or LIBDRM_ETNAVIV is defined,
> the simple-dmabuf-drm Meson option is set to an empty list, which breaks
> compilation. Fix this by setting the option to 'auto' in this case.
> 
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
>  rules/weston.make | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/rules/weston.make b/rules/weston.make
> index eaabebe61..45b9c6ea6 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -35,6 +35,10 @@ endif
>  WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_FREEDRENO) += freedreno
>  WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_ETNAVIV) += etnaviv
>  
> +ifeq ($(WESTON_SIMPLE_DMABUF_DRM-y),)
> +WESTON_SIMPLE_DMABUF_DRM-y := auto

Hmm, we handle all possible options above, so none should be found with
'auto', so I think the correct setting here is:

WESTON_SIMPLE_DMABUF_DRM-y := []

To provide an empty list.

Michael

> +endif
> +
>  WESTON_SIMPLE_CLIENTS-y := damage im shm touch
>  WESTON_SIMPLE_CLIENTS-$(PTXCONF_WESTON_GL) += egl dmabuf-egl
>  
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Weston: Fix compilation for certain DRM targets

[Guillermo Rodriguez Garcia]

El vie., 10 ene. 2020 a las 10:13, Michael Olbrich
(<m.olbrich@pengutronix.de>) escribió:
>
> On Wed, Jan 08, 2020 at 04:47:47PM +0100, Guillermo Rodríguez wrote:
> > If none of LIBDRM_INTEL, LIBDRM_FREEDRENO, or LIBDRM_ETNAVIV is defined,
> > the simple-dmabuf-drm Meson option is set to an empty list, which breaks
> > compilation. Fix this by setting the option to 'auto' in this case.
> >
> > Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> > ---
> >  rules/weston.make | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/rules/weston.make b/rules/weston.make
> > index eaabebe61..45b9c6ea6 100644
> > --- a/rules/weston.make
> > +++ b/rules/weston.make
> > @@ -35,6 +35,10 @@ endif
> >  WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_FREEDRENO) += freedreno
> >  WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_WESTON_SIMPLE_DMABUF_DRM_ETNAVIV) += etnaviv
> >
> > +ifeq ($(WESTON_SIMPLE_DMABUF_DRM-y),)
> > +WESTON_SIMPLE_DMABUF_DRM-y := auto
>
> Hmm, we handle all possible options above, so none should be found with
> 'auto', so I think the correct setting here is:
>
> WESTON_SIMPLE_DMABUF_DRM-y := []
>
> To provide an empty list.

I am not sure. The error I saw specifically complained about the
option being an empty list, so it looks like Meson didn't like that.
But the thing is that for some reason I cannot reproduce it anymore.
Will see if I can find what the exact problem was.

Guillermo

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de