Module: libav Branch: master Commit: 871b4f3654636ed64560e86b9faa33828d195ceb
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Sat Feb 11 11:47:34 2017 +0100 configure: Check for xcb as well as xcb-shape before enabling libxcb Newer versions of libxcb have xcb-foo pkg-config files that do not declare their xcb dependency so that required linker flags will not be generated. --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 69f5863..b8cbe17 100755 --- a/configure +++ b/configure @@ -1752,8 +1752,9 @@ CONFIG_EXTRA=" iso_media ividsp jpegtables - libx262 lgplv3 + libx262 + libxcb_shape lpc lzf me_cmp @@ -2420,7 +2421,7 @@ sndio_indev_deps="sndio" 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_deps="libxcb libxcb_shape" xcbgrab_indev_suggest="libxcb_shm libxcb_xfixes" # protocols @@ -4797,7 +4798,8 @@ if enabled libcdio; then fi if enabled libxcb; then - require_pkg_config libxcb xcb-shape xcb/shape.h xcb_shape_rectangles + require_pkg_config libxcb xcb xcb/xcb.h xcb_connect + require_pkg_config libxcb_shape xcb-shape xcb/shape.h xcb_shape_rectangles disabled libxcb_shm || require_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach disabled libxcb_xfixes || _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
