amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mesa: Update to 24.2.2.

Browse source 
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
This commit is contained in:
John Kehayias 2024-09-01 21:06:57 -04:00
parent edf097aad5
commit e00c621cbb
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
2 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/gl.scm
View file

@ -15,7 +15,7 @@
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2021-2024 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
@ -299,7 +299,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)
@ -309,7 +309,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.
@ -322,10 +322,6 @@ 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)
@ -336,21 +332,22 @@ also known as DXTn or DXTC) for Mesa.")
vulkan-loader
wayland
wayland-protocols
`(,zstd "lib"))))
`(,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
@ -595,15 +592,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

2
gnu/packages/python-xyz.scm
View file

@ -6213,6 +6213,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")
@ -21167,6 +21168,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")