rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix up fixing up the driver list after filtering out non-wayland

Browse Source
This commit is contained in:
Adam Jackson 2013-10-03 09:51:40 -04:00
parent 38831524ad
commit b147e318f9
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
View File

@ -1,4 +1,4 @@
From 6c6e1299492699d1f4cedaeb41503f31d1e9c6ec Mon Sep 17 00:00:00 2001 From 9354bdf25ce2c265f65c52610e0f21cd8267cc44 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com> From: Ray Strode <rstrode@redhat.com>
Date: Wed, 2 Oct 2013 12:38:45 -0400 Date: Wed, 2 Oct 2013 12:38:45 -0400
Subject: [PATCH] xfree86: Only look at wayland-capable drivers when -wayland Subject: [PATCH] xfree86: Only look at wayland-capable drivers when -wayland
@ -11,14 +11,14 @@ work correctly, so let's prevent people from injuring themselves.
Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ray Strode <rstrode@redhat.com> Signed-off-by: Ray Strode <rstrode@redhat.com>
--- ---
hw/xfree86/common/xf86Init.c | 18 +++++++++--------- hw/xfree86/common/xf86Init.c | 20 ++++++++++----------
1 file changed, 9 insertions(+), 9 deletions(-) 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a5a7daf..a7d2e0e 100644 index a5a7daf..a40ed64 100644
--- a/hw/xfree86/common/xf86Init.c --- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c
@@ -550,22 +550,22 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) @@ -550,26 +550,26 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
xf86DriverList[i]->driverFunc(NULL, xf86DriverList[i]->driverFunc(NULL,
GET_REQUIRED_HW_INTERFACES, GET_REQUIRED_HW_INTERFACES,
&flags); &flags);
@ -50,6 +50,11 @@ index a5a7daf..a7d2e0e 100644
} }
for (i = 0; i < xf86NumDrivers; i++) { for (i = 0; i < xf86NumDrivers; i++) {
- if (xf86DriverList[i] == NULL) {
+ while (xf86DriverList[i] == NULL) {
for (j = i; j < xf86NumDrivers; j++) {
xf86DriverList[j] = xf86DriverList[j + 1];
}
-- --
1.8.3.1 1.8.3.1

5
xorg-x11-server.spec
View File

@ -42,7 +42,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.14.3 Version: 1.14.3
Release: 3%{?gitdate:.%{gitdate}}%{dist} Release: 4%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -632,6 +632,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Thu Oct 03 2013 Adam Jackson <ajax@redhat.com> 1.14.3-4
- Fix up fixing up the driver list after filtering out non-wayland
* Wed Oct 02 2013 Adam Jackson <ajax@redhat.com> 1.14.3-3 * Wed Oct 02 2013 Adam Jackson <ajax@redhat.com> 1.14.3-3
- Only look at wayland-capable drivers when run with -wayland - Only look at wayland-capable drivers when run with -wayland