diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-08 14:13:43 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-08 14:13:43 +0200 |
commit | 8aaacbf7fd7e06fe81897f5b23d01f8f9ce044e4 (patch) | |
tree | 106346b77220b02151aeec80598a27efe139e781 | |
parent | f98ccbd6a06deafadcb4b52bd4634f733544297a (diff) | |
parent | c21d78a903da378af48c9e5f971fe989592ddb65 (diff) |
Merge commit 'c21d78a903da378af48c9e5f971fe989592ddb65'
* commit 'c21d78a903da378af48c9e5f971fe989592ddb65':
configure: Integrate X11 checks into vaapi/vdpau checks
Merged-by: Clément Bœsch <u@pkh.me>
-rwxr-xr-x | configure | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -2078,7 +2078,6 @@ HAVE_LIST=" vaapi_x11 vdpau_x11 winrt - xlib " # options emitted with CONFIG_ prefix but not available on the command line @@ -6076,18 +6075,16 @@ enabled vaapi && check_lib "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm && enable vaapi_drm +enabled vaapi && + check_lib "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 -lX11 && + enable vaapi_x11 + enabled vdpau && check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || disable vdpau -enabled_any vaapi vdpau && check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib - -enabled vaapi && enabled xlib && - check_lib "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 && - enable vaapi_x11 - -enabled vdpau && enabled xlib && - check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau && +enabled vdpau && + check_lib "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11 && enable vdpau_x11 if enabled x86; then |