commit: a4d45643e7cc8d701b4a089a49489da9283a2fa4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 19 05:16:52 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 19 05:20:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d45643
media-libs/osl: add 1.11.15.0 Closes: https://bugs.gentoo.org/778005 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/osl/Manifest | 1 + media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch | 24 +++++ media-libs/osl/osl-1.11.15.0.ebuild | 108 +++++++++++++++++++++ 3 files changed, 133 insertions(+) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index d880f7d1d0f..a23760d3674 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,3 +1,4 @@ DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201 +DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5 DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65 DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010 diff --git a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch new file mode 100644 index 00000000000..020370d54bc --- /dev/null +++ b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch @@ -0,0 +1,24 @@ +https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch + +From: debaetsd <[email protected]> +Date: Tue, 29 Dec 2020 22:01:21 +0100 +Subject: [PATCH] fixed cmake setup when tests are disabled (#1319) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS + FILE ${OSL_TARGETS_EXPORT_NAME} + NAMESPACE ${PROJECT_NAME}::) + +- +- +- +-osl_add_all_tests() +- ++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT) ++ osl_add_all_tests() ++endif () + + if (NOT ${PROJECT_NAME}_IS_SUBPROJECT) + include (packaging) + diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild new file mode 100644 index 00000000000..612465934cb --- /dev/null +++ b/media-libs/osl/osl-1.11.15.0.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +# check this on updates +LLVM_MAX_SLOT=13 + +inherit cmake llvm toolchain-funcs python-single-r1 + +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 ~arm ~arm64 ~x86" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +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" + +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + media-libs/openexr:= + media-libs/openimageio:= + <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= + sys-libs/zlib + partio? ( media-libs/partio ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + ') + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-fix-cmake.patch +) + +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}" +} + +pkg_setup() { + use python && python-single-r1_pkg_setup + llvm_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=( + # LLVM 10+ needs C++14 + -DCMAKE_CXX_STANDARD=14 + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS=$(usex doc) + -DUSE_CCACHE=OFF + -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_PYTHON=$(usex python) + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + ) + + cmake_src_configure +}
