diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2019-09-21 20:17:32 +0000 |
---|---|---|
committer | Anton Kindestam <antonki@kth.se> | 2020-04-22 11:27:18 +0200 |
commit | 427709575d0a1f62401f1d990bdec076a8f82ca5 (patch) | |
tree | 958c93003481200fb0ae0bebd8f83a4b7a51bbdd | |
parent | 055a490cef384922d77367d25cecb813cafa8024 (diff) | |
download | mpv-427709575d0a1f62401f1d990bdec076a8f82ca5.tar.bz2 mpv-427709575d0a1f62401f1d990bdec076a8f82ca5.tar.xz |
build: detect VT_GETMODE on FreeBSD and DragonFly
$ ./waf configure
Checking for vt.h : no
Checking for DRM : vt.h not found
[...]
../test.c:1:10: fatal error: 'sys/vt.h' file not found
#include <sys/vt.h>
^~~~~~~~~~
$ build/mpv --gpu-context=drm /path/to/video.mkv
Error parsing option gpu-context (option parameter could not be parsed)
Setting commandline option --gpu-context=drm failed.
Exiting... (Fatal error)
-rw-r--r-- | video/out/drm_common.c | 9 | ||||
-rw-r--r-- | wscript | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/video/out/drm_common.c b/video/out/drm_common.c index 4ecad6f0c4..4a6349ebbe 100644 --- a/video/out/drm_common.c +++ b/video/out/drm_common.c @@ -21,12 +21,19 @@ #include <sys/ioctl.h> #include <poll.h> #include <sys/stat.h> -#include <sys/vt.h> #include <unistd.h> #include <limits.h> #include <math.h> #include <time.h> +#include "config.h" + +#if HAVE_CONSIO_H +#include <sys/consio.h> +#else +#include <sys/vt.h> +#endif + #include "drm_common.h" #include "common/common.h" @@ -283,6 +283,12 @@ iconv support use --disable-iconv.", 'func': check_statement(['sys/vt.h', 'sys/ioctl.h'], 'int m; ioctl(0, VT_GETMODE, &m)'), }, { + 'name': 'consio.h', + 'desc': 'consio.h', + 'deps': '!vt.h', + 'func': check_statement(['sys/consio.h', 'sys/ioctl.h'], + 'int m; ioctl(0, VT_GETMODE, &m)'), + }, { 'name': 'gbm.h', 'desc': 'gbm.h', 'func': check_cc(header_name=['stdio.h', 'gbm.h']), @@ -495,7 +501,7 @@ video_output_features = [ }, { 'name': '--drm', 'desc': 'DRM', - 'deps': 'vt.h', + 'deps': 'vt.h || consio.h', 'func': check_pkg_config('libdrm', '>= 2.4.74'), }, { 'name': '--gbm', |