On 04/02/15 04:57, Sean McGovern wrote:
> From: Benoit Fouet <[email protected]>
> 
> Replace xcb_event by xcb, as the former is no more used and the latter
> is needed on configurations where only xcb is available, and not
> libxcb_shm and/or libxcb_xfixes.
> 
> Signed-off-by: Benoit Fouet <[email protected]>
> Signed-off-by: Michael Niedermayer <[email protected]>
> 
> Conflicts:
>       configure
> ---
>  configure |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index bd1cadc..1723dee 100755
> --- a/configure
> +++ b/configure
> @@ -4312,8 +4312,8 @@ if enabled libxcb; then
>              enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found";
>          } && enable libxcb_xfixes; }
>  
> -    add_cflags "$xcb_event_cflags $xcb_shm_cflags $xcb_xfixes_cflags"
> -    add_extralibs "$xcb_event_libs $xcb_shm_libs $xcb_xfixes_libs"
> +    add_cflags "$xcb_cflags $xcb_shm_cflags $xcb_xfixes_cflags"
> +    add_extralibs "$xcb_libs $xcb_shm_libs $xcb_xfixes_libs"
>  fi
>  fi
>  
> 

It is a fix for a mistake made in a previous patch...

lu
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to