[vlc-devel] [vlc-commits] caca: X11 availability doesn't mean we use it (on OSX)

[Laurent Aimar]

On Wed, Jun 06, 2012 at 04:29:06PM +0200, Rafaël Carré wrote:
> vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jun  6 10:28:35 2012 -0400| [3e87f5925272d7e0ee0c7bebef910934fcfcd096] | committer: Rafaël Carré
> 
> caca: X11 availability doesn't mean we use it (on OSX)
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e87f5925272d7e0ee0c7bebef910934fcfcd096
> ---
> 
>  modules/video_output/caca.c |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
> index 31cd2b8..5e98de1 100644
> --- a/modules/video_output/caca.c
> +++ b/modules/video_output/caca.c
> @@ -88,10 +88,13 @@ static int Open(vlc_object_t *object)
>      vout_display_t *vd = (vout_display_t *)object;
>      vout_display_sys_t *sys;
>  
> -#ifndef X_DISPLAY_MISSING
> +#if !defined(__APPLE__)
> +# ifndef X_DISPLAY_MISSING
>      if (!vlc_xlib_init(object))
>          return VLC_EGENERIC;
> +# endif
>  #endif
> +

Are you sure that on OSX, there is no possible way for libcaca to use X11? If 
it is possible that libcaca use X11 (even if the one from our contrib does
not, then this patch is not correct.

Regards,

-- 
fenrir