mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

wayland: bump required version to 1.20

Browse Source 
This lets us remove some ifdefs.
This commit is contained in:
Dudemanguy 2023-06-12 14:19:29 -05:00
parent d16f971df5
commit 45e2ca5411
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -978,8 +978,8 @@ if features['d3d11']
endif
wayland = {
'deps': [dependency('wayland-client', version: '>= 1.15.0', required: get_option('wayland')),
dependency('wayland-cursor', version: '>= 1.15.0', required: get_option('wayland')),
'deps': [dependency('wayland-client', version: '>= 1.20.0', required: get_option('wayland')),
dependency('wayland-cursor', version: '>= 1.20.0', required: get_option('wayland')),
dependency('wayland-protocols', version: '>= 1.15', required: get_option('wayland')),
dependency('xkbcommon', version: '>= 0.3.0', required: get_option('wayland'))],
'header': cc.has_header('linux/input-event-codes.h', required: get_option('wayland')),

8
video/out/wayland_common.c
View File

@ -51,10 +51,6 @@
#include "generated/wayland/fractional-scale-v1.h"
#endif
#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 20
#define HAVE_WAYLAND_1_20
#endif
#if WAYLAND_VERSION_MAJOR > 1 || WAYLAND_VERSION_MINOR >= 22
#define HAVE_WAYLAND_1_22
#endif
@ -722,7 +718,6 @@ static void output_handle_scale(void *data, struct wl_output *wl_output,
output->scale = factor;
}
#ifdef HAVE_WAYLAND_1_20
static void output_handle_name(void *data, struct wl_output *wl_output,
const char *name)
{
@ -734,17 +729,14 @@ static void output_handle_description(void *data, struct wl_output *wl_output,
const char *description)
{
}
#endif
static const struct wl_output_listener output_listener = {
output_handle_geometry,
output_handle_mode,
output_handle_done,
output_handle_scale,
#ifdef HAVE_WAYLAND_1_20
output_handle_name,
output_handle_description,
#endif
};
static void surface_handle_enter(void *data, struct wl_surface *wl_surface,

4
wscript
View File

@ -541,8 +541,8 @@ video_output_features = [
'name': '--wayland',
'desc': 'Wayland',
'deps': 'wayland-protocols && wayland-scanner && linux-input-event-codes',
'func': check_pkg_config('wayland-client', '>= 1.15.0',
'wayland-cursor', '>= 1.15.0',
'func': check_pkg_config('wayland-client', '>= 1.20.0',
'wayland-cursor', '>= 1.20.0',
'xkbcommon', '>= 0.3.0'),
} , {
'name': 'wayland-protocols-1-24',