xorg-x11-server/0023-Fix-fallback-loading-of-the-wayland-driver.patch

42 lines
1.5 KiB
Diff
Raw Normal View History

2013-12-17 15:17:41 +00:00
From 7e1b4d2a4853e7a6c31e0ab0c1fe3405ec61c914 Mon Sep 17 00:00:00 2001
2013-09-23 18:10:24 +00:00
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Fri, 13 Sep 2013 15:52:30 +0200
2013-12-17 15:17:41 +00:00
Subject: [PATCH 23/38] Fix fallback loading of the wayland driver
2013-09-23 18:10:24 +00:00
Fix the array name to actually compile, and fix the driver name
with the new upstream.
---
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
2013-12-17 15:17:41 +00:00
index a3e1fa7..51a7960 100644
2013-09-23 18:10:24 +00:00
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
2013-12-17 15:17:41 +00:00
@@ -277,7 +277,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
2013-09-23 18:10:24 +00:00
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
2013-12-17 15:17:41 +00:00
index aebfc1b..66f98b2 100644
2013-09-23 18:10:24 +00:00
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -521,7 +521,7 @@ fixup_video_driver_list(char **drivers)
2013-09-23 18:10:24 +00:00
{
2013-12-17 15:17:41 +00:00
static const char *fallback_hw[4] = { "fbdev", "vesa", "wsfb", NULL };
2013-09-23 18:10:24 +00:00
#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;
--
2013-12-17 15:17:41 +00:00
1.8.4.2
2013-09-23 18:10:24 +00:00