Split them into separate checks per library.
Unified · Split
| @@ -2950,7 +2950,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" · 2949 unmodified lines | ||
| 2950 | 2950 | dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" |
| 2951 | 2951 | ffnvcodec_deps_any="libdl LoadLibrary" |
| 2952 | 2952 | nvdec_deps="ffnvcodec" |
| 2953 | −vaapi_x11_deps="xlib" | |
| 2953 | +vaapi_x11_deps="xlib_x11" | |
| 2954 | 2954 | videotoolbox_hwaccel_deps="videotoolbox pthreads" |
| 2955 | 2955 | videotoolbox_hwaccel_extralibs="-framework QuartzCore" |
| 2956 | 2956 | vulkan_deps_any="libdl LoadLibrary" |
| @@ -3471,7 +3471,7 @@ v4l2_outdev_suggest="libv4l2" · 514 unmodified lines | ||
| 3471 | 3471 | vfwcap_indev_deps="vfw32 vfwcap_defines" |
| 3472 | 3472 | xcbgrab_indev_deps="libxcb" |
| 3473 | 3473 | xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes" |
| 3474 | −xv_outdev_deps="xlib" | |
| 3474 | +xv_outdev_deps="xlib_xv xlib_x11 xlib_xext" | |
| 3475 | 3475 | |
| 3476 | 3476 | # protocols |
| 3477 | 3477 | async_protocol_deps="threads" |
| @@ -6193,9 +6193,20 @@ check_func_headers windows.h SetDllDirectory · 2715 unmodified lines | ||
| 6193 | 6193 | check_func_headers windows.h Sleep |
| 6194 | 6194 | check_func_headers windows.h VirtualAlloc |
| 6195 | 6195 | check_func_headers glob.h glob |
| 6196 | −enabled xlib && { | |
| 6197 | − check_pkg_config xlib xv "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute || | |
| 6198 | − check_lib xlib "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext; } | |
| 6196 | + | |
| 6197 | +if enabled xlib; then | |
| 6198 | + check_pkg_config xlib_x11 x11 "X11/Xlib.h" XPending || | |
| 6199 | + check_lib xlib_x11 "X11/Xlib.h" XPending -lX11 || | |
| 6200 | + disable xlib | |
| 6201 | + | |
| 6202 | + check_pkg_config xlib_xext xext "X11/Xlib.h X11/extensions/XShm.h" XShmAttach || | |
| 6203 | + check_lib xlib_xext "X11/Xlib.h X11/extensions/Xvlib.h" XShmAttach -lXext || | |
| 6204 | + disable xlib | |
| 6205 | + | |
| 6206 | + check_pkg_config xlib_xv xv "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute || | |
| 6207 | + check_lib xlib_xv "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv || | |
| 6208 | + disable xlib | |
| 6209 | +fi | |
| 6199 | 6210 | |
| 6200 | 6211 | check_headers direct.h |
| 6201 | 6212 | check_headers dirent.h |
| @@ -6752,7 +6763,7 @@ enabled vaapi && · 550 unmodified lines | ||
| 6752 | 6763 | if enabled vaapi; then |
| 6753 | 6764 | check_pkg_config vaapi_drm "libva-drm" "va/va_drm.h" vaGetDisplayDRM |
| 6754 | 6765 | |
| 6755 | − if enabled xlib; then | |
| 6766 | + if enabled xlib_x11; then | |
| 6756 | 6767 | check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay |
| 6757 | 6768 | fi |
| 6758 | 6769 | |