mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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
This commit is contained in:
parent
edf097aad5
commit
e00c621cbb
2 changed files with 21 additions and 30 deletions
|
@ -15,7 +15,7 @@
|
||||||
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
|
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
|
||||||
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
|
;;; 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 © 2022 Petr Hodina <phodina@protonmail.com>
|
||||||
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
|
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
|
||||||
;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
|
;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
|
||||||
|
@ -299,7 +299,7 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
(define-public mesa
|
(define-public mesa
|
||||||
(package
|
(package
|
||||||
(name "mesa")
|
(name "mesa")
|
||||||
(version "24.0.4")
|
(version "24.2.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -309,7 +309,7 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
"mesa-" version ".tar.xz")))
|
"mesa-" version ".tar.xz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1w25lwdrb0ffrx2fjk9izbvpcgf9ypfc7v32zybwvjwql0qbvzlh"))))
|
"00hxi7wjp368kh5qq2v25nyzjrf0grsx55w55fg4bgpd0hqps1zx"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; The following are in the Requires.private field of gl.pc.
|
;; The following are in the Requires.private field of gl.pc.
|
||||||
|
@ -322,35 +322,32 @@ also known as DXTn or DXTC) for Mesa.")
|
||||||
libxxf86vm
|
libxxf86vm
|
||||||
xorgproto))
|
xorgproto))
|
||||||
(inputs
|
(inputs
|
||||||
(append
|
(list elfutils ;libelf required for r600 when using llvm
|
||||||
(if (target-aarch64?)
|
expat
|
||||||
(list clang-18)
|
(force libva-without-mesa)
|
||||||
'())
|
libxml2
|
||||||
(list elfutils ;libelf required for r600 when using llvm
|
libxrandr
|
||||||
expat
|
libxvmc
|
||||||
(force libva-without-mesa)
|
llvm-for-mesa
|
||||||
libxml2
|
vulkan-loader
|
||||||
libxrandr
|
wayland
|
||||||
libxvmc
|
wayland-protocols
|
||||||
llvm-for-mesa
|
`(,zstd "lib")))
|
||||||
vulkan-loader
|
|
||||||
wayland
|
|
||||||
wayland-protocols
|
|
||||||
`(,zstd "lib"))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(append
|
(append
|
||||||
(list bison
|
(list bison
|
||||||
|
clang-18
|
||||||
flex
|
flex
|
||||||
gettext-minimal
|
gettext-minimal
|
||||||
glslang
|
glslang
|
||||||
|
libclc
|
||||||
pkg-config
|
pkg-config
|
||||||
python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
|
python-libxml2 ;for OpenGL ES 1.1 and 2.0 support
|
||||||
python-mako
|
python-mako
|
||||||
|
python-ply
|
||||||
|
python-pyyaml
|
||||||
python-wrapper
|
python-wrapper
|
||||||
(@ (gnu packages base) which))
|
(@ (gnu packages base) which))
|
||||||
(if (target-aarch64?)
|
|
||||||
(list libclc)
|
|
||||||
'())
|
|
||||||
(if (%current-target-system)
|
(if (%current-target-system)
|
||||||
(list cmake-minimal-cross
|
(list cmake-minimal-cross
|
||||||
pkg-config-for-build
|
pkg-config-for-build
|
||||||
|
@ -595,15 +592,7 @@ from software emulation to complete hardware acceleration for modern GPUs.")
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments mesa)
|
(substitute-keyword-arguments (package-arguments mesa)
|
||||||
((#:configure-flags flags)
|
((#:configure-flags flags)
|
||||||
#~(cons "-Dgallium-opencl=standalone" #$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))))))
|
|
||||||
|
|
||||||
(define-public mesa-opencl-icd
|
(define-public mesa-opencl-icd
|
||||||
(package/inherit mesa-opencl
|
(package/inherit mesa-opencl
|
||||||
|
|
|
@ -6213,6 +6213,7 @@ visualisation and class tracker statistics.")
|
||||||
environments and back.")
|
environments and back.")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
|
;; WARNING: This package is a dependency of mesa.
|
||||||
(define-public python-pyyaml
|
(define-public python-pyyaml
|
||||||
(package
|
(package
|
||||||
(name "python-pyyaml")
|
(name "python-pyyaml")
|
||||||
|
@ -21167,6 +21168,7 @@ Protocol) 0-9-1 protocol that tries to stay fairly independent of the underlying
|
||||||
network support library.")
|
network support library.")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
|
;; WARNING: This package is a dependency of mesa.
|
||||||
(define-public python-ply
|
(define-public python-ply
|
||||||
(package
|
(package
|
||||||
(name "python-ply")
|
(name "python-ply")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue