diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-02-11 11:47:34 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-02-15 10:33:34 +0100 |
| commit | 871b4f3654636ed64560e86b9faa33828d195ceb (patch) | |
| tree | 42473e7de71fbf41790c2c0d162de7ea1ef07cab | |
| parent | b446f0e98f85e2e931b476e52b319f1c49244660 (diff) | |
| download | ffmpeg-871b4f3654636ed64560e86b9faa33828d195ceb.tar.gz | |
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.
| -rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 || |