gnu: Switch from glproto to xorgproto.

* gnu/packages/gl.scm (mesa)[propaged-inputs]: Replace GLPROTO with XORGPROTO.
* gnu/packages/xorg.scm (glproto)[properties]: Mark as superseded by XORGPROTO.
master
Marius Bakke 2018-03-10 13:47:49 +01:00
parent b4d7aef536
commit 70b02a6a6a
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 5 additions and 5 deletions

View File

@ -240,15 +240,15 @@ also known as DXTn or DXTC) for Mesa.")
"mesa-skip-disk-cache-test.patch")))) "mesa-skip-disk-cache-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("glproto" ,glproto) `(;; The following are in the Requires.private field of gl.pc.
;; The following are in the Requires.private field of gl.pc.
("libdrm" ,libdrm) ("libdrm" ,libdrm)
("libvdpau" ,libvdpau) ("libvdpau" ,libvdpau)
("libx11" ,libx11) ("libx11" ,libx11)
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("libxshmfence" ,libxshmfence) ("libxshmfence" ,libxshmfence)
("libxxf86vm" ,libxxf86vm))) ("libxxf86vm" ,libxxf86vm)
("xorgproto" ,xorgproto)))
(inputs (inputs
`(("expat" ,expat) `(("expat" ,expat)
("dri2proto" ,dri2proto) ("dri2proto" ,dri2proto)

View File

@ -935,8 +935,8 @@ the fonts protocol.")
(description (description
"OpenGL Extension defines a protocol for the client to send 3D "OpenGL Extension defines a protocol for the client to send 3D
rendering commands to the X server.") rendering commands to the X server.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public iceauth (define-public iceauth
(package (package