summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 13:55:07 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:55 +0100
commit3993a28a36593187dde94c88b55d75ce12175fa7 (patch)
tree1d1a65ef2c10c4072363552eefe988f7fe9f86f2
parentbe56161df16b7a6e72c88ff3a21177485fd93580 (diff)
downloadpatches-3993a28a36593187dde94c88b55d75ce12175fa7.tar
patches-3993a28a36593187dde94c88b55d75ce12175fa7.tar.gz
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.
-rw-r--r--gnu/packages/gl.scm1
-rw-r--r--gnu/packages/video.scm6
-rw-r--r--gnu/packages/xorg.scm6
3 files changed, 6 insertions, 7 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 8494b48603..920cc92655 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -251,7 +251,6 @@ also known as DXTn or DXTC) for Mesa.")
("xorgproto" ,xorgproto)))
(inputs
`(("expat" ,expat)
- ("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto)
("libelf" ,libelf) ;required for r600 when using llvm
("libva" ,(force libva-without-mesa))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ffc5f33e7b..15e1e2caeb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1936,9 +1936,9 @@ and JACK.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- `(("dri2proto" ,dri2proto)
- ("libx11" ,libx11 "out")
- ("libxext" ,libxext)))
+ `(("libx11" ,libx11 "out")
+ ("libxext" ,libxext)
+ ("xorgproto" ,xorgproto)))
(home-page "https://wiki.freedesktop.org/www/Software/VDPAU/")
(synopsis "Video Decode and Presentation API")
(description "VDPAU is the Video Decode and Presentation API for UNIX. It
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d895f56387..4df95a1fb4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -346,7 +346,8 @@ servers making up a large display.")
"Direct Rendering Infrastructure 2 Extension defines a protocol to
securely allow user applications to access the video hardware without
requiring data to be passed through the X server.")
- (license license:x11)))
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public dri3proto
(package
@@ -5094,8 +5095,7 @@ over Xlib, including:
(file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
(build-system gnu-build-system)
(propagated-inputs
- `(("dri2proto" ,dri2proto)
- ("dri3proto" ,dri3proto)
+ `(("dri3proto" ,dri3proto)
("libpciaccess" ,libpciaccess)
("mesa" ,mesa)
("pixman" ,pixman)