From 2e3cb30e46eda324af760dd7a731ef6f0a0ce2b4 Mon Sep 17 00:00:00 2001 From: Gusar321 Date: Mon, 24 Jul 2023 11:47:44 +0200 Subject: [PATCH] build: vaapi-drm and vaapi-wayland do not depend on egl --- meson.build | 4 ++-- meson_options.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index de396b9f1f..8aeb77848d 100644 --- a/meson.build +++ b/meson.build @@ -1405,13 +1405,13 @@ if features['vaapi'] endif vaapi_drm = dependency('libva-drm', version: '>= 1.1.0', required: get_option('vaapi-drm').require(features['vaapi'])) -features += {'vaapi-drm': features['vaapi'] and egl_drm.allowed() and vaapi_drm.found()} +features += {'vaapi-drm': features['vaapi'] and vaapi_drm.found()} if features['vaapi-drm'] dependencies += vaapi_drm endif vaapi_wayland = dependency('libva-wayland', version: '>= 1.1.0', required: get_option('vaapi-wayland').require(features['vaapi'])) -features += {'vaapi-wayland': features['vaapi'] and features['egl-wayland'] and vaapi_wayland.found()} +features += {'vaapi-wayland': features['vaapi'] and vaapi_wayland.found()} if features['vaapi-wayland'] dependencies += vaapi_wayland endif diff --git a/meson_options.txt b/meson_options.txt index 5f2d31df3d..e523ea4896 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -86,7 +86,7 @@ option('plain-gl', type: 'feature', value: 'auto', description: 'OpenGL without option('vdpau', type: 'feature', value: 'auto', description: 'VDPAU acceleration') option('vdpau-gl-x11', type: 'feature', value: 'auto', description: 'VDPAU with OpenGL/X11') option('vaapi', type: 'feature', value: 'auto', description: 'VAAPI acceleration') -option('vaapi-drm', type: 'feature', value: 'auto', description: 'VAAPI (DRM/EGL support)') +option('vaapi-drm', type: 'feature', value: 'auto', description: 'VAAPI (DRM support)') option('vaapi-wayland', type: 'feature', value: 'auto', description: 'VAAPI (Wayland support)') option('vaapi-x11', type: 'feature', value: 'auto', description: 'VAAPI (X11 support)') option('vaapi-x-egl', type: 'feature', value: 'auto', description: 'VAAPI EGL on X11')