diff options
| author | Vinicius Monego <monego@posteo.net> | 2024-03-26 15:27:04 -0300 |
|---|---|---|
| committer | Vinicius Monego <monego@posteo.net> | 2024-04-06 08:10:45 -0300 |
| commit | 5cb8b47b89fff50e2608bd47f19223f86bc850b0 (patch) | |
| tree | cda2ec27c1d9cf5287108435446880c67fece232 /gnu | |
| parent | 81c6c8a01b91e65732f64afbb35980742441a5fd (diff) | |
| download | guix-5cb8b47b89fff50e2608bd47f19223f86bc850b0.tar.gz | |
gnu: openshadinglanguage: Update to 1.13.8.0.
* gnu/packages/graphics.scm (openshadinglanguage): Update to 1.13.8.0. [source]: Add patch. [arguments]: Use G-Expressions. <#:configure-flags>: Pass the "-DLLVM_BC_GENERATOR" option. <#:phases>: Delete the add-ilmbase-include-path phase. Add new tests to skip. [native-inputs]: Replace clang-9 with clang, llmv-9 with llvm. [inputs]: Replace openexr-2 with openexr, qtbase-5 with qtbase. Change-Id: Ib3e7ed39c3eb170e3d24ccc74243ebff490e07ab
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/graphics.scm | 64 |
1 files changed, 29 insertions, 35 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 591ca2b2a9..5d7d169481 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -707,7 +707,7 @@ baking tools to produce normal maps.") (define-public openshadinglanguage (package (name "openshadinglanguage") - (version "1.11.16.0") + (version "1.13.8.0") (source (origin (method git-fetch) @@ -716,52 +716,46 @@ baking tools to produce normal maps.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g")))) + (base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02")))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-DUSE_PARTIO=OFF") ; TODO: not packaged - #:phases - (modify-phases %standard-phases - (add-after 'set-paths 'add-ilmbase-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; OpenEXR 2 propagates ilmbase, but its include files do not - ;; appear in the C_INCLUDE_PATH. - (let ((headers (string-append - (assoc-ref inputs "ilmbase") - "/include/OpenEXR"))) - (setenv "C_INCLUDE_PATH" - (string-append headers ":" - (or (getenv "C_INCLUDE_PATH") ""))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append headers ":" - (or (getenv "CPLUS_INCLUDE_PATH") "")))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "--exclude-regex" - (string-join - (list - "osl-imageio" ; OIIO not compiled with freetype - "osl-imageio.opt" ; OIIO not compiled with freetype - "texture-udim" ; file does not exist - "texture-udim.opt" ; file does not exist - "example-deformer" ; could not find OSLConfig - "python-oslquery") ; no module oslquery - "|")))))))) + (list #:configure-flags + #~(list "-DUSE_PARTIO=OFF" ; TODO: not packaged + (string-append "-DLLVM_BC_GENERATOR=" + #$(this-package-native-input "clang") + "/bin/clang++")) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke + "ctest" "--exclude-regex" + (string-join + (list + "osl-imageio" ; file does not exist + "osl-imageio.opt" ; file does not exist + "osl-imageio.opt.rs_bitcode" ; file does not exist + "texture-udim" ; file does not exist + "texture-udim.opt" ; file does not exist + "texture-udim.opt.rs_bitcode" ; file does not exist + "example-deformer" ; could not find OSLConfig + "python-oslquery") ; no module oslquery + "|")))))))) (native-inputs (list bison - clang-9 + clang flex - llvm-9 + llvm pybind11 python-wrapper)) (inputs (list boost imath - openexr-2 + openexr openimageio pugixml - qtbase-5 + qtbase zlib)) (home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage") (synopsis "Shading language for production GI renderers") |