From e2f6d4f961466bf0decb51057f2547abbf0acf86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Oct 2025 07:23:27 +0900 Subject: [PATCH] gnu: mesa-opencl: Use the new rusticl OpenCL backend. The previously used Clover backend has been removed. * gnu/packages/gl.scm (mesa-opencl) [#:configure-flags]: Remove gallium-opencl flag. Add gallium-rusticl and gallium-rusticl-enable-drivers. * gnu/packages/rust-apps.scm (rust-bindgen-cli) [inputs]: Replace clang with clang-18. Change-Id: I4e3557816c9a5bb5c652295f1351c3bd8eac608d --- gnu/packages/gl.scm | 10 +++++++--- gnu/packages/rust-apps.scm | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 60c3a094f4b50bad0f97b1fcab89ddb8065aa649..6508e5999bfa4f88c56e1b76695909c3c7219d47 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Giacomo Leidi -;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023, 2025 Maxim Cournoyer ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021-2025 John Kehayias @@ -351,7 +351,7 @@ also known as DXTn or DXTC) for Mesa.") (native-inputs (append (list bison - clang-18 + clang-18 ;ensure rust-bindgen-cli uses the same flex gettext-minimal glslang @@ -656,7 +656,11 @@ 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)))))) + #~(cons* "-Dgallium-rusticl=true" + ;; Enable all drivers by default. + (string-append "-Dgallium-rusticl-enable-drivers=" + "iris,llvmpipe,nouveau,panfrost,radeonsi,r600") + #$flags)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9477de479abdd89357cf20dbfb511f133334ccd9..496417bbee9f002eefa65b92970c73a02912c170 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2559,7 +2559,7 @@ support, watch support (like @command{top}) and a tree view.") (string-append share "/elvish/lib/bindgen") (lambda _ (invoke bindgen "--generate-shell-completions" "elvish"))))))))) - (inputs (cons* bash-minimal clang (cargo-inputs 'rust-bindgen-cli))) + (inputs (cons* bash-minimal clang-18 (cargo-inputs 'rust-bindgen-cli))) (home-page "https://rust-lang.github.io/rust-bindgen/") (synopsis "Generate Rust FFI bindings to C and C++ libraries") (description "This package can be used to automatically generate Rust FFI