diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-30 08:00:51 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-30 08:00:51 +0100 |
commit | d5ee59790ee8298b8599b0aa0fa21a98b972a44d (patch) | |
tree | 2cc4393cdcfae28879cee110e5975f6e6b798f91 /media-libs/osl | |
parent | d855918b46ba8714cf1320fe63b55fd0ed1748a6 (diff) |
gentoo auto-resync : 30:06:2024 - 08:00:50
Diffstat (limited to 'media-libs/osl')
-rw-r--r-- | media-libs/osl/Manifest | 16 | ||||
-rw-r--r-- | media-libs/osl/osl-1.12.11.0.ebuild | 106 | ||||
-rw-r--r-- | media-libs/osl/osl-1.12.13.0.ebuild | 110 | ||||
-rw-r--r-- | media-libs/osl/osl-1.12.14.0-r1.ebuild | 17 | ||||
-rw-r--r-- | media-libs/osl/osl-1.12.14.0.ebuild | 9 | ||||
-rw-r--r-- | media-libs/osl/osl-1.12.7.0.ebuild | 109 | ||||
-rw-r--r-- | media-libs/osl/osl-1.13.10.0.ebuild | 337 | ||||
-rw-r--r-- | media-libs/osl/osl-1.13.7.0.ebuild | 9 | ||||
-rw-r--r-- | media-libs/osl/osl-9999.ebuild | 228 |
9 files changed, 430 insertions, 511 deletions
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index eb1238c3b83d..096bc8e98c67 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,13 +1,9 @@ -DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e -DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5 -DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f +DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d DIST osl-1.13.7.0.tar.gz 21774349 BLAKE2B 1fd731f14b8dce948d7995efadb63eec8ce028ed6b095db391d2dfedcbbd62ca3aad9cd5d7d40f94c9e358f952d841899103467a2f81b12a605ae8c8436a16ff SHA512 15ffc6a5eed44141672af3d7ddab5d97abacad2062cddb35ef2a8484538a9a9a86cbd7e7170deafcefd3b69df764bfd207685603ca17a2fbff4299ccd1afe569 -EBUILD osl-1.12.11.0.ebuild 2654 BLAKE2B 03dbc702cf4ee912aaa9c8e6fc367c1d329e4197c921b83530ef067655bc5d9707709ff1faabccec73afc5cdca1c35e13b332f27c1753e995d15e175be27faa2 SHA512 eb64532b37668c315ece45468dff7de849a80cd4a4d977e9ec3fe248d844deb431eeefeb54e6cfdc886cdae8db25573cd6345e7df0ab09c8dd8a0844f5bc17bc -EBUILD osl-1.12.13.0.ebuild 2937 BLAKE2B d0cc000f15b02c06109d3bfeec16423da744b8b3aa4eae200cc2e34edc92d5aa9dc63652e6291e4deb37e96dc0c2815a936e920cbb560c72936543e63b977876 SHA512 d0293f173cbaff89eef8c7d00bf4a1c23b10af4cfe4091d9cf0dbda9a4321ebc8f8954e1fca40c59ca2f539583dfced2ac61f634a9d3a5579fdffde97a3defc9 -EBUILD osl-1.12.14.0-r1.ebuild 9769 BLAKE2B d1f775a39538c35f1c71f48cf3632829909267aea2c4fa4ffc3f08b64fe75c90d8c71e44f00271c295e1918b2028c90523c599e74ddae22de576034e5268ad35 SHA512 bfc4af1faec258234b46f914941b068731fadfea032d3dba81e942471d020742612e1e8a892d31f840bab586723c47e75c480559e2dcda455cf92ab0ab5e88c5 -EBUILD osl-1.12.14.0.ebuild 3851 BLAKE2B 18ce77a6deb606691bd3d6f6ba1b5cd58601adfb113f5acc8e62a53f718b19cb9765092f1039ce81ac5f85a90d453e5b4412e304c69700a47dc18a21bfef4259 SHA512 efae1c24a25cf8b67df5ac3281103b37b6ec9694d6bb33aab78a44382f4e51079debfd16e6677091b2dfdb768937ad17be8948aaa2e1d0d7299e37adcad28924 -EBUILD osl-1.12.7.0.ebuild 2761 BLAKE2B b70f2c5c5d7a8cd3d5031f35562e3266d21e5212a53ca5ea2ea4c8d2476651095e6140c6490648ab0fcc2c629e81d4ec628155bbea8d78899446e906596d065d SHA512 daede9ce4d5d366bcba462adfad893fe19d9d41b05adc807632b9d67422b452170a2cb453fefba826877f4bbafc4639311aab457f16ffc324b66f8688c0e517c -EBUILD osl-1.13.7.0.ebuild 11688 BLAKE2B 3b01aebbe3554756e20a42e1c2bc077ca143450b5f4465007451b48a7d075319a4e033bc6b6ce3ea2622d96d82af8098ba59b15a87327b2bd5a2c286cc034c39 SHA512 0e6a1f57c24176f62b5e37940641a0df55ad5cf316beacd0399d25bf1377039ae1bf1f773e7a8d0341e390ee29876de3352c14fe007ef0c649cf990cb73ff4f3 -EBUILD osl-9999.ebuild 11412 BLAKE2B 8eba646ab0607806e4ddd027d42474c100f7236dde0e80835cffdbd9f7f195880e07d0da5ea29c81e8f4045dbe5210b9bb166c02f52f9ac5f6746c9e99b39a06 SHA512 8439688fab91350530eae23181cf148289681258cf9383abd9c0203ba0d89179c33947c389ffed71c3a9a5a2c4ccc75fb39f6967962a807e6b99d2efcc67ca2c +EBUILD osl-1.12.14.0-r1.ebuild 9915 BLAKE2B 1066b5f8de5e64142f545025ee50eb7cfbc9bcb97ba3148363cf17c7962c997205df7341fb250b8b3acfcb10c19fe3259404aaa049e638fe8a12cd243b5a6049 SHA512 f56d81c78fb40713cbf5e1635275975d5801b6abbb876a2c67709a3c22ed5cbe521c153e8aa3865fc943675f5d15935244b18f99fed14d552db878877c620bde +EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 99da9664c5a9ea78af28d4ce67cc44ba9b446bcf46efc7ce2f5f57fafe6e3a51ed89f16681b8cd2be5afaf3d1b0cee9e5f2a8156547fca4945d0d2432ecb9b92 SHA512 db06490cc6dea73fa9e4c0dec4a4f0c605689ad8ec10710a44a0da718b9aada9524ba40cad6d6df75049ac50abbae0ad0fca595b7dd69429a45f49943d0f9cb5 +EBUILD osl-1.13.10.0.ebuild 7682 BLAKE2B 2088ec50cc26da7374f29f5da59f302f04c626010f687d9365dac517894ef101d7e15730d96efe109deb5adf0a44e34f3d32748258f5525589c19ca71c9f9e39 SHA512 5f1a8c990888f4af09b2676fe131dacaf13855a0ac49fc1c614b1e849c1b1afbbc4029b6c7258e1530190edf4db02374fff1b2db74a61434dc2658e0b0ef229c +EBUILD osl-1.13.7.0.ebuild 11741 BLAKE2B 98ae068b097406fcbfeed428c051e3049a2a7b0feda20f4744664072d5be18ac2d6b5eeaf6e96d8573997ff0ba6da3240afb307f6a84f178d4915daa4ff6617a SHA512 74254e8793acc25a7429fb4915912f7f2f14cf810e83b0ad922be4ec6853f5cd8e12992bb7532d891b66bbf2078f89c46bd416b61e21c88487d4008ed48590ce +EBUILD osl-9999.ebuild 7682 BLAKE2B 2088ec50cc26da7374f29f5da59f302f04c626010f687d9365dac517894ef101d7e15730d96efe109deb5adf0a44e34f3d32748258f5525589c19ca71c9f9e39 SHA512 5f1a8c990888f4af09b2676fe131dacaf13855a0ac49fc1c614b1e849c1b1afbbc4029b6c7258e1530190edf4db02374fff1b2db74a61434dc2658e0b0ef229c MISC metadata.xml 1162 BLAKE2B 56fc654915ef7d354844d8b9d99cbe1e2fa8ece1bf3ee2028847d8add16c663cab3110598ae78b7da05c6f3b06bc0926ff1797827c5b2750c03ec02d4c5effe2 SHA512 6e391782385aca530fb9526dd4675845aefd42d760555a7633b0daec2d2890e5d2ce93f39b4c297c1f1056e2c4607c228baba4a1875f05c47362abeb50455dba diff --git a/media-libs/osl/osl-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild deleted file mode 100644 index 677938550873..000000000000 --- a/media-libs/osl/osl-1.12.11.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -# Check this on updates -LLVM_MAX_SLOT=15 - -inherit cmake llvm toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" -# If a development release, please don't keyword! -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - sys-libs/zlib:= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_configure() { - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local gcc="$(tc-getCC)" - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DUSE_CCACHE=OFF - -DLLVM_STATIC=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_PYTHON=$(usex python) - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)" - ) - - cmake_src_test -} diff --git a/media-libs/osl/osl-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild deleted file mode 100644 index e3c4c2e1a16a..000000000000 --- a/media-libs/osl/osl-1.12.13.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -# Check this on updates -LLVM_MAX_SLOT=15 - -inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" -# If a development release, please don't keyword! -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - sys-libs/zlib:= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_configure() { - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local gcc="$(tc-getCC)" - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DUSE_CCACHE=OFF - -DLLVM_STATIC=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_PYTHON=$(usex python) - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)" - ) - - cmake_src_test -} diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild index 50363e61e508..e450385f5016 100644 --- a/media-libs/osl/osl-1.12.14.0-r1.ebuild +++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild @@ -32,7 +32,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python" +IUSE="debug doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -173,16 +173,20 @@ src_configure() { -DSTOP_ON_WARNING="no" -DUSE_PARTIO="$(usex partio)" -DUSE_PYTHON="$(usex python)" - -DPYTHON_VERSION="${EPYTHON/python}" -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DUSE_OPTIX="no" - -DVEC_REPORT="yes" -DOpenImageIO_ROOT="${EPREFIX}/usr" ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT="yes" ) if ! use qt6; then @@ -198,6 +202,13 @@ src_configure() { ) fi + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + cmake_src_configure } diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild index 5af6590d6486..459fa3084277 100644 --- a/media-libs/osl/osl-1.12.14.0.ebuild +++ b/media-libs/osl/osl-1.12.14.0.ebuild @@ -26,7 +26,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) -IUSE="doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python" +IUSE="debug doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -124,9 +124,14 @@ src_configure() { -DPYTHON_VERSION="${EPYTHON/python}" -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" - -DVEC_REPORT=yes ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT=yes ) if ! use qt6; then diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild deleted file mode 100644 index d778aa560c98..000000000000 --- a/media-libs/osl/osl-1.12.7.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -# Check this on updates -LLVM_MAX_SLOT=15 - -inherit cmake llvm toolchain-funcs python-single-r1 - -DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" -# If a development release, please don't keyword! -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml - >=media-libs/openexr-3:0= - >=media-libs/openimageio-2.3.12.0:= - <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= - sys-libs/zlib:= - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - partio? ( media-libs/partio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig -" - -llvm_check_deps() { - has_version -r "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - llvm_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_configure() { - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd} ]] && mysimd=("0") - - local gcc="$(tc-getCC)" - local mycmakeargs=( - # Still needed? - # See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454 - #-DCMAKE_CXX_STANDARD=14 - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DUSE_CCACHE=OFF - -DLLVM_STATIC=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_PYTHON=$(usex python) - -DPYTHON_VERSION="${EPYTHON/python}" - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|color|color.opt|example-deformer)" - ) - - cmake_src_test -} diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild new file mode 100644 index 000000000000..3df3ad89ba3b --- /dev/null +++ b/media-libs/osl/osl-1.13.10.0.ebuild @@ -0,0 +1,337 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# Check this on updates +LLVM_COMPAT=( {15..18} ) + +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 + inherit git-r3 + EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git" +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}" +fi + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" # based on SONAME + +X86_CPU_FEATURES=( + sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) + +IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# TODO optix +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + >=media-libs/openexr-3:0= + >=media-libs/openimageio-2.4:= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') + sys-libs/zlib:= + optix? ( dev-libs/optix[-headers-only] ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}] + ') + ) + partio? ( media-libs/partio ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,opengl] + ) + ) +" + +DEPEND="${RDEPEND} + dev-util/patchelf + test? ( + media-fonts/droid + ) +" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +pkg_setup() { + llvm-r1_pkg_setup + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use optix; then + cuda_src_prepare + cuda_add_sandbox -w + fi + + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/875836 + # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810 + filter-lto + + # pick the highest we support + local mysimd=() + if use cpu_flags_x86_avx512f; then + mysimd+=( avx512f ) + elif use cpu_flags_x86_avx2 ; then + mysimd+=( avx2 ) + if use cpu_flags_x86_f16c ; then + mysimd+=( f16c ) + fi + elif use cpu_flags_x86_avx ; then + mysimd+=( avx ) + elif use cpu_flags_x86_sse4_2 ; then + mysimd+=( sse4.2 ) + elif use cpu_flags_x86_sse4_1 ; then + mysimd+=( sse4.1 ) + elif use cpu_flags_x86_ssse3 ; then + mysimd+=( ssse3 ) + elif use cpu_flags_x86_sse3 ; then + mysimd+=( sse3 ) + elif use cpu_flags_x86_sse2 ; then + mysimd+=( sse2 ) + fi + + local mybatched=() + if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then + if use cpu_flags_x86_avx512f ; then + if use nofma; then + mybatched+=( + "b8_AVX512_noFMA" + "b16_AVX512_noFMA" + ) + fi + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) + fi + if use cpu_flags_x86_avx2 ; then + if use nofma; then + mybatched+=( + "b8_AVX2_noFMA" + ) + fi + mybatched+=( + "b8_AVX2" + ) + fi + fi + if use cpu_flags_x86_avx ; then + mybatched+=( + "b8_AVX" + ) + fi + + # If no CPU SIMDs were used, completely disable them + [[ -z "${mysimd[*]}" ]] && mysimd=("0") + [[ -z "${mybatched[*]}" ]] && mybatched=("0") + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. + use arm64 && append-flags -flax-vector-conversions + + local gcc + gcc="$(tc-getCC)" + + local mycmakeargs=( + -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA + + # std::tuple_size_v is c++17 + -DCMAKE_CXX_STANDARD="17" + + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS="$(usex doc)" + -DUSE_CCACHE="no" + -DLLVM_STATIC="no" + -DOSL_BUILD_TESTS="$(usex test)" + -DSTOP_ON_WARNING="no" + -DUSE_PARTIO="$(usex partio)" + -DUSE_PYTHON="$(usex python)" + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" + -DUSE_LIBCPLUSPLUS="$(usex libcxx)" + -DOSL_USE_OPTIX="$(usex optix)" + + -DOpenImageIO_ROOT="${EPREFIX}/usr" + ) + + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + + if use gui; then + mycmakeargs+=( -DUSE_QT="yes" ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) + fi + else + mycmakeargs+=( -DUSE_QT="no" ) + fi + + if use optix; then + mycmakeargs+=( + -DOptiX_FIND_QUIETLY="no" + -DCUDA_FIND_QUIETLY="no" + + -DOPTIXHOME="${EPREFIX}/opt/optix" + -DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda" + + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" + -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)" + -DCUDA_VERBOSE_BUILD="yes" + ) + fi + + if use partio; then + mycmakeargs+=( + -Dpartio_DIR="${EPREFIX}/usr" + ) + fi + + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + + cmake_src_configure +} + +src_test() { + # A bunch of tests only work when installed. + # So install them into the temp directory now. + DESTDIR="${T}" cmake_build install + + ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die + + if use optix; then + cp \ + "${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \ + "${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \ + "${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \ + "${BUILD_DIR}/bin/" || die + + # NOTE this should go to cuda eclass + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + addwrite /dev/nvidia-caps + addwrite "/dev/char/" + fi + + CMAKE_SKIP_TESTS=( + "-broken$" + "^render" + + # broken with in-tree <=dev-libs/optix-7.5.0 and out of date + "^example-cuda$" + + # outright fail + "^testoptix.optix.opt$" + "^testoptix-noise.optix.opt$" + "^testoptix-reparam.optix.opt$" + "^transform-reg.regress.batched.opt$" + "^spline-reg.regress.batched.opt$" + + # doesn't handle parameters + "^osl-imageio$" + "^osl-imageio.opt$" + "^osl-imageio.opt.rs_bitcode$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + ) + + local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH + DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues + CXXFLAGS="-I${T}/usr/include" + LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" + OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" + OSL_SOURCE_DIR="${S}" + + if use python; then + PYTHONPATH="${BUILD_DIR}/lib/python/site-packages" + fi + + cmake_src_test + + einfo "" + einfo "testing render tests in isolation" + einfo "" + + CMAKE_SKIP_TESTS=( + "^render-background$" + "^render-mx-furnace-sheen$" + "^render-mx-burley-diffuse$" + "^render-mx-conductor$" + "^render-microfacet$" + "^render-veachmis$" + "^render-ward$" + "^render-raytypes.opt$" + "^render-raytypes.opt.rs_bitcode$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + --repeat until-pass:10 + -R "^render" + ) + + cmake_src_test +} + +src_install() { + cmake_src_install + + if [[ -d "${ED}/usr/build-scripts" ]]; then + rm -rf "${ED}/usr/build-scripts" || die + fi + + for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done +} diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild index 404090f7e9f3..a8e64ed97c5f 100644 --- a/media-libs/osl/osl-1.13.7.0.ebuild +++ b/media-libs/osl/osl-1.13.7.0.ebuild @@ -32,7 +32,7 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" +IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -185,11 +185,16 @@ src_configure() { -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DOSL_USE_OPTIX="$(usex optix)" - -DVEC_REPORT="yes" -DOpenImageIO_ROOT="${EPREFIX}/usr" ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT="yes" ) if ! use qt6; then diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index 68654d760dc8..3df3ad89ba3b 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) # Check this on updates -LLVM_COMPAT=( {15..17} ) +LLVM_COMPAT=( {15..18} ) inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 @@ -24,7 +24,7 @@ else fi LICENSE="BSD" -SLOT="0/$(ver_cut 1-3)" +SLOT="0/$(ver_cut 1-2)" # based on SONAME X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 @@ -32,8 +32,10 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) -IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" +IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" + RESTRICT="!test? ( test )" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" # TODO optix @@ -69,7 +71,12 @@ RDEPEND=" ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/patchelf + test? ( + media-fonts/droid + ) +" BDEPEND=" sys-devel/bison sys-devel/flex @@ -130,25 +137,24 @@ src_configure() { "b8_AVX512_noFMA" "b16_AVX512_noFMA" ) - else - mybatched+=( - "b8_AVX512" - "b16_AVX512" - ) fi + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) fi if use cpu_flags_x86_avx2 ; then if use nofma; then mybatched+=( "b8_AVX2_noFMA" ) - else - mybatched+=( - "b8_AVX2" - ) fi + mybatched+=( + "b8_AVX2" + ) fi - elif use cpu_flags_x86_avx ; then + fi + if use cpu_flags_x86_avx ; then mybatched+=( "b8_AVX" ) @@ -167,7 +173,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA - -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp # std::tuple_size_v is c++17 -DCMAKE_CXX_STANDARD="17" @@ -180,16 +185,20 @@ src_configure() { -DSTOP_ON_WARNING="no" -DUSE_PARTIO="$(usex partio)" -DUSE_PYTHON="$(usex python)" - -DPYTHON_VERSION="${EPYTHON/python}" -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" -DUSE_LIBCPLUSPLUS="$(usex libcxx)" -DOSL_USE_OPTIX="$(usex optix)" - -DVEC_REPORT="yes" -DOpenImageIO_ROOT="${EPREFIX}/usr" ) + if use debug; then + mycmakeargs+=( + -DVEC_REPORT="yes" + ) + fi + if use gui; then mycmakeargs+=( -DUSE_QT="yes" ) if ! use qt6; then @@ -219,6 +228,13 @@ src_configure() { ) fi + if use python; then + mycmakeargs+=( + "-DPYTHON_VERSION=${EPYTHON#python}" + "-DPYTHON_SITE_DIR=$(python_get_sitedir)" + ) + fi + cmake_src_configure } @@ -245,166 +261,24 @@ src_test() { fi CMAKE_SKIP_TESTS=( - "broken" + "-broken$" "^render" # broken with in-tree <=dev-libs/optix-7.5.0 and out of date "^example-cuda$" # outright fail + "^testoptix.optix.opt$" + "^testoptix-noise.optix.opt$" + "^testoptix-reparam.optix.opt$" "^transform-reg.regress.batched.opt$" - - # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 - "^derivs.opt.rs_bitcode$" - "^geomath.batched$" - "^matrix.batched$" - "^matrix.batched.opt$" "^spline-reg.regress.batched.opt$" - "^transformc.batched$" - ) - # These only fail inside sandbox - if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then - CMAKE_SKIP_TESTS+=( - # TODO: investigate failures - # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 - "^andor-reg.regress.batched.opt$" - "^arithmetic-reg.regress.batched.opt$" - "^array-assign-reg.regress.batched.opt$" - "^array-copy-reg.regress.batched.opt$" - "^array-length-reg.regress.batched$" - "^closure-parameters.batched$" - "^closure-parameters.batched.opt$" - "^closure.batched$" - "^closure.batched.opt$" - "^debug-uninit$" - "^debug-uninit.batched$" - "^debug-uninit.batched.opt$" - "^debug-uninit.opt$" - "^debug-uninit.opt.rs_bitcode$" - "^derivs$" - "^derivs.batched$" - "^derivs.batched.opt$" - "^derivs.opt$" - "^exponential$" - "^exponential.opt$" - "^exponential.opt.rs_bitcode$" - "^filterwidth-reg.regress.batched.opt$" - "^geomath$" - "^geomath.batched.opt$" - "^geomath.opt$" - "^geomath.opt.rs_bitcode$" - "^getattribute-camera.batched$" - "^getattribute-camera.batched.opt$" - "^getattribute-shader.batched.opt$" - "^gettextureinfo-reg.regress.batched.opt$" - "^gettextureinfo-udim-reg.regress.batched.opt$" - "^gettextureinfo.batched$" - "^hyperb.batched.opt$" - "^hyperb.opt$" - "^hyperb.opt.rs_bitcode$" - "^initlist.batched$" - "^initlist.batched.opt$" - "^linearstep.batched$" - "^linearstep.batched.opt$" - "^loop.batched$" - "^loop.batched.opt$" - "^matrix$" - "^matrix-compref-reg.regress.batched.opt$" - "^matrix-reg.regress.rsbitcode.opt$" - "^matrix.opt$" - "^matrix.opt.rs_bitcode$" - "^matrix.rsbitcode.opt$" - "^message-no-closure.batched$" - "^message-no-closure.batched.opt$" - "^message-reg.regress.batched.opt$" - "^miscmath$" - "^miscmath.batched$" - "^miscmath.batched.opt$" - "^miscmath.opt$" - "^miscmath.opt.rs_bitcode$" - "^noise-cell.batched$" - "^noise-gabor-reg.regress.batched.opt$" - "^noise-gabor.batched$" - "^noise-gabor.batched.opt$" - "^noise-generic.batched$" - "^noise-generic.batched.opt$" - "^noise-perlin.batched$" - "^noise-perlin.batched.opt$" - "^noise-reg.regress.batched.opt$" - "^noise-simplex.batched$" - "^noise-simplex.batched.opt$" - "^noise.batched$" - "^opt-warnings.batched$" - "^opt-warnings.batched.opt$" - "^pnoise-cell.batched$" - "^pnoise-gabor.batched$" - "^pnoise-gabor.batched.opt$" - "^pnoise-generic.batched$" - "^pnoise-generic.batched.opt$" - "^pnoise-perlin.batched$" - "^pnoise-perlin.batched.opt$" - "^pnoise-reg.regress.batched.opt$" - "^pnoise.batched$" - "^pointcloud.batched$" - "^pointcloud.batched.opt$" - "^regex-reg.regress.batched.opt$" - "^select.batched$" - "^select.batched.opt$" - "^shaderglobals.batched$" - "^shaderglobals.batched.opt$" - "^smoothstep-reg.regress.batched.opt$" - "^spline-derivbug.batched$" - "^spline-derivbug.batched.opt$" - "^spline.batched$" - "^spline.batched.opt$" - "^splineinverse-ident.batched$" - "^splineinverse-ident.batched.opt$" - "^split-reg.regress.batched.opt$" - "^string$" - "^string-reg.regress.batched.opt$" - "^string.batched$" - "^string.batched.opt$" - "^string.opt$" - "^string.opt.rs_bitcode$" - "^struct-array-mixture.batched$" - "^struct-array-mixture.batched.opt$" - "^struct.batched$" - "^test-fmt-matrixcolor.opt.rs_bitcode$" - "^testoptix-noise.optix.opt$" - "^testoptix-reparam.optix.opt$" - "^texture-environment-opts-reg.regress.batched.opt$" - "^texture-opts-reg.regress.batched.opt$" - "^texture-wrap.batched$" - "^texture-wrap.batched.opt$" - "^transcendental-reg.regress.batched.opt$" - "^transform$" - "^transform.batched$" - "^transform.batched.opt$" - "^transform.opt$" - "^transform.opt.rs_bitcode$" - "^transformc$" - "^transformc.batched.opt$" - "^transformc.opt$" - "^transformc.opt.rs_bitcode$" - "^transformc.rsbitcode.opt$" - "^trig$" - "^trig-reg.regress.batched.opt$" - "^trig.batched$" - "^trig.batched.opt$" - "^trig.opt$" - "^trig.opt.rs_bitcode$" - "^vecctr.batched$" - "^vecctr.batched.opt$" - "^vector$" - "^vector-reg.regress.batched.opt$" - "^vector.opt$" - "^vector.opt.rs_bitcode$" - "^xml-reg.regress.batched.opt$" - # diff - "^testoptix.optix.opt$" - ) - fi + # doesn't handle parameters + "^osl-imageio$" + "^osl-imageio.opt$" + "^osl-imageio.opt.rs_bitcode$" + ) myctestargs=( # src/build-scripts/ci-test.bash @@ -412,7 +286,7 @@ src_test() { ) local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH - DEBUG=1 # doubles the floating point tolerance + DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues CXXFLAGS="-I${T}/usr/include" LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" @@ -424,6 +298,10 @@ src_test() { cmake_src_test + einfo "" + einfo "testing render tests in isolation" + einfo "" + CMAKE_SKIP_TESTS=( "^render-background$" "^render-mx-furnace-sheen$" @@ -445,3 +323,15 @@ src_test() { cmake_src_test } + +src_install() { + cmake_src_install + + if [[ -d "${ED}/usr/build-scripts" ]]; then + rm -rf "${ED}/usr/build-scripts" || die + fi + + for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done +} |