[Buildroot] [PATCH 1/1] package/mpv: fix build of vaapi with egl-drm

[Fabrice Fontaine]

Yann,

Le jeu. 19 août 2021 à 22:43, Yann E. MORIN <yann.morin.1998 at free.fr> a écrit :
>
> Fabrice, All,
>
> On 2021-08-19 18:03 +0200, Fabrice Fontaine spake thusly:
> > Build of vaapi with egl-drm is broken since commit
> > 6ec47c4e59c7c8c57e972dab985c8a2ba0bf7174 because egl-drm is a part of gl
> > group which is only enabled if BR2_PACKAGE_HAS_LIBGL or
> > BR2_PACKAGE_HAS_LIBGLES are set:
> > https://github.com/mpv-player/mpv/blob/ec0006bfa1aaf608a7141929f2871c89ac7a15d6/wscript#L572
> >
> > Fixes:
> >  - http://autobuild.buildroot.org/results/e5c15228f42a73f8c34b26630b2074c30e5f5966
>
> This issue is about missing X11, so I am not sure I see the relation
> with this change...
This issue is not about missing X11 despite what is being displayed in
the log message.
vaapi has the following dependencies as written in
https://github.com/mpv-player/mpv/blob/ec0006bfa1aaf608a7141929f2871c89ac7a15d6/wscript#L632:
'deps': 'libdl && (x11 || wayland || egl-drm)',

In the autobuilder failure, we try to enable vaapi because
BR2_PACKAGE_MPV_SUPPORTS_VAAPI is set to true because
BR2_PACKAGE_LIBDRM and BR2_PACKAGE_MESA3D_OPENGL_EGL are also set to
true.
However, as written in my commit message, this fails because we also disable gl.
>
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> > ---
> >  package/mpv/mpv.mk | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
> > index 91e31dd150..f8ecaeb78a 100644
> > --- a/package/mpv/mpv.mk
> > +++ b/package/mpv/mpv.mk
> > @@ -148,6 +148,9 @@ MPV_DEPENDENCIES += libgl
> >  else ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
> >  MPV_CONF_OPTS += --enable-gl
> >  MPV_DEPENDENCIES += libgles
> > +else ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
> > +MPV_CONF_OPTS += --enable-gl
> > +MPV_DEPENDENCIES += libegl
>
> Here, you are checking with BR2_PACKAGE_HAS_LIBEGL, but in the previous
> patch, as noted by Thomas, you used BR2_PACKAGE_MESA3D_OPENGL_EGL.
>
> Any reason for the discrepancy?
Yes, because egl-drm (and so vaapi-drm) depends on gbm:
'deps': 'drm && gbm && egl',

But gl (and so vaapi) does not only depends on egl-drm, it can be
enabled if wayland and egl are available (gl-wayland):
'deps': 'gl-cocoa || gl-x11 || egl-x11 || egl-drm || '
+ 'gl-win32 || gl-wayland || rpi || '
+ 'plain-gl',
>
> And looking from further away, it looks like the two problems are really
> related one to the other, and so maybe need to be fixed in the same
> patch...
IMHO, they are not related but I can merge both if you prefer. Bernd
what is your opinion?
>
> Regards,
> Yann E. MORIN.
>
> >  else
> >  MPV_CONF_OPTS += --disable-gl
> >  endif
> > --
> > 2.30.2
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
Best Regards,

Fabrice