diff options
author | Diego Biurrun <diego@biurrun.de> | 2017-01-22 16:05:25 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2017-02-02 17:38:50 +0100 |
commit | a97563c889fefd81ad6b3758471434d8c2e2e550 (patch) | |
tree | d3428465c863ede175f2766e3c1fa2c00ddbc371 /configure | |
parent | c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068 (diff) | |
download | ffmpeg-streaming-a97563c889fefd81ad6b3758471434d8c2e2e550.zip ffmpeg-streaming-a97563c889fefd81ad6b3758471434d8c2e2e550.tar.gz |
configure: Simplify libxcb check
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 18 |
1 files changed, 4 insertions, 14 deletions
@@ -2401,6 +2401,7 @@ sndio_outdev_deps="sndio" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="vfw32 vfwcap_defines" xcbgrab_indev_deps="libxcb" +xcbgrab_indev_suggest="libxcb_shm libxcb_xfixes" # protocols ffrtmpcrypt_protocol_deps="!librtmp_protocol" @@ -4783,22 +4784,11 @@ if enabled libcdio; then fi if enabled libxcb; then - check_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles || { - enabled libxcb && die "ERROR: libxcb not found"; - } && enable libxcb - + require_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles disabled libxcb_shm || - check_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 - + require_pkg_config xcb-shm xcb/shm.h xcb_shm_attach disabled libxcb_xfixes || - check_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" + require_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image fi enabled dxva2 && |