gnu: xf86-video-r128: Fix FTBFS with xorg-server >= 1.20.

* gnu/packages/xorg.scm (xf86-video-r128): Update to 6.10.2-0.c4c878d.
[source]: Use GIT-FETCH.
[arguments]: Add 'prevent-configure' phase.
[native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL.
This commit is contained in:
Marius Bakke 2018-07-08 19:06:14 +02:00
parent a4edd9ad05
commit 68ee10da03
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -3175,33 +3175,47 @@ This driver is intended for the spice qxl virtio device.")
(home-page "http://www.spice-space.org") (home-page "http://www.spice-space.org")
(license license:x11))) (license license:x11)))
(define-public xf86-video-r128 (define-public xf86-video-r128
;; We need a newer version than 6.10.2 to build against the latest xorg-server.
;; Remove this binding and the bootstrap inputs when >6.10.2 is released.
(let ((commit "c4c878d2ccb75fa75afe46e0e50ee9975c5c57fc")
(revision "0"))
(package (package
(name "xf86-video-r128") (name "xf86-video-r128")
(version "6.10.2") (version (git-version "6.10.2" revision commit))
(source (source (origin
(origin (method git-fetch)
(method url-fetch) (uri (git-reference
(uri (string-append (url (string-append "https://anongit.freedesktop.org/git/xorg"
"mirror://xorg/individual/driver/xf86-video-r128-" "/driver/" name ".git"))
version (commit commit)))
".tar.bz2")) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4")))) "01pff30zz4zxjhw28h8bn9x2kq7c6iswgn19b72wnfgl0arxb63j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-before 'bootstrap 'prevent-configure
(lambda _
;; Prevent autogen from calling "./configure" as part of
;; the bootstrap step, which fails due to wrong shebang.
(setenv "NOCONFIGURE" "1")
#t)))))
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xorgproto" ,xorgproto) ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "ATI Rage 128 video driver for X server") (synopsis "ATI Rage 128 video driver for X server")
(description (description
"xf86-video-r128 is a video driver for the Xorg X server. "xf86-video-r128 is a video driver for the Xorg X server.
This driver is intended for ATI Rage 128 based cards.") This driver is intended for ATI Rage 128 based cards.")
(license license:x11))) (license license:x11))))
(define-public xf86-video-savage (define-public xf86-video-savage
(package (package