podiki pushed a commit to branch mesa-updates
in repository guix.
commit 12f371a97cf3ff4123e2ef6dcab691e3b6a5afee
Author: John Kehayias <john.kehay...@protonmail.com>
AuthorDate: Sun Sep 1 21:06:57 2024 -0400
gnu: mesa: Update to 24.2.2.
Note the clang input for mesa was in inputs for aarch64-linux but more
generally in native-inputs for mesa-opencl. Moved to native-inputs for
all (mesa does not retain a reference to clang).
* gnu/packages/gl.scm (mesa): Update to 24.2.2.
[inputs]: Move clang-18 when building for aarch64-linux to ...
[native-inputs]: ... here for all architectures. Add python-ply, and
python-pyyaml. Use libclc for all architectures.
(mesa-opencl)[inputs, native-inputs]: Remove fields.
* gnu/packages/python-xyz.scm (python-pyyaml, python-ply): Add a comment
about
being dependencies of mesa.
Change-Id: Ie262e6ea5a31fda0e410277256c203ea3caed96b
---
gnu/packages/gl.scm | 49 ++++++++++++++++++---------------------------
gnu/packages/python-xyz.scm | 2 ++
2 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index ab53b1761a..ab18a3e5a7 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer
<maxim.courno...@gmail.com>
;;; Copyright © 2020 Kei Kebreau <kkebr...@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankev...@spbu.ru>
-;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehay...@protonmail.com>
+;;; Copyright © 2021-2024 John Kehayias <john.kehay...@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phod...@protonmail.com>
;;; Copyright © 2023 Kaelyn Takata <kaelyn.al...@protonmail.com>
;;; Copyright © 2023, 2024 Zheng Junjie <873216...@qq.com>
@@ -298,7 +298,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
(package
(name "mesa")
- (version "24.0.4")
+ (version "24.2.2")
(source
(origin
(method url-fetch)
@@ -308,7 +308,7 @@ also known as DXTn or DXTC) for Mesa.")
"mesa-" version ".tar.xz")))
(sha256
(base32
- "1w25lwdrb0ffrx2fjk9izbvpcgf9ypfc7v32zybwvjwql0qbvzlh"))))
+ "00hxi7wjp368kh5qq2v25nyzjrf0grsx55w55fg4bgpd0hqps1zx"))))
(build-system meson-build-system)
(propagated-inputs
;; The following are in the Requires.private field of gl.pc.
@@ -321,35 +321,32 @@ also known as DXTn or DXTC) for Mesa.")
libxxf86vm
xorgproto))
(inputs
- (append
- (if (target-aarch64?)
- (list clang-18)
- '())
- (list elfutils ;libelf required for r600 when using
llvm
- expat
- (force libva-without-mesa)
- libxml2
- libxrandr
- libxvmc
- llvm-for-mesa
- vulkan-loader
- wayland
- wayland-protocols
- `(,zstd "lib"))))
+ (list elfutils ;libelf required for r600 when using llvm
+ expat
+ (force libva-without-mesa)
+ libxml2
+ libxrandr
+ libxvmc
+ llvm-for-mesa
+ vulkan-loader
+ wayland
+ wayland-protocols
+ `(,zstd "lib")))
(native-inputs
(append
(list bison
+ clang-18
flex
gettext-minimal
glslang
+ libclc
pkg-config
python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
python-mako
+ python-ply
+ python-pyyaml
python-wrapper
(@ (gnu packages base) which))
- (if (target-aarch64?)
- (list libclc)
- '())
(if (%current-target-system)
(list cmake-minimal-cross
pkg-config-for-build
@@ -594,15 +591,7 @@ from software emulation to complete hardware acceleration
for modern GPUs.")
(arguments
(substitute-keyword-arguments (package-arguments mesa)
((#:configure-flags flags)
- #~(cons "-Dgallium-opencl=standalone" #$flags))))
- (inputs
- (modify-inputs (package-inputs mesa)
- (prepend libclc)))
- (native-inputs
- (if (target-aarch64?)
- (package-native-inputs mesa)
- (modify-inputs (package-native-inputs mesa)
- (prepend clang-18))))))
+ #~(cons "-Dgallium-opencl=standalone" #$flags))))))
(define-public mesa-opencl-icd
(package/inherit mesa-opencl
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6975cca1f7..70c228ad33 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6136,6 +6136,7 @@ visualisation and class tracker statistics.")
environments and back.")
(license license:bsd-3)))
+;; WARNING: This package is a dependency of mesa.
(define-public python-pyyaml
(package
(name "python-pyyaml")
@@ -21010,6 +21011,7 @@ Protocol) 0-9-1 protocol that tries to stay fairly
independent of the underlying
network support library.")
(license license:bsd-3)))
+;; WARNING: This package is a dependency of mesa.
(define-public python-ply
(package
(name "python-ply")
