commit: 28500f368e7bbe10ae9e998faaf3b79091cdcacc Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu Nov 20 16:17:39 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 28 02:53:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28500f36
media-libs/osl: add 1.14.7.0 1.14.9999 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44694 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/osl/Manifest | 1 + .../osl/{osl-9999.ebuild => osl-1.14.7.0.ebuild} | 45 +++++++++------ .../osl/{osl-9999.ebuild => osl-1.14.9999.ebuild} | 66 +++++++++++++++++----- media-libs/osl/osl-9999.ebuild | 2 +- 4 files changed, 83 insertions(+), 31 deletions(-) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index f121be2086a8..4cf63b266050 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,3 +1,4 @@ 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 +DIST osl-1.14.7.0.tar.gz 43342823 BLAKE2B 7c6780bdee6c2a832f62135fae7e66eeac9333f8c5848a2edd7c49535afa2fcb292393ab166473b3e64b8708cf2bfe0e70ea11ab8a68860fa84d879a773b7211 SHA512 b92b64d2120980a330ba19d957e2d1b400684f7779ee60ca80241ab3c3f3df46e07fa1fbbfd7810b6f8f3e2e8775cd105137b7e8c4a28efde39656363b977521 diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-1.14.7.0.ebuild similarity index 94% copy from media-libs/osl/osl-9999.ebuild copy to media-libs/osl/osl-1.14.7.0.ebuild index b155b927c9a7..d9116d470a47 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-1.14.7.0.ebuild @@ -364,41 +364,54 @@ src_test() { # batchregression "^spline-reg.regress.batched.opt$" "^transform-reg.regress.batched.opt$" - "^texture3d-opts-reg.regress.batched.opt$" +# "^texture3d-opts-reg.regress.batched.opt$" # doesn't handle parameters "^osl-imageio" - # render - "^render-bunny.opt$" - "^render-displacement.opt$" - "^render-microfacet.opt$" - "^render-veachmis.opt$" - - # optix - "^render-microfacet.optix.opt$" - "^render-microfacet.optix.fused$" - "^render-mx-burley-diffuse.opt$" + # TODO Unknown exception: Unable to convert function return value to a Python type! + # The signature was (self: oslquery.Parameter) -> OpenImageIO_v3_0::TypeDesc + "^python-oslquery" ) local myctestargs=( - -LE 'render' + -LE '(render|optix)' # src/build-scripts/ci-test.bash - # '--force-new-ctest-process' + # --repeat until-pass:10 + '--force-new-ctest-process' ) - OPENIMAGEIO_CUDA=0 \ - cmake_src_test +# OPENIMAGEIO_CUDA=0 \ +# cmake_src_test + + # NOTE this should go to cuda eclass + cuda_add_sandbox -w + addwrite "/proc/self/task/" + addpredict "/dev/char/" einfo "" einfo "testing render tests in isolation" einfo "" + CMAKE_SKIP_TESTS=( + # optix + "^render-microfacet.optix.opt$" + "^render-microfacet.optix.fused$" + + # render + "^render-bunny.opt$" + "^render-displacement.opt$" + "^render-microfacet.opt$" + "^render-mx-burley-diffuse.opt$" + "^render-veachmis.opt$" + ) + myctestargs=( - -L "render" + -L "(render|optix)" # src/build-scripts/ci-test.bash '--force-new-ctest-process' --repeat until-pass:10 + --output-on-failure ) cmake_src_test diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-1.14.9999.ebuild similarity index 89% copy from media-libs/osl/osl-9999.ebuild copy to media-libs/osl/osl-1.14.9999.ebuild index b155b927c9a7..e93ea3a6d905 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-1.14.9999.ebuild @@ -14,9 +14,12 @@ inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 DESCRIPTION="Advanced shading language for production GI renderers" HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"; -if [[ ${PV} = *9999* ]] ; then +if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"; + if [[ ${PV} != 9999* ]] ; then + EGIT_BRANCH="dev-$(ver_cut 1-2)" + fi else # If a development release, please don't keyword! SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -41,6 +44,7 @@ X86_CPU_FEATURES=( CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) IUSE="+clang-cuda debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python" +# IUSE+=" clang" RESTRICT="!test? ( test )" @@ -170,6 +174,23 @@ pkg_setup() { } src_prepare() { + # we can use clang as default + if use clang && ! tc-is-clang ; then + export CC="${CHOST}-clang" + export CXX="${CHOST}-clang++" + else + tc-export CXX CC + fi + # clang-cuda needs to filter mfpmath + if use clang-cuda ; then + filter-mfpmath sse + filter-mfpmath i386 + fi + + if use test && use optix; then + cuda_src_prepare + fi + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die sed -e "/install_targets ( libtestshade )/d" -i src/testshade/CMakeLists.txt || die @@ -260,6 +281,7 @@ src_configure() { -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DUSE_QT="$(usex gui)" +# -DUSE_FAST_MATH="no" ) if use debug; then @@ -317,7 +339,7 @@ src_configure() { # Environment OPENIMAGEIO_CUDA=0 trumps everything else, turns off # Cuda functionality. We don't even initialize in this case. - export OPENIMAGEIO_CUDA=0 +# export OPENIMAGEIO_CUDA=0 cmake_src_configure } @@ -364,36 +386,52 @@ src_test() { # batchregression "^spline-reg.regress.batched.opt$" "^transform-reg.regress.batched.opt$" - "^texture3d-opts-reg.regress.batched.opt$" +# "^texture3d-opts-reg.regress.batched.opt$" # doesn't handle parameters "^osl-imageio" - # render - "^render-bunny.opt$" - "^render-displacement.opt$" - "^render-microfacet.opt$" - "^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$" + + # TODO Unknown exception: Unable to convert function return value to a Python type! + # The signature was (self: oslquery.Parameter) -> OpenImageIO_v3_0::TypeDesc + "^python-oslquery" ) local myctestargs=( -LE 'render' # src/build-scripts/ci-test.bash - # '--force-new-ctest-process' + # --repeat until-pass:10 + '--force-new-ctest-process' ) - OPENIMAGEIO_CUDA=0 \ - cmake_src_test +# OPENIMAGEIO_CUDA=0 \ +# cmake_src_test + + # NOTE this should go to cuda eclass + cuda_add_sandbox -w + addwrite "/proc/self/task/" + addpredict "/dev/char/" einfo "" einfo "testing render tests in isolation" einfo "" + CMAKE_SKIP_TESTS=( + # render + "^render-bunny.opt$" + "^render-displacement.opt$" + "^render-microfacet.opt$" + "^render-mx-burley-diffuse.opt$" + "^render-mx-generalized-schlick.opt$" + "^render-veachmis.opt$" + ) + myctestargs=( -L "render" # src/build-scripts/ci-test.bash @@ -401,7 +439,7 @@ src_test() { --repeat until-pass:10 ) - cmake_src_test +# cmake_src_test } src_install() { diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index b155b927c9a7..f17a8530ff74 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -20,8 +20,8 @@ if [[ ${PV} = *9999* ]] ; then else # If a development release, please don't keyword! SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" S="${WORKDIR}/OpenShadingLanguage-${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" fi LICENSE="BSD"
