On Wed, Feb 17, 2016 at 10:07 PM, Clément Bœsch <u...@pkh.me> wrote:
> On Wed, Feb 17, 2016 at 10:02:49PM +0100, Michael Niedermayer wrote:
>> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
>> ---
>> configure | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index d7cda01..b94830b 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5766,7 +5766,7 @@ fi
>> enabled xlib &&
>> check_lib X11/Xlib.h XOpenDisplay -lX11 || disable xlib
>>
>> -if ! disabled libxcb; then
>> +if ! disabled libxcb && ! enabled x11grab; 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
>
> can you explain why we suddenly needs a special case for this? isn't it a
> side effect to fix?
>
Well the logic is a bit convoluted for this entire check.
If libxcb is not explicitly disabled, check for its presence, and if
it is, disable x11grab. This does however not respect the users choice
if he explicitly wants x11grab, so the new check accounts for that.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
