commit: 18851e8cf12118f02b735715da5ff9ac3dff1bf8 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sun Jul 20 19:17:31 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 1 08:22:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18851e8c
media-libs/osl: add 1.14.6.0, update 9999 Support LLVM-20 Make optix available independent of test. Fix CUDA_OPT_FLAG_CLANG typo. Don't set CUDA_PATH/OPTIX_PATH. Update failed tests. Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43084 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/osl/Manifest | 1 + media-libs/osl/osl-1.14.5.1.ebuild | 2 +- .../osl/{osl-9999.ebuild => osl-1.14.6.0.ebuild} | 46 ++++++++++------------ media-libs/osl/osl-9999.ebuild | 46 ++++++++++------------ 4 files changed, 44 insertions(+), 51 deletions(-) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index c86736417952..f121be2086a8 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,2 +1,3 @@ DIST osl-1.13.12.0.tar.gz 21824352 BLAKE2B 0d5c1d166afc347a515187c34d60c0a2be99e8a1b7078a388190f2232ee545654e3c1fea829dfabb7b0a105d69d3d98cc5dae4fa8f4db1a2228f9f258b34e76b SHA512 152a1b085c4ea88c86bc0ccbd694b848b9f50bd91f1a165899c2c3999042e413e54cdfb83dd90ea23daeeb2a3b65f794b8b2c19e9629bbda266971dcd6e3b5e7 DIST osl-1.14.5.1.tar.gz 43346319 BLAKE2B e2ae4448ecd7c144113012873c85e512edc4dd78bbd64438f194a680554181a98e6c6b871e17229ba5d252db3a5f51f8af2807016682ed4cd60f83d5d734d821 SHA512 4dfa3659dacc78dc82b943f0d16685e9353924fab40127c69cb2fbdf6d0794970bf283f8711119c31369b9fe507c45e12137d2121f217678da9be86b44b4e2dc +DIST osl-1.14.6.0.tar.gz 43339662 BLAKE2B 58a1524bf4eb27fdc3e171244bc9c884b7af6ea9e610469f90a45d30c5a7aa5002d3544bb43718271c16906595a3007144a0dae7d099097768c5dac66ea8c694 SHA512 3ac8fa5a2a595fa659e9982ac76556bcc4b68a6ed907cb3f300b9da69e72ec487a5f83cce61d671e8418d948b86945e2ee8471dfc3dc4cf00cbe596bf07725f9 diff --git a/media-libs/osl/osl-1.14.5.1.ebuild b/media-libs/osl/osl-1.14.5.1.ebuild index ffdd569e2c79..129cae8f7e9c 100644 --- a/media-libs/osl/osl-1.14.5.1.ebuild +++ b/media-libs/osl/osl-1.14.5.1.ebuild @@ -277,7 +277,7 @@ src_configure() { mycmakeargs+=( -DUSE_LLVM_BITCODE="$(usex clang-cuda)" -DCUDA_OPT_FLAG_NVCC="$(get-flag O)" - -DCUDA_OPT_FLAG_NVCC="$(get-flag O)" + -DCUDA_OPT_FLAG_CLANG="$(get-flag O)" ) fi diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-1.14.6.0.ebuild similarity index 92% copy from media-libs/osl/osl-9999.ebuild copy to media-libs/osl/osl-1.14.6.0.ebuild index 26e37e4b01ad..3038b38d882e 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-1.14.6.0.ebuild @@ -7,7 +7,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) # Check this on updates -LLVM_COMPAT=( {18..19} ) +LLVM_COMPAT=( {18..20} ) inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 @@ -45,7 +45,7 @@ IUSE="+clang-cuda debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*] RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( optix? ( clang-cuda ) ) + optix? ( clang-cuda ) " RDEPEND=" @@ -277,7 +277,7 @@ src_configure() { mycmakeargs+=( -DUSE_LLVM_BITCODE="$(usex clang-cuda)" -DCUDA_OPT_FLAG_NVCC="$(get-flag O)" - -DCUDA_OPT_FLAG_NVCC="$(get-flag O)" + -DCUDA_OPT_FLAG_CLANG="$(get-flag O)" ) fi @@ -296,25 +296,23 @@ src_configure() { ) fi - if use test; then - if use optix; then - local -x CUDAHOSTCXX CUDAHOSTLD - CUDAHOSTCXX="$(cuda_get_host_compiler)" - CUDAHOSTLD="$(tc-getCXX)" - - mycmakeargs+=( - -DOSL_USE_OPTIX="yes" - -DOptiX_FIND_QUIETLY="no" - -DCUDA_FIND_QUIETLY="no" - - -DOPTIXHOME="${OPTIX_PATH:=${ESYSROOT}/opt/optix}" - -DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:=${ESYSROOT}/opt/cuda}" - - -DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}" - -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}" - -DCUDA_VERBOSE_BUILD="yes" - ) - fi + if use optix; then + local -x CUDAHOSTCXX CUDAHOSTLD + CUDAHOSTCXX="$(cuda_get_host_compiler)" + CUDAHOSTLD="$(tc-getCXX)" + + mycmakeargs+=( + -DOSL_USE_OPTIX="yes" + -DOptiX_FIND_QUIETLY="no" + -DCUDA_FIND_QUIETLY="no" + + -DOPTIXHOME="${OPTIX_PATH:-${ESYSROOT}/opt/optix}" + -DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:-${ESYSROOT}/opt/cuda}" + + -DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}" + -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}" + -DCUDA_VERBOSE_BUILD="yes" + ) fi # Environment OPENIMAGEIO_CUDA=0 trumps everything else, turns off @@ -378,11 +376,9 @@ src_test() { "^render-veachmis.opt$" # optix - "^render-mx-generalized-schlick.optix$" - "^render-mx-generalized-schlick.optix.opt$" - "^render-mx-generalized-schlick.optix.fused$" "^render-microfacet.optix.opt$" "^render-microfacet.optix.fused$" + "^render-mx-burley-diffuse.opt$" ) local myctestargs=( diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index 26e37e4b01ad..3038b38d882e 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -7,7 +7,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) # Check this on updates -LLVM_COMPAT=( {18..19} ) +LLVM_COMPAT=( {18..20} ) inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 @@ -45,7 +45,7 @@ IUSE="+clang-cuda debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*] RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( optix? ( clang-cuda ) ) + optix? ( clang-cuda ) " RDEPEND=" @@ -277,7 +277,7 @@ src_configure() { mycmakeargs+=( -DUSE_LLVM_BITCODE="$(usex clang-cuda)" -DCUDA_OPT_FLAG_NVCC="$(get-flag O)" - -DCUDA_OPT_FLAG_NVCC="$(get-flag O)" + -DCUDA_OPT_FLAG_CLANG="$(get-flag O)" ) fi @@ -296,25 +296,23 @@ src_configure() { ) fi - if use test; then - if use optix; then - local -x CUDAHOSTCXX CUDAHOSTLD - CUDAHOSTCXX="$(cuda_get_host_compiler)" - CUDAHOSTLD="$(tc-getCXX)" - - mycmakeargs+=( - -DOSL_USE_OPTIX="yes" - -DOptiX_FIND_QUIETLY="no" - -DCUDA_FIND_QUIETLY="no" - - -DOPTIXHOME="${OPTIX_PATH:=${ESYSROOT}/opt/optix}" - -DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:=${ESYSROOT}/opt/cuda}" - - -DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}" - -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}" - -DCUDA_VERBOSE_BUILD="yes" - ) - fi + if use optix; then + local -x CUDAHOSTCXX CUDAHOSTLD + CUDAHOSTCXX="$(cuda_get_host_compiler)" + CUDAHOSTLD="$(tc-getCXX)" + + mycmakeargs+=( + -DOSL_USE_OPTIX="yes" + -DOptiX_FIND_QUIETLY="no" + -DCUDA_FIND_QUIETLY="no" + + -DOPTIXHOME="${OPTIX_PATH:-${ESYSROOT}/opt/optix}" + -DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:-${ESYSROOT}/opt/cuda}" + + -DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}" + -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}" + -DCUDA_VERBOSE_BUILD="yes" + ) fi # Environment OPENIMAGEIO_CUDA=0 trumps everything else, turns off @@ -378,11 +376,9 @@ src_test() { "^render-veachmis.opt$" # optix - "^render-mx-generalized-schlick.optix$" - "^render-mx-generalized-schlick.optix.opt$" - "^render-mx-generalized-schlick.optix.fused$" "^render-microfacet.optix.opt$" "^render-microfacet.optix.fused$" + "^render-mx-burley-diffuse.opt$" ) local myctestargs=(
