05/06: gnu: xorg-server: Prefer intel driver only for older GPUs.

[Andy Wingo]

wingo pushed a commit to branch master
in repository guix.

commit c68c201fdd429140da1c606861c9296b9cb01265
Author: Andy Wingo <address@hidden>
Date:   Wed Sep 20 15:09:35 2017 +0200

    gnu: xorg-server: Prefer intel driver only for older GPUs.
    
    * gnu/packages/xorg.scm (xorg-server): Add patch to only prefer the intel
      driver for older Intel GPUs.
    
    Signed-off-by: Andy Wingo <address@hidden>
---
 gnu/packages/xorg.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b3a1154..57ba8a2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5073,8 +5073,21 @@ over Xlib, including:
          (base32
           "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"))
         (patches
-         (search-patches "xorg-server-CVE-2017-10971.patch"
-                         "xorg-server-CVE-2017-10972.patch"))))
+         (cons
+          ;; See:
+          ;;   https://lists.fedoraproject.org/archives/list/address@hidden
+          ;;      fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/
+          (origin
+            (method url-fetch)
+            (uri (string-append
+                  "http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git";
+                  "/plain/06_use-intel-only-on-pre-gen4.diff"))
+            (sha256
+             (base32
+              "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q"))
+            (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))
+          (search-patches "xorg-server-CVE-2017-10971.patch"
+                          "xorg-server-CVE-2017-10972.patch")))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("dri2proto" ,dri2proto)