diff options
Diffstat (limited to 'media-libs/osl')
| -rw-r--r-- | media-libs/osl/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/osl/osl-1.12.6.2.ebuild (renamed from media-libs/osl/osl-1.12.4.1-r2.ebuild) | 37 |
2 files changed, 24 insertions, 17 deletions
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index a81987c5c540..d5375400dc2c 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,7 +1,7 @@ AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953 AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16 DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2 -DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4 +DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828 EBUILD osl-1.11.17.0-r4.ebuild 2916 BLAKE2B aa9d9c6a5990f1b1f98dd3f29c929aa3133298e7ce621eb00742049d5737a1bedf22a83332fddfefcdfa2782c412bcb9b6b4abd375bf3fbbd16fb91aa8238011 SHA512 65e0dd27eff41bf877dd9df9c69b300bbef55abbf1145c5e01a30819bb4ed4af717bb704c13f588773621ae3442d258db45014b2fb0ee4108dd52390af28a9de -EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c +EBUILD osl-1.12.6.2.ebuild 2722 BLAKE2B 0f78dae18a41abd3aaeede3a09c9a8e08d31b5c6fd5027a5f34f8705e5413674a7a5da04980652c8659483f0445e841104bf62e33e507424b47b69086a00cac0 SHA512 8856b1154cc650fc023eb9e14867bdf0b3467531225a22b17fb045eaf0379d9861080213098775dca0f53bd9638aa5e36d9cc1d000c00b3696637706656d8aa9 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce diff --git a/media-libs/osl/osl-1.12.4.1-r2.ebuild b/media-libs/osl/osl-1.12.6.2.ebuild index b04804eadb45..965e1f0404e3 100644 --- a/media-libs/osl/osl-1.12.4.1-r2.ebuild +++ b/media-libs/osl/osl-1.12.6.2.ebuild @@ -1,19 +1,20 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..11} ) # Check this on updates -LLVM_MAX_SLOT=13 +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" -SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}-dev.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenShadingLanguage-${PV}-dev" +# 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" @@ -26,6 +27,7 @@ X86_CPU_FEATURES=( 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=" @@ -56,20 +58,14 @@ BDEPEND=" virtual/pkgconfig " -# Restricting tests as Makefile handles them differently -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.12.4.1-openexr-3-imath.patch -) - llvm_check_deps() { has_version -r "sys-devel/clang:${LLVM_SLOT}" } pkg_setup() { - use python && python-single-r1_pkg_setup llvm_pkg_setup + + use python && python-single-r1_pkg_setup } src_configure() { @@ -83,9 +79,10 @@ src_configure() { [[ -z ${mysimd} ]] && mysimd=("0") local gcc="$(tc-getCC)" - # LLVM needs CPP11. Do not disable. local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 + # 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 @@ -95,8 +92,18 @@ src_configure() { -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)" + ) + + cmake_src_test +} |