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.master
parent
7007aeb287
commit
3fc4eb211e
|
@ -2677,10 +2677,7 @@ devices, thus making direct access unnecessary.")
|
||||||
(base32
|
(base32
|
||||||
"0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"))))
|
"0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs `(;; FIXME: This is a libdrm version incompatible with that of
|
(inputs `(("libdrm" ,libdrm)
|
||||||
;; MESA, which xorg-server uses. Therefore, using this driver
|
|
||||||
;; leads to "unresolved symbol drmModeSetCursor2".
|
|
||||||
("libdrm" ,libdrm)
|
|
||||||
("xf86driproto" ,xf86driproto)
|
("xf86driproto" ,xf86driproto)
|
||||||
("libx11" ,libx11)
|
("libx11" ,libx11)
|
||||||
("xorg-server" ,xorg-server)))
|
("xorg-server" ,xorg-server)))
|
||||||
|
|
|
@ -90,8 +90,7 @@ Section \"Files\"
|
||||||
FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
|
FontPath \"" font-adobe75dpi "/share/fonts/X11/75dpi\"
|
||||||
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
|
ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
|
||||||
ModulePath \"" xf86-video-fbdev "/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-cirrus "/lib/xorg/modules/drivers\"
|
||||||
ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
|
ModulePath \"" xf86-video-intel "/lib/xorg/modules/drivers\"
|
||||||
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
|
ModulePath \"" xf86-video-mach64 "/lib/xorg/modules/drivers\"
|
||||||
|
|
Reference in New Issue