RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

drm: bump minimum version to 2.4.105 

Debian 12 is out, with 2.4.114, and Ubuntu 22.04 has 2.4.110, this
 #ifdef is no longer needed
This commit is contained in:
LaserEyess 2023-07-31 14:35:24 -04:00 committed by sfan5
parent 7adb56ccd9
commit 3b19866882
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -909,7 +909,7 @@ if features['direct3d']
sources += files('video/out/vo_direct3d.c') sources += files('video/out/vo_direct3d.c')
endif endif
drm = dependency('libdrm', version: '>= 2.4.75', required: get_option('drm')) drm = dependency('libdrm', version: '>= 2.4.105', required: get_option('drm'))
features += {'drm': drm.found() and (features['vt.h'] or features['consio.h'])} features += {'drm': drm.found() and (features['vt.h'] or features['consio.h'])}
if features['drm'] if features['drm']
dependencies += drm dependencies += drm
@ -922,9 +922,6 @@ if features['drm']
'video/out/vo_drm.c') 'video/out/vo_drm.c')
endif endif
# This can be removed roughly when Debian 12 is released.
features += {'drm-is-kms': features['drm'] and drm.version().version_compare('>= 2.4.105')}
gbm = dependency('gbm', version: '>=17.1.0', required: get_option('gbm')) gbm = dependency('gbm', version: '>=17.1.0', required: get_option('gbm'))
features += {'gbm': gbm.found()} features += {'gbm': gbm.found()}
if features['gbm'] if features['gbm']

4
video/out/drm_common.c
View File

@ -809,15 +809,11 @@ static int open_card_path(const char *path)
static bool card_supports_kms(const char *path) static bool card_supports_kms(const char *path)
{ {
#if HAVE_DRM_IS_KMS
int fd = open_card_path(path); int fd = open_card_path(path);
bool ret = fd != -1 && drmIsKMS(fd); bool ret = fd != -1 && drmIsKMS(fd);
if (fd != -1) if (fd != -1)
close(fd); close(fd);
return ret; return ret;
#else
return true;
#endif
} }
static void get_primary_device_path(struct vo_drm_state *drm) static void get_primary_device_path(struct vo_drm_state *drm)