From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: 73071@debbugs.gnu.org
Cc: John Kehayias <john.kehayias@protonmail.com>,
aurtzy@gmail.com, efraim@flashner.co.il
Subject: [bug#73071] [PATCH mesa-updates 8/8] gnu: mesa: Update to 24.2.2.
Date: Fri, 06 Sep 2024 15:08:08 +0000 [thread overview]
Message-ID: <fafd0245505fad7629ec98cef8d15e6e478f3f98.1725634153.git.john.kehayias@protonmail.com> (raw)
In-Reply-To: <cover.1725634153.git.john.kehayias@protonmail.com>
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.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>
@@ -298,7 +298,7 @@ (define libva-without-mesa
(define-public mesa
(package
(name "mesa")
- (version "24.0.4")
+ (version "24.2.2")
(source
(origin
(method url-fetch)
@@ -308,7 +308,7 @@ (define-public 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 @@ (define-public 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 @@ (define-public mesa-opencl
(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 21e04e75e9..416db71d68 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6133,6 +6133,7 @@ (define-public python-itsdangerous
environments and back.")
(license license:bsd-3)))
+;; WARNING: This package is a dependency of mesa.
(define-public python-pyyaml
(package
(name "python-pyyaml")
@@ -20995,6 +20996,7 @@ (define-public python-pika
network support library.")
(license license:bsd-3)))
+;; WARNING: This package is a dependency of mesa.
(define-public python-ply
(package
(name "python-ply")
--
2.45.2
next prev parent reply other threads:[~2024-09-06 15:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 15:00 [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 John Kehayias via Guix-patches via
2024-09-06 15:05 ` [bug#73071] [PATCH mesa-updates 1/8] gnu: libdrm: Update to 2.4.123 John Kehayias via Guix-patches via
2024-09-06 15:06 ` [bug#73071] [PATCH mesa-updates 2/8] gnu: wayland-protocols: Update to 1.37 John Kehayias via Guix-patches via
2024-09-06 15:07 ` [bug#73071] [PATCH mesa-updates 3/8] gnu: Remove wayland-protocols-next John Kehayias via Guix-patches via
2024-09-06 15:07 ` [bug#73071] [PATCH mesa-updates 4/8] gnu: vulkan-headers: Hard-code libvulkan.so file name John Kehayias via Guix-patches via
2024-09-06 15:07 ` [bug#73071] [PATCH mesa-updates 5/8] gnu: volk: Hard-code path of vulkan-loader for dynamic loading John Kehayias via Guix-patches via
2024-09-06 15:07 ` [bug#73071] [PATCH mesa-updates 6/8] gnu: llvm-for-mesa: Update to llvm-18 John Kehayias via Guix-patches via
2024-09-06 15:07 ` [bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets John Kehayias via Guix-patches via
2024-09-06 15:08 ` John Kehayias via Guix-patches via [this message]
2024-09-09 3:43 ` [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 John Kehayias via Guix-patches via
2024-09-09 16:12 ` [bug#73071] [PATCH mesa-updates] gnu: mesa: Enable NVK driver for x86_64 architecture aurtzy
2024-09-16 2:59 ` John Kehayias via Guix-patches via
2024-09-17 1:50 ` [bug#73071] [PATCH mesa-updates 0/8] Various updates for mesa to 24.2.2 aurtzy
2024-09-18 0:35 ` The Man
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fafd0245505fad7629ec98cef8d15e6e478f3f98.1725634153.git.john.kehayias@protonmail.com \
--to=guix-patches@gnu.org \
--cc=73071@debbugs.gnu.org \
--cc=aurtzy@gmail.com \
--cc=efraim@flashner.co.il \
--cc=john.kehayias@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.