From 17a7abbafee9bf4a971e00da7870ae439910e47e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 24 Aug 2021 08:49:16 +0200 Subject: [PATCH] package/mpv: use BR2_PACKAGE_MESA3D_GBM Use BR2_PACKAGE_MESA3D_GBM instead of BR2_PACKAGE_MESA3D_OPENGL_EGL as GBM can also be provided by a DRI driver Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpv/Config.in | 2 +- package/mpv/mpv.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 81b1e24b5f..51c9799de8 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_OPENGL_EGL + default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_GBM 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 acda93f381..a71a4b3114 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -47,8 +47,7 @@ else MPV_CONF_OPTS += --disable-alsa endif -# GBM support is provided by mesa3d when EGL=y -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) MPV_CONF_OPTS += --enable-gbm MPV_DEPENDENCIES += mesa3d ifeq ($(BR2_PACKAGE_LIBDRM),y) @@ -185,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_OPENGL_EGL),yy) +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_GBM),yy) MPV_CONF_OPTS += --enable-vaapi-drm else MPV_CONF_OPTS += --disable-vaapi-drm -- 2.30.2