History

configure: clean up and fix xlib checks

Split them into separate checks per library.

James Almer committed 5 years ago

Commit 395d9ad1 parent 13ec6621 file · +17 −6Browse files

Unified · Split

configure+17−6
@@ -2950,7 +2950,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" · 2949 unmodified lines
29502950 dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32"
29512951 ffnvcodec_deps_any="libdl LoadLibrary"
29522952 nvdec_deps="ffnvcodec"
2953−vaapi_x11_deps="xlib"
2953+vaapi_x11_deps="xlib_x11"
29542954 videotoolbox_hwaccel_deps="videotoolbox pthreads"
29552955 videotoolbox_hwaccel_extralibs="-framework QuartzCore"
29562956 vulkan_deps_any="libdl LoadLibrary"
@@ -3471,7 +3471,7 @@ v4l2_outdev_suggest="libv4l2" · 514 unmodified lines
34713471 vfwcap_indev_deps="vfw32 vfwcap_defines"
34723472 xcbgrab_indev_deps="libxcb"
34733473 xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes"
3474−xv_outdev_deps="xlib"
3474+xv_outdev_deps="xlib_xv xlib_x11 xlib_xext"
34753475
34763476 # protocols
34773477 async_protocol_deps="threads"
@@ -6193,9 +6193,20 @@ check_func_headers windows.h SetDllDirectory · 2715 unmodified lines
61936193 check_func_headers windows.h Sleep
61946194 check_func_headers windows.h VirtualAlloc
61956195 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
61996210
62006211 check_headers direct.h
62016212 check_headers dirent.h
@@ -6752,7 +6763,7 @@ enabled vaapi && · 550 unmodified lines
67526763 if enabled vaapi; then
67536764 check_pkg_config vaapi_drm "libva-drm" "va/va_drm.h" vaGetDisplayDRM
67546765
6755− if enabled xlib; then
6766+ if enabled xlib_x11; then
67566767 check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay
67576768 fi
67586769

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t