diff --git a/0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch b/0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch index b4533b4..795f799 100644 --- a/0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch +++ b/0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch @@ -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 Date: Wed, 2 Oct 2013 12:38:45 -0400 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 Signed-off-by: Ray Strode --- - hw/xfree86/common/xf86Init.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + hw/xfree86/common/xf86Init.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) 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 +++ 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, GET_REQUIRED_HW_INTERFACES, &flags); @@ -50,6 +50,11 @@ index a5a7daf..a7d2e0e 100644 } 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 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 5ae70cb..fba2e2a 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.14.3 -Release: 3%{?gitdate:.%{gitdate}}%{dist} +Release: 4%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -632,6 +632,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Thu Oct 03 2013 Adam Jackson 1.14.3-4 +- Fix up fixing up the driver list after filtering out non-wayland + * Wed Oct 02 2013 Adam Jackson 1.14.3-3 - Only look at wayland-capable drivers when run with -wayland