[xorg-x11-server/f20] Apply Daniel Stone's off-by-one fix to one of the wayland patches

[Ray Strode]

commit 6ee3de3d8d18016270e099ab8bf9861806c96c42
Author: Ray Strode <rstrode at redhat.com>
Date:   Tue Apr 8 09:25:14 2014 -0400

    Apply Daniel Stone's off-by-one fix to one of the wayland patches

 ...y-look-at-wayland-capable-drivers-when-wa.patch |    2 +-
 ...im-out-non-wayland-capable-servers-from-d.patch |   15 ++++++++++-----
 xorg-x11-server.spec                               |    5 ++++-
 3 files changed, 15 insertions(+), 7 deletions(-)
---
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 795f799..c0c3260 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
@@ -52,7 +52,7 @@ index a5a7daf..a40ed64 100644
          for (i = 0; i < xf86NumDrivers; i++) {
 -                if (xf86DriverList[i] == NULL) {
 +                while (xf86DriverList[i] == NULL) {
-                         for (j = i; j < xf86NumDrivers; j++) {
+                         for (j = i; j < xf86NumDrivers - 1; j++) {
                              xf86DriverList[j] = xf86DriverList[j + 1];
                          }
 -- 
diff --git a/0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch b/0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
index 47c9a29..1c24dbe 100644
--- a/0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
+++ b/0023-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
@@ -1,4 +1,4 @@
-From 1173a0b6937bda0e684d75111242c2f513b3d072 Mon Sep 17 00:00:00 2001
+From d40219f38a33845d8a9850de47ff5d458a3d8209 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Fri, 13 Sep 2013 17:17:16 -0400
 Subject: [PATCH 23/30] xf86Init: trim out non-wayland capable servers from
@@ -10,25 +10,30 @@ Otherwise they'll cause the server to crash when run in wayland mode.
  1 file changed, 9 insertions(+)
 
 diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 5ac97cc..a5a7daf 100644
+index 2d3bb01..6282252 100644
 --- a/hw/xfree86/common/xf86Init.c
 +++ b/hw/xfree86/common/xf86Init.c
-@@ -568,6 +568,15 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+@@ -558,6 +558,20 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
  	    }
          }
  
 +        for (i = 0; i < xf86NumDrivers; i++) {
 +                if (xf86DriverList[i] == NULL) {
-+                        for (j = i; j < xf86NumDrivers; j++) {
++                        for (j = i; j < xf86NumDrivers - 1; j++) {
 +                            xf86DriverList[j] = xf86DriverList[j + 1];
 +                        }
 +                        xf86NumDrivers--;
 +                }
 +        }
 +
++        if (xf86NumDrivers == 0) {
++            xf86Msg(X_ERROR, "All drivers eliminated by constraints.\n");
++            return;
++        }
++
          if (xorgHWOpenConsole)
              xf86OpenConsole();
          else
 -- 
-1.8.3.1
+1.8.4.2
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 1c5b2db..080f793 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.4
-Release:   7%{?gitdate:.%{gitdate}}%{dist}
+Release:   8%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -653,6 +653,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Apr 08 2014 Ray Strode <rstrode at redhat.com> 1.14.4-8
+- Apply Daniel Stone's off-by-one fix to one of the wayland patches
+
 * Fri Feb 28 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.14.4-7
 - Search all parent devices for a PnPID.