ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xorg-server, xorg-server-for-tests: Update to 21.1.0.

Browse source 
* gnu/packages/xorg.scm (xorg-server): Update to 21.1.0.
[origin]: Update URI.
(xorg-server-for-tests)[version]: Delete field.
[source]: Likewise.
[propagated-inputs]: Add libxcvt and an explanatory comment.
This commit is contained in:
Maxim Cournoyer 2021-10-28 21:40:48 -04:00
parent 27a7c46598
commit 8265e209b3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/xorg.scm
View file

@ -5394,15 +5394,16 @@ (define-public libxcvt
(define-public xorg-server (define-public xorg-server
(package (package
(name "xorg-server") (name "xorg-server")
(version "1.20.11") (version "21.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://xorg/individual/xserver/"
"xorg-server-" version ".tar.bz2")) (uri (string-append "https://xorg.freedesktop.org/archive/individual"
"/xserver/xorg-server-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i")) "0hpyq51sf7f5yqq87zgcdiidfmb8r93am1djvxhcnwj4izfidhsh"))
(patches (patches
(list (list
;; See: ;; See:
@ -5419,7 +5420,9 @@ (define-public xorg-server
(file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("libpciaccess" ,libpciaccess) ;; The following libraries are required by xorg-server.pc.
`(("libpciaccess" ,libpciaccess)
("libxcvt" ,libxcvt)
("mesa" ,mesa) ("mesa" ,mesa)
("pixman" ,pixman) ("pixman" ,pixman)
("xorgproto" ,xorgproto))) ("xorgproto" ,xorgproto)))
@ -5522,30 +5525,7 @@ (define-public xorg-server
(define-public xorg-server-for-tests (define-public xorg-server-for-tests
(hidden-package (hidden-package
(package (package
(inherit xorg-server) (inherit xorg-server))))
(version "1.20.10")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/xserver/"
"xorg-server-" version ".tar.bz2"))
(sha256
(base32
"16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"))
(patches
(list
;; See:
;; https://lists.fedoraproject.org/archives/list/devel@lists.
;; fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/
(origin
(method url-fetch)
(uri (string-append
"http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git"
"/plain/06_use-intel-only-on-pre-gen4.diff"))
(sha256
(base32
"0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q"))
(file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))))))
(define-public xorg-server-xwayland (define-public xorg-server-xwayland
(package/inherit xorg-server (package/inherit xorg-server