diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-07-28 13:16:42 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-09-02 16:14:15 +0200 |
| commit | 1c08ff08adc479cd37ca67b8285b0479cbac73b9 (patch) | |
| tree | c77dd3591bc91fd1b415248202c8e586f5a1ec44 | |
| parent | c9075d2c652bd90a5b559a9fa38dd0fd3de377e7 (diff) | |
| download | ffmpeg-1c08ff08adc479cd37ca67b8285b0479cbac73b9.tar.gz | |
build: treat libxcb like other autodetected libraries
| -rwxr-xr-x | configure | 24 |
1 files changed, 5 insertions, 19 deletions
@@ -3598,7 +3598,7 @@ enable_weak audiotoolbox # Enable hwaccels by default. enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc -enable_weak xlib +enable_weak xlib libxcb libxcb_shm libxcb_shape libxcb_xfixes enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder @@ -6119,31 +6119,17 @@ if enabled libcdio; then die "ERROR: No usable libcdio/cdparanoia found" fi -if ! disabled libxcb; then - check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || { - enabled libxcb && die "ERROR: libxcb >= 1.4 not found"; - } && enable libxcb +enabled libxcb && check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || disable libxcb if enabled libxcb; then - 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; } - 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; } - - disabled libxcb_shape || { - check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || { - enabled libxcb_shape && die "ERROR: libxcb_shape not found"; - } && enable libxcb_shape; } + enabled libxcb_shm && check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || disable libxcb_shm + enabled libxcb_shape && check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || disable libxcb_shape + enabled libxcb_xfixes && check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs fi -fi check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs" |