nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Switch from xf86driproto to xorgproto. 

* gnu/packages/xorg.scm (xf86-video-mach64, xf86-video-mga, xf86-video-ati,
xf86-video-openchrome, xf86-video-r128, xf86-video-savage, xf86-video-sis,
xf86-video-tdfx)[inputs]: Replace XF86DRIPROTO with XORGPROTO.
(xf86driproto)[properties]: Mark as superseded by XORGPROTO.
(xorg-server)[inputs]: Remove XF86DRIPROTO.
This commit is contained in:
Marius Bakke 2018-03-10 14:32:15 +01:00
parent e399d6cae3
commit a1f78b42da
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/xorg.scm
View File

@ -2686,7 +2686,7 @@ as USB mice.")
"0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf")))) "0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xxf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor (arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable glamor
@ -2968,7 +2968,7 @@ It supports a variety of Intel graphics chipsets.")
(patches (search-patches "xf86-video-mach64-glibc-2.20.patch")))) (patches (search-patches "xf86-video-mach64-glibc-2.20.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -2999,7 +2999,7 @@ the same level of support for generic VGA or 8514/A adapters.")
"08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn")))) "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
@ -3130,7 +3130,7 @@ graphics cards.")
("libxext" ,libxext) ("libxext" ,libxext)
("libxvmc" ,libxvmc) ("libxvmc" ,libxvmc)
("mesa" ,mesa) ("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -3187,7 +3187,7 @@ This driver is intended for the spice qxl virtio device.")
"1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4")))) "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
@ -3214,7 +3214,7 @@ This driver is intended for ATI Rage 128 based cards.")
"11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc")))) "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
@ -3267,7 +3267,7 @@ Xorg X server.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86dgaproto" ,xf86dgaproto) ("xf86dgaproto" ,xf86dgaproto)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
@ -3343,7 +3343,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
"0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c")))) "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
@ -3570,8 +3570,8 @@ direct linear framebuffer access.")
"XFree86 Direct Rendering Infrastructure Extension defines a "XFree86 Direct Rendering Infrastructure Extension defines a
protocol to allow user applications to access the video hardware without protocol to 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 xf86vidmodeproto (define-public xf86vidmodeproto
(package (package
@ -5096,7 +5096,6 @@ over Xlib, including:
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("xineramaproto" ,xineramaproto) ("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
(inputs (inputs
`(("udev" ,eudev) `(("udev" ,eudev)