Commit 1c08ff08 authored by Clément Bœsch's avatar Clément Bœsch Committed by Clément Bœsch

build: treat libxcb like other autodetected libraries

parent c9075d2c
...@@ -3598,7 +3598,7 @@ enable_weak audiotoolbox ...@@ -3598,7 +3598,7 @@ enable_weak audiotoolbox
# Enable hwaccels by default. # Enable hwaccels by default.
enable_weak crystalhd d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc 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 enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder
...@@ -6119,31 +6119,17 @@ if enabled libcdio; then ...@@ -6119,31 +6119,17 @@ if enabled libcdio; then
die "ERROR: No usable libcdio/cdparanoia found" die "ERROR: No usable libcdio/cdparanoia found"
fi fi
if ! disabled libxcb; then enabled libxcb && check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || disable libxcb
check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || {
enabled libxcb && die "ERROR: libxcb >= 1.4 not found";
} && enable libxcb
if enabled libxcb; then 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 || { enabled libxcb_shm && check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || disable libxcb_shm
check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || { enabled libxcb_shape && check_pkg_config xcb-shape xcb/shape.h xcb_shape_get_rectangles || disable libxcb_shape
enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found"; enabled libxcb_xfixes && check_pkg_config xcb-xfixes xcb/xfixes.h xcb_xfixes_get_cursor_image || disable libxcb_xfixes
} && 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; }
add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags 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 add_extralibs $xcb_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs $xcb_shape_extralibs
fi fi
fi
check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs" check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment