virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

configure: Simplify libxcb check

Browse Source
This commit is contained in:
Diego Biurrun
2017-01-22 16:05:25 +01:00
parent c29da01ac9
commit a97563c889
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@@ -2401,6 +2401,7 @@ sndio_outdev_deps="sndio"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="vfw32 vfwcap_defines" vfwcap_indev_deps="vfw32 vfwcap_defines"
xcbgrab_indev_deps="libxcb" xcbgrab_indev_deps="libxcb"
xcbgrab_indev_suggest="libxcb_shm libxcb_xfixes"
# protocols # protocols
ffrtmpcrypt_protocol_deps="!librtmp_protocol" ffrtmpcrypt_protocol_deps="!librtmp_protocol"
@@ -4783,22 +4784,11 @@ if enabled libcdio; then
fi fi
if enabled libxcb; then if enabled libxcb; then
check_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles || { require_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles
enabled libxcb && die "ERROR: libxcb not found";
} && enable libxcb
disabled libxcb_shm || disabled libxcb_shm ||
check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || { require_pkg_config xcb-shm xcb/shm.h xcb_shm_attach
enabled libxcb_shm && die "ERROR: libxcb_shm not found";
} && check_header sys/shm.h && enable libxcb_shm
disabled libxcb_xfixes || disabled libxcb_xfixes ||
check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || { require_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image
enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found";
} && enable libxcb_xfixes
add_cflags "$xcb_shape_cflags $xcb_shm_cflags $xcb_xfixes_cflags"
add_extralibs "$xcb_shape_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs"
fi fi
enabled dxva2 && enabled dxva2 &&