106/116: gnu: xf86-video-modesetting: Now uses the same libdrm as mesa.

[Mark H. Weaver]

mhw pushed a commit to branch xorg-updates
in repository guix.

commit 3fc4eb211e679144a935b1d56b6e1906900e7649
Author: Mark H Weaver <address@hidden>
Date:   Fri Dec 19 20:55:59 2014 -0500

    gnu: xf86-video-modesetting: Now uses the same libdrm as mesa.
    
    * gnu/packages/xorg.scm (xf86-video-modesetting): Remove a comment stating
      that the libdrm used in this driver is incompatible with the one in mesa,
      because it is no longer true.
    * gnu/services/xorg.scm (xserver.conf): Uncomment 'xf86-video-modesetting'
      ModulePath and remove associated comment.
---
 gnu/packages/xorg.scm |    5 +----
 gnu/services/xorg.scm |    3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ad2c3e3..ecaf3ab 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2677,10 +2677,7 @@ devices, thus making direct access unnecessary.")
          (base32
            "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"))))
     (build-system gnu-build-system)
-    (inputs `(;; FIXME: This is a libdrm version incompatible with that of
-              ;; MESA, which xorg-server uses.  Therefore, using this driver
-              ;; leads to "unresolved symbol drmModeSetCursor2".
-              ("libdrm" ,libdrm)
+    (inputs `(("libdrm" ,libdrm)
               ("xf86driproto" ,xf86driproto)
               ("libx11" ,libx11)
               ("xorg-server" ,xorg-server)))
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 27a72e8..d11def6 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -90,8 +90,7 @@ Section \"Files\"
   FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
   ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
-# FIXME: Commented out due to libdrm incompatibility.
-#  ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
+  ModulePath \"" xf86-video-modesetting "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-cirrus "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"