[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/27: gnu: Switch from glproto to xorgproto.
From: |
Marius Bakke |
Subject: |
10/27: gnu: Switch from glproto to xorgproto. |
Date: |
Sat, 17 Mar 2018 19:21:08 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 70b02a6a6a329c6a6f95be4e0af3ebdb0dfb726c
Author: Marius Bakke <address@hidden>
Date: Sat Mar 10 13:47:49 2018 +0100
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.
---
gnu/packages/gl.scm | 6 +++---
gnu/packages/xorg.scm | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 27d0643..8494b48 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -240,15 +240,15 @@ also known as DXTn or DXTC) for Mesa.")
"mesa-skip-disk-cache-test.patch"))))
(build-system gnu-build-system)
(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)
("libvdpau" ,libvdpau)
("libx11" ,libx11)
("libxdamage" ,libxdamage)
("libxfixes" ,libxfixes)
("libxshmfence" ,libxshmfence)
- ("libxxf86vm" ,libxxf86vm)))
+ ("libxxf86vm" ,libxxf86vm)
+ ("xorgproto" ,xorgproto)))
(inputs
`(("expat" ,expat)
("dri2proto" ,dri2proto)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cf062fd..fade6e8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -935,8 +935,8 @@ the fonts protocol.")
(description
"OpenGL Extension defines a protocol for the client to send 3D
rendering commands to the X server.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public iceauth
(package
- 14/27: gnu: Switch from dri3proto to xorgproto., (continued)
- 14/27: gnu: Switch from dri3proto to xorgproto., Marius Bakke, 2018/03/17
- 15/27: gnu: Switch from videoproto to xorgproto., Marius Bakke, 2018/03/17
- 17/27: gnu: Switch from xcmiscproto to xorgproto., Marius Bakke, 2018/03/17
- 26/27: gnu: Switch from xf86vidmodeproto to xorgproto., Marius Bakke, 2018/03/17
- 23/27: gnu: Switch from xf86driproto to xorgproto., Marius Bakke, 2018/03/17
- 20/27: gnu: Switch from resourceproto to xorgproto., Marius Bakke, 2018/03/17
- 19/27: gnu: Switch from renderproto to xorgproto., Marius Bakke, 2018/03/17
- 22/27: gnu: Switch from scrnsaverproto to xorgproto., Marius Bakke, 2018/03/17
- 01/27: gnu: Switch from xproto to xorgproto., Marius Bakke, 2018/03/17
- 16/27: gnu: Switch from windowswmproto to xorgproto., Marius Bakke, 2018/03/17
- 10/27: gnu: Switch from glproto to xorgproto.,
Marius Bakke <=
- 18/27: gnu: Switch from presentproto to xorgproto., Marius Bakke, 2018/03/17
- 21/27: gnu: Switch from recordproto to xorgproto., Marius Bakke, 2018/03/17
- 27/27: gnu: Switch from xineramaproto to xorgproto., Marius Bakke, 2018/03/17