me
/
guix
Archived
1
0
Fork 0
Code

gnu: Switch from dri2proto to xorgproto. 

* gnu/packages/gl.scm (mesa)[inputs]: Remove DRI2PROTO.
* gnu/packages/video.scm (libvdpau)[inputs]: Replace DRI2PROTO with XORGPROTO.
* gnu/packages/xorg.scm (dri2proto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[inputs]: Remove DRI2PROTO.
master
Marius Bakke 2018-03-10 13:55:07 +01:00
parent be56161df1
commit 3993a28a36
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 6 additions and 7 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)
("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto) ("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))

6
gnu/packages/video.scm
View File

@ -1936,9 +1936,9 @@ and JACK.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("dri2proto" ,dri2proto) `(("libx11" ,libx11 "out")
("libx11" ,libx11 "out") ("libxext" ,libxext)
("libxext" ,libxext))) ("xorgproto" ,xorgproto)))
(home-page "https://wiki.freedesktop.org/www/Software/VDPAU/") (home-page "https://wiki.freedesktop.org/www/Software/VDPAU/")
(synopsis "Video Decode and Presentation API") (synopsis "Video Decode and Presentation API")
(description "VDPAU is the Video Decode and Presentation API for UNIX. It (description "VDPAU is the Video Decode and Presentation API for UNIX. It

6
gnu/packages/xorg.scm
View File

@ -346,7 +346,8 @@ servers making up a large display.")
"Direct Rendering Infrastructure 2 Extension defines a protocol to "Direct Rendering Infrastructure 2 Extension defines a protocol to
securely allow user applications to access the video hardware without securely allow user applications to access the video hardware without
requiring data to be passed through the X server.") requiring data to be passed through the X server.")
(license license:x11))) (license license:x11)
(properties `((superseded . ,xorgproto)))))
(define-public dri3proto (define-public dri3proto
(package (package
@ -5094,8 +5095,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
`(("dri2proto" ,dri2proto) `(("dri3proto" ,dri3proto)
("dri3proto" ,dri3proto)
("libpciaccess" ,libpciaccess) ("libpciaccess" ,libpciaccess)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)