diff options
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r-- | gnu/packages/xorg.scm | 125 |
1 files changed, 51 insertions, 74 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 64fca5800d..6c4cf36eb9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6,12 +6,12 @@ ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com> -;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org> -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org> +;;; Copyright © 2017-2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> @@ -86,7 +86,6 @@ #:use-module (gnu packages inkscape) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) - #:use-module (gnu packages libbsd) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -242,14 +241,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2021.5") + (version "2022.2") (source (origin (method url-fetch) - (uri (string-append "ftp://ftp.freedesktop.org/pub/xorg//individual/proto/" - "xorgproto-" version ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/proto" + "/xorgproto-" version ".tar.xz")) (sha256 (base32 - "05d0kib351qmnlfimaznaw0220fr0ym7fx2gn9h2jqxxilxncbxa")))) + "17kbq1x68jl9mz69ays5c0w72lpkqi937raxk0im7y88pvrdn4sx")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. @@ -1274,8 +1273,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) - (inputs - (list libbsd xorgproto)) + (inputs (list xorgproto)) (native-inputs (list pkg-config)) (home-page "https://www.x.org/wiki/") @@ -1286,7 +1284,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (define-public libxft (package (name "libxft") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) @@ -1296,15 +1294,15 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ".tar.bz2")) (sha256 (base32 - "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12")))) + "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) (propagated-inputs ;; xft.pc refers to all these. - `(("libxrender" ,libxrender) - ("freetype" ,freetype) - ("fontconfig" ,fontconfig))) + (list libxrender + freetype + fontconfig)) (inputs (list libx11 xorgproto)) (native-inputs @@ -2038,7 +2036,7 @@ emulate a TI-30 or an HP-10C.") (define-public xcb-proto (package (name "xcb-proto") - (version "1.14") + (version "1.15.2") (source (origin (method url-fetch) @@ -2047,17 +2045,10 @@ emulate a TI-30 or an HP-10C.") version ".tar.xz")) (sha256 (base32 - "01d62r286yfc3rpz714nqdgkl0wk9j0wqkd4ylas1d7r4vmkqshq")) - (modules '((guix build utils))) - (snippet - '(begin - ;; fractions.gcd has been deprecated since python-3.5. - (substitute* "xcbgen/align.py" - (("from fractions import gcd") "from math import gcd")) - #t)))) + "1vak6q53abwxnkfn6by7j24m48kd2iy7jnskkqzzx8l0ysqvwwkh")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) ("python" ,python-minimal-wrapper))) + (list pkg-config python-minimal-wrapper)) (home-page "https://xcb.freedesktop.org/") (synopsis "XML-XCB protocol descriptions") (description @@ -3869,25 +3860,18 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.34") - (source - (origin - (method url-fetch) - (uri (string-append - "ftp://ftp.freedesktop.org/pub/xorg//individual/data/xkeyboard-config/xkeyboard-config-" - version - ".tar.bz2")) - (sha256 - (base32 - "1kmq2ykwmh10sd6155gml4jhdxmvsll6xdg7zw86czpfhrvd48dk")))) - (build-system gnu-build-system) - (inputs - (list libx11 xkbcomp-intermediate)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (version "2.36") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/data/xkeyboard-config/" + "xkeyboard-config-" version ".tar.xz")) + (sha256 + (base32 + "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz")))) + (build-system meson-build-system) + (inputs (list libx11 xkbcomp-intermediate)) + (native-inputs (list gettext-minimal libxslt perl pkg-config python)) (home-page "https://www.x.org/wiki/") (synopsis "Xorg XKB configuration files") (description @@ -4685,17 +4669,17 @@ protocol and arbitrary X extension protocol.") (define-public libxv (package (name "libxv") - (version "1.0.11") + (version "1.0.12") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXv-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j")))) + "0j1qqrhbhdi3kqz0am5i1lhs31ql9pbc14z41w0a5xw9yq4zmxxa")))) (build-system gnu-build-system) (arguments `(#:configure-flags '(,@(malloc0-flags) "--disable-static"))) @@ -4812,8 +4796,7 @@ common definitions and porting layer.") '(#:configure-flags '("--disable-static"))) (propagated-inputs (list xorgproto)) - (inputs - (list libbsd xtrans)) + (inputs (list xtrans)) (native-inputs (list pkg-config)) (home-page "https://www.x.org/wiki/") @@ -4824,17 +4807,16 @@ common definitions and porting layer.") (define-public libxau (package (name "libxau") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXau-" - version - ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c")))) + "02hc3azypiiahr9y1cyn0mqc5zd997hh3h0rp7jqfbsd6f9g5rlb")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) @@ -4985,17 +4967,15 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxvmc (package (name "libxvmc") - (version "1.0.12") + (version "1.0.13") (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libXvMC-" - version - ".tar.bz2")) - (sha256 - (base32 - "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb")))) + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/lib/libXvMC-" + version ".tar.xz")) + (sha256 + (base32 + "0z35xqna3dnrfxgn9aa1y6jx7mrwsn8vi8dcwm3sg23qx9nvx7ha")))) (build-system gnu-build-system) (arguments `(#:configure-flags '(,@(malloc0-flags) "--disable-static"))) @@ -5045,7 +5025,7 @@ protocol.") (define-public libxcb (package (name "libxcb") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) @@ -5053,7 +5033,7 @@ protocol.") "libxcb-" version ".tar.xz")) (sha256 (base32 - "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5")))) + "0nd035rf83xf531cnjzsf9ykb5w9rdzz6bbyhi683xkwh57p8f6c")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;5.5 MiB of man pages (propagated-inputs @@ -5061,8 +5041,7 @@ protocol.") (inputs (list xcb-proto libxslt)) (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-minimal-wrapper))) + (list pkg-config python-minimal-wrapper)) (arguments `(#:configure-flags (list "--enable-xkb" "--disable-static" @@ -5407,7 +5386,7 @@ Wayland.") (define-public libx11 (package (name "libx11") - (version "1.7.3.1") + (version "1.8.1") (source (origin (method url-fetch) @@ -5415,7 +5394,7 @@ Wayland.") "/individual/lib/libX11-" version ".tar.xz")) (sha256 (base32 - "1289nvs52q9fnp7zl30bdpbvqggnjjb39vy0zll511zvcrr43z9g")))) + "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML @@ -5442,17 +5421,15 @@ Wayland.") (define-public libxcursor (package (name "libxcursor") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libXcursor-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/lib/libXcursor-" + version ".tar.xz")) (sha256 (base32 - "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs")))) + "011195an3w4xld3x0dr534kar1xjf52q96hmf0hgvfhh2rrl7ha6")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) |