commit: 1292fc663dc19c86b54e1076eb36a9b5b714c7d6 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Dec 8 14:20:37 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 10 12:41:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1292fc66
media-libs/osl: add 1.12.14.0 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34220 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/osl/Manifest | 1 + media-libs/osl/metadata.xml | 5 +- media-libs/osl/osl-1.12.14.0.ebuild | 144 ++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 2 deletions(-) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index 7bf7586baeaa..878645684cfb 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,3 +1,4 @@ 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 diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml index a300ead37dfa..bd83cdb5a001 100644 --- a/media-libs/osl/metadata.xml +++ b/media-libs/osl/metadata.xml @@ -16,9 +16,10 @@ </longdescription> <use> <flag name="partio">Use <pkg>media-libs/partio</pkg></flag> - <flag name="qt5">Build the osltoy binary</flag> + <flag name="gui">Build the osltoy binary (with Qt5)</flag> + <flag name="qt6">Build the osltoy binary (with Qt6)</flag> </use> <upstream> - <remote-id type="github">imageworks/OpenShadingLanguage</remote-id> + <remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id> </upstream> </pkgmetadata> diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild new file mode 100644 index 000000000000..9cfb9be255ac --- /dev/null +++ b/media-libs/osl/osl-1.12.14.0.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2023 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_MAX_SLOT=15 + +inherit cmake flag-o-matic llvm 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 a development release, please don't keyword! +SRC_URI="https://github.com/AcademySoftwareFoundation/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 gui partio qt6 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 ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + ) + ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + 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 + + local mybatched=() + use cpu_flags_x86_avx && mybatched+=( + "b8_AVX" + ) + use cpu_flags_x86_avx2 && mybatched+=( + "b8_AVX2" + "b8_AVX2_noFMA" + ) + use cpu_flags_x86_avx512f && mybatched+=( + "b8_AVX512" + "b8_AVX512_noFMA" + "b16_AVX512" + "b16_AVX512_noFMA" + ) + + # 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="$(tc-getCC)" + local mycmakeargs=( + # std::tuple_size_v is c++17 + -DCMAKE_CXX_STANDARD=17 + -DDOWNSTREAM_CXX_STANDARD=17 + -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_PYTHON=$(usex python) + -DPYTHON_VERSION="${EPYTHON/python}" + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" + -DVEC_REPORT=yes + ) + + if use gui; then + mycmakeargs+=( -DUSE_QT=yes ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) + fi + else + mycmakeargs+=( -DUSE_QT=no ) + fi + + 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 +}
