[PATCH] gnu: Remove xf86-video-modesetting.

[PATCH] gnu: Remove xf86-video-modesetting.

[Marius Bakke]

This is maintained as part of xorg-server nowadays.

* gnu/packages/xorg.scm (xf86-video-modesetting): Remove variable.
* gnu/services/xorg.scm (xorg-configuration-file, %default-xorg-modules):
Adjust accordingly.
---
 gnu/packages/xorg.scm | 26 --------------------------
 gnu/services/xorg.scm |  2 --
 2 files changed, 28 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2d6e98b43..911621a93 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2906,32 +2906,6 @@ the same level of support for generic VGA or 8514/A adapters.")
      "xf86-video-mga is a Matrox video driver for the Xorg X server.")
     (license license:x11)))
 
-(define-public xf86-video-modesetting
-  (package
-    (name "xf86-video-modesetting")
-    (version "0.9.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-              "mirror://xorg/individual/driver/xf86-video-modesetting-"
-              version ".tar.bz2"))
-        (sha256
-         (base32
-           "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"))))
-    (build-system gnu-build-system)
-    (inputs `(("libdrm" ,libdrm)
-              ("xf86driproto" ,xf86driproto)
-              ("libx11" ,libx11)
-              ("xorg-server" ,xorg-server)))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (home-page "https://www.x.org/wiki/")
-    (synopsis "\"Modesetting\" video driver for X server")
-    (description
-     "This is a generic \"modesetting\" video driver, that relies on the Linux
-kernel mode setting (KMS).")
-    (license license:x11)))
-
 (define-public xf86-video-neomagic
   (package
     (name "xf86-video-neomagic")
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index ccac67720..5bae8c18e 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -109,7 +109,6 @@ Section \"Files\"
   ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-fbdev "/lib/xorg/modules/drivers\"
   ModulePath \"" xf86-video-ati "/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\"
@@ -147,7 +146,6 @@ EndSection
   (list xf86-video-vesa
         xf86-video-fbdev
         xf86-video-ati
-        xf86-video-modesetting
         xf86-video-cirrus
         xf86-video-intel
         xf86-video-mach64
-- 
2.11.1

Re: [PATCH] gnu: Remove xf86-video-modesetting.

[Leo Famulari]

On Tue, Feb 14, 2017 at 05:47:53PM +0100, Marius Bakke wrote:
> This is maintained as part of xorg-server nowadays.
> 
> * gnu/packages/xorg.scm (xf86-video-modesetting): Remove variable.
> * gnu/services/xorg.scm (xorg-configuration-file, %default-xorg-modules):
> Adjust accordingly.

I believe it came from this merge commit, contained in xorg-server
1.17.0:

https://cgit.freedesktop.org/xorg/xserver/commit/?id=35dc7c75150733dbcef8a18b6796f49a7c48ebee

LGTM assuming GuixSD still works for you with this change :)

Re: [PATCH] gnu: Remove xf86-video-modesetting.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, Feb 14, 2017 at 05:47:53PM +0100, Marius Bakke wrote:
>> This is maintained as part of xorg-server nowadays.
>> 
>> * gnu/packages/xorg.scm (xf86-video-modesetting): Remove variable.
>> * gnu/services/xorg.scm (xorg-configuration-file, %default-xorg-modules):
>> Adjust accordingly.
>
> I believe it came from this merge commit, contained in xorg-server
> 1.17.0:
>
> https://cgit.freedesktop.org/xorg/xserver/commit/?id=35dc7c75150733dbcef8a18b6796f49a7c48ebee

Good find. I added this to the commit message.

> LGTM assuming GuixSD still works for you with this change :)

I've confirmed that the built-in xorg modesetting driver works on amd64.
xf86-video-intel works better on my system, though :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]