From 2616b2b11eac26dfbb85926477a652d2a0540ef6 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Wed, 12 Jul 2023 20:11:32 -0500 Subject: build: make dmabuf-wayland a build option and require drm It makes more sense as an option at this point. Also libdrm is not optional at all. You have to get a drm format and modifier for this to even work (the VO will just fail without DRM). Just hard require it and remove the guards. vaapi can remain optional. --- wscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 758a9469ff..82f65b4afa 100644 --- a/wscript +++ b/wscript @@ -569,6 +569,11 @@ video_output_features = [ 'deps': 'wayland', 'func': check_statement('sys/mman.h', 'memfd_create("mpv", MFD_CLOEXEC | MFD_ALLOW_SEALING)') + }, { + 'name': '--dmabuf-wayland', + 'desc': 'dmabuf-wayland video output', + 'deps': 'wayland && memfd_create && drm', + 'func': check_true, } , { 'name': '--x11', 'desc': 'X11', @@ -696,11 +701,6 @@ video_output_features = [ 'desc': 'VAAPI (Wayland support)', 'deps': 'vaapi && gl-wayland', 'func': check_pkg_config('libva-wayland', '>= 1.1.0'), - }, { - 'name': 'dmabuf-wayland', - 'desc': 'Wayland dmabuf support', - 'deps': 'wayland && memfd_create && (vaapi-wayland || drm)', - 'func': check_true, }, { 'name': '--vaapi-drm', 'desc': 'VAAPI (DRM/EGL support)', -- cgit v1.2.3