|
 |
d64d53 |
From 7e1b4d2a4853e7a6c31e0ab0c1fe3405ec61c914 Mon Sep 17 00:00:00 2001
|
|
|
70130e |
From: Giovanni Campagna <gcampagn@redhat.com>
|
|
|
70130e |
Date: Fri, 13 Sep 2013 15:52:30 +0200
|
|
|
d64d53 |
Subject: [PATCH 23/38] Fix fallback loading of the wayland driver
|
|
|
70130e |
|
|
|
70130e |
Fix the array name to actually compile, and fix the driver name
|
|
|
70130e |
with the new upstream.
|
|
|
70130e |
---
|
|
|
70130e |
hw/xfree86/common/xf86AutoConfig.c | 2 +-
|
|
|
70130e |
hw/xfree86/common/xf86Config.c | 2 +-
|
|
|
70130e |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
70130e |
|
|
|
70130e |
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
|
|
|
d64d53 |
index a3e1fa7..51a7960 100644
|
|
|
70130e |
--- a/hw/xfree86/common/xf86AutoConfig.c
|
|
|
70130e |
+++ b/hw/xfree86/common/xf86AutoConfig.c
|
|
|
d64d53 |
@@ -277,7 +277,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
|
|
|
70130e |
if (i < (nmatches - 1)) {
|
|
|
70130e |
#ifdef XORG_WAYLAND
|
|
|
70130e |
if (xorgWayland)
|
|
|
70130e |
- matches[i++] = xnfstrdup("wlshm");
|
|
|
70130e |
+ matches[i++] = xnfstrdup("wayland");
|
|
|
70130e |
else
|
|
|
70130e |
#endif
|
|
|
70130e |
#if !defined(__linux__) && defined(__sparc__)
|
|
|
70130e |
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
|
|
|
d64d53 |
index aebfc1b..66f98b2 100644
|
|
|
70130e |
--- a/hw/xfree86/common/xf86Config.c
|
|
|
70130e |
+++ b/hw/xfree86/common/xf86Config.c
|
|
|
70130e |
@@ -521,7 +521,7 @@ fixup_video_driver_list(char **drivers)
|
|
|
70130e |
{
|
|
|
d64d53 |
static const char *fallback_hw[4] = { "fbdev", "vesa", "wsfb", NULL };
|
|
|
70130e |
#ifdef XORG_WAYLAND
|
|
|
70130e |
- static const char *fallback_wayland[2] = { "wlshm", NULL };
|
|
|
70130e |
+ static const char *fallback_wl[2] = { "wayland", NULL };
|
|
|
70130e |
#endif
|
|
|
70130e |
const char **fallbacks;
|
|
|
70130e |
char **end, **drv;
|
|
|
70130e |
--
|
|
|
d64d53 |
1.8.4.2
|
|
|
70130e |
|