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
This commit is contained in:
parent
81c6c8a01b
commit
5cb8b47b89
1 changed files with 29 additions and 35 deletions
|
@ -707,7 +707,7 @@ baking tools to produce normal maps.")
|
||||||
(define-public openshadinglanguage
|
(define-public openshadinglanguage
|
||||||
(package
|
(package
|
||||||
(name "openshadinglanguage")
|
(name "openshadinglanguage")
|
||||||
(version "1.11.16.0")
|
(version "1.13.8.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -716,52 +716,46 @@ baking tools to produce normal maps.")
|
||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g"))))
|
(base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags (list "-DUSE_PARTIO=OFF") ; TODO: not packaged
|
(list #:configure-flags
|
||||||
#:phases
|
#~(list "-DUSE_PARTIO=OFF" ; TODO: not packaged
|
||||||
(modify-phases %standard-phases
|
(string-append "-DLLVM_BC_GENERATOR="
|
||||||
(add-after 'set-paths 'add-ilmbase-include-path
|
#$(this-package-native-input "clang")
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
"/bin/clang++"))
|
||||||
;; OpenEXR 2 propagates ilmbase, but its include files do not
|
#:phases
|
||||||
;; appear in the C_INCLUDE_PATH.
|
#~(modify-phases %standard-phases
|
||||||
(let ((headers (string-append
|
(replace 'check
|
||||||
(assoc-ref inputs "ilmbase")
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
"/include/OpenEXR")))
|
(when tests?
|
||||||
(setenv "C_INCLUDE_PATH"
|
(invoke
|
||||||
(string-append headers ":"
|
"ctest" "--exclude-regex"
|
||||||
(or (getenv "C_INCLUDE_PATH") "")))
|
(string-join
|
||||||
(setenv "CPLUS_INCLUDE_PATH"
|
(list
|
||||||
(string-append headers ":"
|
"osl-imageio" ; file does not exist
|
||||||
(or (getenv "CPLUS_INCLUDE_PATH") ""))))))
|
"osl-imageio.opt" ; file does not exist
|
||||||
(replace 'check
|
"osl-imageio.opt.rs_bitcode" ; file does not exist
|
||||||
(lambda* (#:key tests? #:allow-other-keys)
|
"texture-udim" ; file does not exist
|
||||||
(when tests?
|
"texture-udim.opt" ; file does not exist
|
||||||
(invoke "ctest" "--exclude-regex"
|
"texture-udim.opt.rs_bitcode" ; file does not exist
|
||||||
(string-join
|
"example-deformer" ; could not find OSLConfig
|
||||||
(list
|
"python-oslquery") ; no module oslquery
|
||||||
"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
|
|
||||||
"|"))))))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bison
|
(list bison
|
||||||
clang-9
|
clang
|
||||||
flex
|
flex
|
||||||
llvm-9
|
llvm
|
||||||
pybind11
|
pybind11
|
||||||
python-wrapper))
|
python-wrapper))
|
||||||
(inputs
|
(inputs
|
||||||
(list boost
|
(list boost
|
||||||
imath
|
imath
|
||||||
openexr-2
|
openexr
|
||||||
openimageio
|
openimageio
|
||||||
pugixml
|
pugixml
|
||||||
qtbase-5
|
qtbase
|
||||||
zlib))
|
zlib))
|
||||||
(home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage")
|
(home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage")
|
||||||
(synopsis "Shading language for production GI renderers")
|
(synopsis "Shading language for production GI renderers")
|
||||||
|
|
Reference in a new issue