summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-09-27 20:09:10 +0200
committerwm4 <wm4@nowhere>2015-09-27 21:33:15 +0200
commit710872bc22c772d1ea8eb9a0383f5755dae08698 (patch)
tree82d408565c42ba41ccd142bb278d9067ced95856 /TOOLS
parent1ff32236fa50589eaffcc7dd152e8cfda4f6c69d (diff)
downloadmpv-710872bc22c772d1ea8eb9a0383f5755dae08698.tar.bz2
mpv-710872bc22c772d1ea8eb9a0383f5755dae08698.tar.xz
vaapi: remove dependency on X11
There are at least 2 ways of using VAAPI without X11 (Wayland, DRM). Remove the X11 requirement from the decoder part and the EGL interop. This will be used by a following commit, which adds Wayland support. The worst about this is the decoder part, which includes a bad hack for using the decoder without any VO interop (also known as "vaapi-copy" mode). Separate the X11 parts so that they're self-contained. For the EGL interop code we do something similar (it's kept slightly simpler, because it essentially only has to translate between our silly MPGetNativeDisplay abstraction and the vaGetDisplay...() call).
Diffstat (limited to 'TOOLS')
-rwxr-xr-xTOOLS/old-configure2
1 files changed, 2 insertions, 0 deletions
diff --git a/TOOLS/old-configure b/TOOLS/old-configure
index 92aca58bde..a55e776da3 100755
--- a/TOOLS/old-configure
+++ b/TOOLS/old-configure
@@ -610,6 +610,7 @@ define_yes_no $_vdpau HAVE_VDPAU_HWACCEL
check_pkg_config "VAAPI" $_vaapi VAAPI 'libva >= 0.32.0 libva-x11 >= 0.32.0'
_vaapi=$(defretval)
define_yes_no $_vaapi HAVE_VAAPI_HWACCEL
+define_yes_no $_vaapi HAVE_VAAPI_X11
if test "$_vaapi" = yes ; then
check_pkg_config "VAAPI VPP" auto VAAPI_VPP 'libva >= 0.34.0'
@@ -706,6 +707,7 @@ check_pkg_config "VAAPI with OpenGL/X11" $_vaapi_glx VAAPI_GLX 'libva-glx >= 0.3
_vaapi_x_egl=no
(test "$_gl_x11_egl" = yes && test "$_vaapi" = yes) && _vaapi_x_egl=yes
check_yes_no $_vaapi_x_egl VAAPI_X_EGL
+check_yes_no $_vaapi_x_egl VAAPI_EGL
check_pkg_config "SDL 2.0" $_sdl2 SDL2 'sdl2'