me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Switch from dri3proto to xorgproto.

Browse source 
* gnu/packages/gl.scm (mesa)[inputs]: Remove DRI3PROTO.
* gnu/packages/xorg.scm (xorg-server)[propagated-inputs]: Likewise.
(dri3proto)[properties]: Mark as superseded by XORGPROTO.
This commit is contained in:
Marius Bakke 2018-03-10 13:57:03 +01:00
parent 3993a28a36
commit 0e540ac1e2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/gl.scm
View file

@ -251,7 +251,6 @@ also known as DXTn or DXTC) for Mesa.")
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs
`(("expat" ,expat) `(("expat" ,expat)
("dri3proto" ,dri3proto)
("libelf" ,libelf) ;required for r600 when using llvm ("libelf" ,libelf) ;required for r600 when using llvm
("libva" ,(force libva-without-mesa)) ("libva" ,(force libva-without-mesa))
("libxml2" ,libxml2) ("libxml2" ,libxml2)

6
gnu/packages/xorg.scm
View file

@ -372,7 +372,8 @@ translate between direct rendered buffers and X pixmaps. When combined with
the Present extension, a complete direct rendering solution for OpenGL is the Present extension, a complete direct rendering solution for OpenGL is
provided.") provided.")
(license (license:x11-style "file://dri3proto.h" (license (license:x11-style "file://dri3proto.h"
"See 'dri3proto.h' in the distribution.")))) "See 'dri3proto.h' in the distribution."))
(properties `((superseded . ,xorgproto)))))
(define-public %app-defaults-dir "/lib/X11/app-defaults") (define-public %app-defaults-dir "/lib/X11/app-defaults")
@ -5095,8 +5096,7 @@ over Xlib, including:
(file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("dri3proto" ,dri3proto) `(("libpciaccess" ,libpciaccess)
("libpciaccess" ,libpciaccess)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("presentproto" ,presentproto) ("presentproto" ,presentproto)