commit: a3e65f827aabdfbba225946787f045621fca394b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Nov 8 10:58:28 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Nov 8 11:25:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e65f82
media-libs/osl: Remove versions requiring LLVM 10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-libs/osl/Manifest | 2 - .../osl/files/osl-1.10.5-fix-install-shaders.patch | 35 ------- media-libs/osl/osl-1.10.13.ebuild | 87 ----------------- media-libs/osl/osl-1.11.9.0-r1.ebuild | 106 --------------------- media-libs/osl/osl-1.11.9.0.ebuild | 94 ------------------ 5 files changed, 324 deletions(-) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index 3643c48076f..1c6d13087eb 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,5 +1,3 @@ -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.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b -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.10.5-fix-install-shaders.patch b/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch deleted file mode 100644 index 8e45efd96ab..00000000000 --- a/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 296ee89fcdec8ff6e514a3aebf5cb6c177f7f0c1 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <[email protected]> -Date: Mon, 10 Jun 2019 13:02:14 +0200 -Subject: [PATCH] fix install location of shaders (Gentoo specific) - -Signed-off-by: Bernd Waibel <[email protected]> ---- - src/shaders/CMakeLists.txt | 2 +- - src/shaders/MaterialX/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt -index 9b263ff..5c47918 100644 ---- a/src/shaders/CMakeLists.txt -+++ b/src/shaders/CMakeLists.txt -@@ -63,4 +63,4 @@ add_custom_target (shaders ALL - SOURCES ${shader_source} ${shader_headers}) - - install (FILES ${shader_headers} ${shader_source} ${shader_objs} -- DESTINATION shaders) -+ DESTINATION include/OSL/shaders) -diff --git a/src/shaders/MaterialX/CMakeLists.txt b/src/shaders/MaterialX/CMakeLists.txt -index 88b52f3..f0e0a23 100644 ---- a/src/shaders/MaterialX/CMakeLists.txt -+++ b/src/shaders/MaterialX/CMakeLists.txt -@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL - SOURCES ${shader_source} ${mx_shader_headers}) - - install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls} -- DESTINATION shaders/MaterialX) -+ DESTINATION include/OSL/shaders/MaterialX) - --- -2.21.0 - diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild deleted file mode 100644 index 57d75feb4aa..00000000000 --- a/media-libs/osl/osl-1.10.13.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 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/10" -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}" -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch" -) - -# Restricting tests as Makefile 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) - # 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=OFF - -DOSL_BUILD_TESTS=$(usex test) - -DSTOP_ON_WARNING=OFF - -DUSE_PARTIO=$(usex partio) - -DUSE_QT=$(usex qt5) - -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" - ) - - cmake_src_configure -} diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild deleted file mode 100644 index 2c050efe222..00000000000 --- a/media-libs/osl/osl-1.11.9.0-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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=10 - -CMAKE_REMOVE_MODULES_LIST=() - -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=() - -# Restricting tests as Makefile 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 -} diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild deleted file mode 100644 index 723fee86f66..00000000000 --- a/media-libs/osl/osl-1.11.9.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# check this on updates -LLVM_MAX_SLOT=10 - -CMAKE_REMOVE_MODULES_LIST=() - -inherit cmake llvm toolchain-funcs - -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" - -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=() - -# Restricting tests as Makefile 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 -}
