diff options
Diffstat (limited to 'media-libs/osl')
-rw-r--r-- | media-libs/osl/Manifest | 6 | ||||
-rw-r--r-- | media-libs/osl/osl-1.10.13.ebuild (renamed from media-libs/osl/osl-1.10.10.ebuild) | 13 | ||||
-rw-r--r-- | media-libs/osl/osl-1.11.9.0.ebuild | 93 |
3 files changed, 104 insertions, 8 deletions
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index e0b8d68584f9..db4e610a1496 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,4 +1,6 @@ AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4 -DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13 -EBUILD osl-1.10.10.ebuild 1903 BLAKE2B 80e44eeb35021b93feba3c9630e94da9167290691bccac7cef89f4df465cc6dc9e5d8e8a916fdd3fab623d60c5419a953f573458885022ee551019ad006549a3 SHA512 4ae380db765b81451e4f41c70a09aa5cbf9fb1017d98fcdd12010c25e8ef882b57ceda02edf0e4eb2ff8a8b7d1234ea8ca8a8c6dcdfaf4c5909c1a157d2e6fac +DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201 +DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65 +EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd +EBUILD osl-1.11.9.0.ebuild 2132 BLAKE2B a504079bb9e6f9541154a951e102cb4007425b65b54af4e4ac96e098f6f456c8f5a8aa4c26b77d715d90071bb4e12daee7372ed2cda14307217bc60bf6ab923d SHA512 cafdaef138efa8f53ffb84096055b61ab75ddb8c800319c51305cb158afd434cf43f8dbcc71faf3781107dbafe4c833d1ba746cf3140770224c1d7ecb04299ab MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40 diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.13.ebuild index 1b2d7c3168e0..fdab29afa48e 100644 --- a/media-libs/osl/osl-1.10.10.ebuild +++ b/media-libs/osl/osl-1.10.13.ebuild @@ -5,14 +5,14 @@ EAPI=7 inherit cmake llvm toolchain-funcs # check this on updates -LLVM_MAX_SLOT=9 +LLVM_MAX_SLOT=10 DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="http://opensource.imageworks.com/?p=osl" +HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage" SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -SLOT="0" +SLOT="0/10" KEYWORDS="amd64 ~x86" X86_CPU_FEATURES=( @@ -28,8 +28,8 @@ RDEPEND=" dev-libs/pugixml media-libs/openexr:= media-libs/openimageio:= - <sys-devel/clang-10:= - sys-libs/zlib:= + <sys-devel/clang-11:= + sys-libs/zlib partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 @@ -71,10 +71,11 @@ src_configure() { local gcc=$(tc-getCC) # LLVM needs CPP11. Do not disable. local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" -DENABLERTTI=OFF -DINSTALL_DOCS=$(usex doc) - -DLLVM_STATIC=ON + -DLLVM_STATIC=OFF -DOSL_BUILD_TESTS=$(usex test) -DSTOP_ON_WARNING=OFF -DUSE_PARTIO=$(usex partio) diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild new file mode 100644 index 000000000000..9ab4388c8dfd --- /dev/null +++ b/media-libs/osl/osl-1.11.9.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake llvm toolchain-funcs + +# check this on updates +LLVM_MAX_SLOT=10 + +DESCRIPTION="Advanced shading language for production GI renderers" +HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage" +SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/11" +KEYWORDS="~amd64 ~x86" + +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[@]%:*}" + +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + media-libs/openexr:= + media-libs/openimageio:= + <sys-devel/clang-11:= + sys-libs/zlib + partio? ( media-libs/partio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" + +DEPEND=" + ${RDEPEND} + dev-python/pybind11 +" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=() + +CMAKE_REMOVE_MODULES_LIST=() + +# Restricting tests as Make file handles them differently +RESTRICT="test" + +S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" + +llvm_check_deps() { + has_version -r "sys-devel/clang:${LLVM_SLOT}" +} + +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) + # LLVM10+ needs CPP14+ + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS=$(usex doc) + -DLLVM_STATIC=OFF + -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DOSL_BUILD_TESTS=$(usex test) + -DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders" + -DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx" + -DSTOP_ON_WARNING=OFF + -DUSE_PARTIO=$(usex partio) + -DUSE_QT=$(usex qt5) + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + ) + + cmake_src_configure +} |