Module: libav Branch: master Commit: a97563c889fefd81ad6b3758471434d8c2e2e550
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Sun Jan 22 16:05:25 2017 +0100 configure: Simplify libxcb check --- configure | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/configure b/configure index d77eb3d..070edca 100755 --- a/configure +++ b/configure @@ -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 && _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
