Message ID | 20210914161511.44400-1-fontaine.fabrice@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/mpv: disable vaapi with DRI driver | expand |
On 14/09/2021 18:15, Fabrice Fontaine wrote: > Build of vaapi with BR2_PACKAGE_MESA3D_DRI_DRIVER is broken since commit > 17a7abbafee9bf4a971e00da7870ae439910e47e because vaapi can only be > enabled with x11, wayland or egl-drm > (https://github.com/mpv-player/mpv/blob/ec0006bfa1aaf608a7141929f2871c89ac7a15d6/wscript#L632): > > 'deps': 'libdl && (x11 || wayland || egl-drm)', > > As a result, despite what is being displayed in the autobuilder log > message, the build failure is not related to X11 but to the fact that > we try to enable vaapi through a DRI driver but without egl. > > Fixes: > - http://autobuild.buildroot.org/results/5ae706e94eb6e5a3aa69368f81c5d12e608b1a5a > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/mpv/Config.in | 2 +- > package/mpv/mpv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/mpv/Config.in b/package/mpv/Config.in > index 51c9799de8..81b1e24b5f 100644 > --- a/package/mpv/Config.in > +++ b/package/mpv/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_MPV_SUPPORTS_VAAPI > bool > - default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_GBM > + default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_OPENGL_EGL > default y if BR2_PACKAGE_WAYLAND > default y if BR2_PACKAGE_XORG7 > > diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk > index a71a4b3114..ff77f248e5 100644 > --- a/package/mpv/mpv.mk > +++ b/package/mpv/mpv.mk > @@ -184,7 +184,7 @@ endif > ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy) > MPV_CONF_OPTS += --enable-vaapi > MPV_DEPENDENCIES += libva > -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_GBM),yy) > +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) > MPV_CONF_OPTS += --enable-vaapi-drm > else > MPV_CONF_OPTS += --disable-vaapi-drm >
diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 51c9799de8..81b1e24b5f 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_MPV_SUPPORTS_VAAPI bool - default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_GBM + default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_OPENGL_EGL default y if BR2_PACKAGE_WAYLAND default y if BR2_PACKAGE_XORG7 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index a71a4b3114..ff77f248e5 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -184,7 +184,7 @@ endif ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy) MPV_CONF_OPTS += --enable-vaapi MPV_DEPENDENCIES += libva -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_GBM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) MPV_CONF_OPTS += --enable-vaapi-drm else MPV_CONF_OPTS += --disable-vaapi-drm
Build of vaapi with BR2_PACKAGE_MESA3D_DRI_DRIVER is broken since commit 17a7abbafee9bf4a971e00da7870ae439910e47e because vaapi can only be enabled with x11, wayland or egl-drm (https://github.com/mpv-player/mpv/blob/ec0006bfa1aaf608a7141929f2871c89ac7a15d6/wscript#L632): 'deps': 'libdl && (x11 || wayland || egl-drm)', As a result, despite what is being displayed in the autobuilder log message, the build failure is not related to X11 but to the fact that we try to enable vaapi through a DRI driver but without egl. Fixes: - http://autobuild.buildroot.org/results/5ae706e94eb6e5a3aa69368f81c5d12e608b1a5a Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/mpv/Config.in | 2 +- package/mpv/mpv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)