[FFmpeg-devel] [PATCH] Revert "Autodetect libxcb."

[Clément Bœsch]

This reverts commit 23ec8db8a07467a1fbef0c79f16b33040ca63c24.

There is no reason to enable libxcb by default. This is inconsistent
with all the other libs (we don't do it for x11, opengl, ...) and drag
many unwanted dependencies by default. We'll get cursed by packagers
pretty soon because of this.

Conflicts:
	configure
---
 configure | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 0c209c5..90fb87a 100755
--- a/configure
+++ b/configure
@@ -254,7 +254,7 @@ External library support:
   --enable-libx264         enable H.264 encoding via x264 [no]
   --enable-libx265         enable HEVC encoding via x265 [no]
   --enable-libxavs         enable AVS encoding via xavs [no]
-  --enable-libxcb          enable X11 grabbing using XCB [auto]
+  --enable-libxcb          enable X11 grabbing using XCB [no]
   --enable-libxcb-shm      enable X11 grabbing shm communication [auto]
   --enable-libxcb-xfixes   enable X11 grabbing mouse rendering [auto]
   --enable-libxcb-shape    enable X11 grabbing shape rendering [auto]
@@ -5076,12 +5076,11 @@ fi
 enabled xlib &&
     check_lib X11/Xlib.h XOpenDisplay -lX11 || disable xlib
 
-if ! disabled libxcb; then
+if enabled libxcb || enabled x11grab && ! disabled libxcb; then
     check_pkg_config "xcb >= 1.4" xcb/xcb.h xcb_connect || {
         enabled libxcb && die "ERROR: libxcb >= 1.4 not found";
     } && disable x11grab && enable 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";
@@ -5100,7 +5099,6 @@ if enabled libxcb; then
     add_cflags $xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags $xcb_shape_cflags
     add_extralibs $xcb_libs $xcb_shm_libs $xcb_xfixes_libs $xcb_shape_libs
 fi
-fi
 
 if enabled x11grab; then
     enabled xlib || die "ERROR: Xlib not found"
-- 
2.2.2