diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
| commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
| tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/gl.scm | |
| parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
| parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
| download | guix-8de4131b2ddd11faa3394cf497484563068c9e7a.tar.gz guix-8de4131b2ddd11faa3394cf497484563068c9e7a.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9885bde712..2f7c25bc57 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> -;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com> ;;; @@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.0.3") + (version "23.1.4") (source (origin (method url-fetch) @@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) + "0n89l7lvawh85hq2a7g5pp5v017s03qs3n4hbbff6rs8p5zs2qbj")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -298,7 +298,8 @@ also known as DXTn or DXTC) for Mesa.") libxvmc llvm-for-mesa wayland - wayland-protocols)) + wayland-protocols + `(,zstd "lib"))) (native-inputs (list bison flex @@ -345,7 +346,7 @@ svga,swrast,virgl"))) ;; Explicitly enable Vulkan on some architectures. #$@(match (%current-system) ((or "i686-linux" "x86_64-linux") - '("-Dvulkan-drivers=intel,amd")) + '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast")) ((or "powerpc64le-linux" "powerpc-linux") '("-Dvulkan-drivers=amd,swrast")) ("aarch64-linux" @@ -362,6 +363,9 @@ svga,swrast,virgl"))) ;; 21.3.x releases to avoid functionality regressions. "-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc" + ;; Enable ZSTD compression for shader cache. + "-Dzstd=enabled" + ;; Also enable the tests. "-Dbuild-tests=true" @@ -517,6 +521,7 @@ svga,swrast,virgl"))) (list (search-path-specification ;; Ensure the Mesa VDPAU drivers can be found. (variable "VDPAU_DRIVER_PATH") + (separator #f) (files '("lib/vdpau"))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") |