diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-10 14:00:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 00:19:56 +0100 |
| commit | 205b83ad15de56650b144eaddaa3941d7bfc4d33 (patch) | |
| tree | db71e76a495133e574c31bc82f4af49380f41d23 /gnu/packages/xorg.scm | |
| parent | 0e540ac1e204ccdb0f57958ea894b012f9bdcfb9 (diff) | |
| download | guix-205b83ad15de56650b144eaddaa3941d7bfc4d33.tar guix-205b83ad15de56650b144eaddaa3941d7bfc4d33.tar.gz | |
gnu: Switch from videoproto to xorgproto.
* gnu/packages/xorg.scm (videoproto)[properties]: Mark as superseded by XORGPROTO.
(libxv)[propagated-inputs]: Replace VIDEOPROTO with XORGPROTO.
[inputs]: Remove XORGPROTO.
(xorg-server)[propagated-inputs]: Likewise.
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e412a949d9..9cce3f6ca7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1932,8 +1932,8 @@ generate new versions of their configure scripts with autoconf.") (description "Video Extension provides a protocol for a video output mechanism, mainly to rescale video playback in the video controller hardware.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public windowswmproto (package @@ -4698,10 +4698,9 @@ protocol and arbitrary X extension protocol.") "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j")))) (build-system gnu-build-system) (propagated-inputs - `(("videoproto" ,videoproto))) + `(("xorgproto" ,xorgproto))) (inputs - `(("xorgproto" ,xorgproto) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -5103,7 +5102,6 @@ over Xlib, including: ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) - ("videoproto" ,videoproto) ("xineramaproto" ,xineramaproto) ("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto))) |