[PATCH xwayland 2/2] Fix fallback loading of the wayland driver

[Kristian Høgsberg]

On Fri, Sep 13, 2013 at 03:52:30PM +0200, Giovanni Campagna wrote:
> From: Giovanni Campagna <gcampagn at redhat.com>
> 
> Fix the array name to actually compile, and fix the driver name
> with the new upstream.

Ahem... thanks.

Kristian

> ---
>  hw/xfree86/common/xf86AutoConfig.c | 2 +-
>  hw/xfree86/common/xf86Config.c     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
> index d5a3370..b35cb96 100644
> --- a/hw/xfree86/common/xf86AutoConfig.c
> +++ b/hw/xfree86/common/xf86AutoConfig.c
> @@ -285,7 +285,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
>      if (i < (nmatches - 1)) {
>  #ifdef XORG_WAYLAND
>          if (xorgWayland)
> -            matches[i++] = xnfstrdup("wlshm");
> +            matches[i++] = xnfstrdup("wayland");
>          else
>  #endif
>  #if !defined(__linux__) && defined(__sparc__)
> diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
> index c68b8db..4a2c7c0 100644
> --- a/hw/xfree86/common/xf86Config.c
> +++ b/hw/xfree86/common/xf86Config.c
> @@ -521,7 +521,7 @@ fixup_video_driver_list(char **drivers)
>  {
>      static const char *fallback_hw[4] = { "vesa", "fbdev", "wsfb", NULL };
>  #ifdef XORG_WAYLAND
> -    static const char *fallback_wayland[2] = { "wlshm", NULL };
> +    static const char *fallback_wl[2] = { "wayland", NULL };
>  #endif
>      const char **fallbacks;
>      char **end, **drv;
> -- 
> 1.8.3.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel