~ruther/guix-local

e2f6d4f961466bf0decb51057f2547abbf0acf86 — Maxim Cournoyer 7 months ago 8dc37e1
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
2 files changed, 8 insertions(+), 4 deletions(-)

M gnu/packages/gl.scm
M gnu/packages/rust-apps.scm
M gnu/packages/gl.scm => gnu/packages/gl.scm +7 -3
@@ 12,7 12,7 @@
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2020, 2021, 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021-2025 John Kehayias <john.kehayias@protonmail.com>


@@ 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

M gnu/packages/rust-apps.scm => gnu/packages/rust-apps.scm +1 -1
@@ 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