commit: efee9ef0573f9b7d668b691f967f56314a1fbe2e
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Apr 21 18:19:50 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 00:37:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efee9ef0
media-libs/osl: drop 1.12.14.0-r3
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.12.14.0-r3.ebuild | 420 ---------------------------------
2 files changed, 421 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 8cdddaf497e7..8f0a6b49b9de 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,2 @@
-DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B
4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e
SHA512
51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B
6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b
SHA512
f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d
DIST osl-1.13.12.0.tar.gz 21824352 BLAKE2B
0d5c1d166afc347a515187c34d60c0a2be99e8a1b7078a388190f2232ee545654e3c1fea829dfabb7b0a105d69d3d98cc5dae4fa8f4db1a2228f9f258b34e76b
SHA512
152a1b085c4ea88c86bc0ccbd694b848b9f50bd91f1a165899c2c3999042e413e54cdfb83dd90ea23daeeb2a3b65f794b8b2c19e9629bbda266971dcd6e3b5e7
diff --git a/media-libs/osl/osl-1.12.14.0-r3.ebuild
b/media-libs/osl/osl-1.12.14.0-r3.ebuild
deleted file mode 100644
index 3e3f67e8c205..000000000000
--- a/media-libs/osl/osl-1.12.14.0-r3.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2025 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_COMPAT=( {15..15} )
-
-inherit cmake flag-o-matic llvm-r1 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 [[ ${PV} = *9999* ]] ; then
- inherit git-r3
-
EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git";
-else
- # If a development release, please don't keyword!
-
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
- S="${WORKDIR}/OpenShadingLanguage-${PV}"
-fi
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)" # based on SONAME
-
-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="debug doc gui libcxx nofma partio test ${CPU_FEATURES[*]%:*} python"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- >=media-libs/openimageio-2.4:=
- $(llvm_gen_dep '
- llvm-core/clang:${LLVM_SLOT}=
- llvm-core/llvm:${LLVM_SLOT}=
- ')
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pybind11[${PYTHON_USEDEP}]
- media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
- ')
- )
- partio? ( media-libs/partio )
- gui? (
- dev-qt/qtbase:6[gui,widgets,opengl]
- )
-"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- >=media-libs/openexr-3
- sys-libs/zlib
- test? (
- media-fonts/droid
- )
-"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-boost-config.patch"
- "${FILESDIR}/${PN}-oslfile.patch"
- "${FILESDIR}/${PN}-include-cstdint.patch"
- "${FILESDIR}/${PN}-1.12.14.0-libfmt11.patch"
- "${FILESDIR}/${PN}-1.12.14.0-m_dz.patch"
-)
-
-pkg_setup() {
- llvm-r1_pkg_setup
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/875836
- #
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
- filter-lto
-
- # pick the highest we support
- local mysimd=()
- if use cpu_flags_x86_avx512f; then
- mysimd+=( avx512f )
- elif use cpu_flags_x86_avx2 ; then
- mysimd+=( avx2 )
- if use cpu_flags_x86_f16c ; then
- mysimd+=( f16c )
- fi
- elif use cpu_flags_x86_avx ; then
- mysimd+=( avx )
- elif use cpu_flags_x86_sse4_2 ; then
- mysimd+=( sse4.2 )
- elif use cpu_flags_x86_sse4_1 ; then
- mysimd+=( sse4.1 )
- elif use cpu_flags_x86_ssse3 ; then
- mysimd+=( ssse3 )
- elif use cpu_flags_x86_sse3 ; then
- mysimd+=( sse3 )
- elif use cpu_flags_x86_sse2 ; then
- mysimd+=( sse2 )
- fi
-
- local mybatched=()
- if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
- if use cpu_flags_x86_avx512f ; then
- if use nofma; then
- mybatched+=(
- "b8_AVX512_noFMA"
- "b16_AVX512_noFMA"
- )
- fi
- mybatched+=(
- "b8_AVX512"
- "b16_AVX512"
- )
- fi
- if use cpu_flags_x86_avx2 ; then
- if use nofma; then
- mybatched+=(
- "b8_AVX2_noFMA"
- )
- fi
- mybatched+=(
- "b8_AVX2"
- )
- fi
- fi
- if use cpu_flags_x86_avx ; then
- mybatched+=(
- "b8_AVX"
- )
- fi
-
- # 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
- gcc="$(tc-getCC)"
-
- local mycmakeargs=(
- -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
- -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp
-
- # std::tuple_size_v is c++17
- -DCMAKE_CXX_STANDARD="17"
-
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS="$(usex doc)"
- -DUSE_CCACHE="no"
- -DLLVM_STATIC="no"
- -DOSL_BUILD_TESTS="$(usex test)"
- -DSTOP_ON_WARNING="no"
- -DUSE_PARTIO="$(usex partio)"
- -DUSE_PYTHON="$(usex python)"
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
- -DUSE_LIBCPLUSPLUS="$(usex libcxx)"
- -DUSE_OPTIX="no"
- -DUSE_QT="$(usex gui)"
-
- -DOpenImageIO_ROOT="${EPREFIX}/usr"
- )
-
- if use debug; then
- mycmakeargs+=(
- -DVEC_REPORT="yes"
- )
- fi
-
- if use partio; then
- mycmakeargs+=(
- -Dpartio_DIR="${EPREFIX}/usr"
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- "-DPYTHON_VERSION=${EPYTHON#python}"
- "-DPYTHON_SITE_DIR=$(python_get_sitedir)"
- )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- # A bunch of tests only work when installed.
- # So install them into the temp directory now.
- DESTDIR="${T}" cmake_build install
-
- ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
-
- CMAKE_SKIP_TESTS=(
- "-broken$"
- "^render"
-
- # outright fail
- "^color$"
- "^color.opt$"
- "^color.batched$"
- "^color.batched.opt$"
- "^matrix.batched.opt$"
- "^osl-imageio"
- "^spline-reg.regress.batched.opt$"
- "^transform-reg.regress.batched.opt$"
- )
-
- # These only fail inside sandbox
- if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then
- CMAKE_SKIP_TESTS+=(
- # TODO: investigate failures
- # SIGABRT similar to
https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363
- "^andor-reg.regress.batched.opt$"
- "^arithmetic-reg.regress.batched.opt$"
- "^array-assign-reg.regress.batched.opt$"
- "^array-length-reg.regress.batched$"
- "^closure.batched$"
- "^closure.batched.opt$"
- "^closure-parameters.batched$"
- "^closure-parameters.batched.opt$"
- "^debug-uninit$"
- "^debug-uninit.opt$"
- "^debug-uninit.batched$"
- "^debug-uninit.batched.opt$"
- "^derivs$"
- "^derivs.opt$"
- "^derivs.batched$"
- "^derivs.batched.opt$"
- "^filterwidth-reg.regress.batched.opt$"
- "^geomath.opt$"
- "^geomath.batched$"
- "^geomath.batched.opt$"
- "^getattribute-camera.batched$"
- "^getattribute-camera.batched.opt$"
- "^getattribute-shader.batched.opt$"
- "^gettextureinfo.batched$"
- "^gettextureinfo-reg.regress.batched.opt$"
- "^hyperb.opt$"
- "^hyperb.batched.opt$"
- "^ieee_fp-reg.regress.batched.opt$"
- "^initlist.batched$"
- "^initlist.batched.opt$"
- "^isconnected.batched$"
- "^linearstep.batched$"
- "^linearstep.batched.opt$"
- "^loop.batched$"
- "^loop.batched.opt$"
- "^matrix$"
- "^matrix.opt$"
- "^matrix.batched$"
- "^matrix-compref-reg.regress.batched.opt$"
- "^message-no-closure.batched$"
- "^message-no-closure.batched.opt$"
- "^message-reg.regress.batched.opt$"
- "^miscmath$"
- "^miscmath.opt$"
- "^miscmath.batched$"
- "^miscmath.batched.opt$"
- "^noise.batched$"
- "^noise-cell.batched$"
- "^noise-gabor.batched$"
- "^noise-gabor.batched.opt$"
- "^noise-gabor-reg.regress.batched.opt$"
- "^noise-generic.batched$"
- "^noise-generic.batched.opt$"
- "^noise-perlin.batched$"
- "^noise-perlin.batched.opt$"
- "^noise-simplex.batched$"
- "^noise-simplex.batched.opt$"
- "^noise-reg.regress.batched.opt$"
- "^pnoise.batched$"
- "^pnoise-cell.batched$"
- "^pnoise-gabor.batched$"
- "^pnoise-gabor.batched.opt$"
- "^pnoise-generic.batched$"
- "^pnoise-generic.batched.opt$"
- "^pnoise-perlin.batched$"
- "^pnoise-perlin.batched.opt$"
- "^pnoise-reg.regress.batched.opt$"
- "^opt-warnings.batched$"
- "^opt-warnings.batched.opt$"
- "^regex-reg.regress.batched.opt$"
- "^select.batched$"
- "^select.batched.opt$"
- "^shaderglobals.batched$"
- "^shaderglobals.batched.opt$"
- "^smoothstep-reg.regress.batched.opt$"
- "^spline.batched$"
- "^spline.batched.opt$"
- "^splineinverse-ident.batched$"
- "^splineinverse-ident.batched.opt$"
- "^spline-derivbug.batched$"
- "^spline-derivbug.batched.opt$"
- "^split-reg.regress.batched.opt$"
- "^string.batched$"
- "^string.batched.opt$"
- "^string-reg.regress.batched.opt$"
- "^struct.batched$"
- "^struct-array-mixture.batched$"
- "^struct-array-mixture.batched.opt$"
- "^texture-environment-opts-reg.regress.batched.opt$"
- "^texture-opts-reg.regress.batched.opt$"
- "^texture-wrap.batched$"
- "^texture-wrap.batched.opt$"
- "^transcendental-reg.regress.batched.opt$"
- "^transform$"
- "^transform.opt$"
- "^transform.batched$"
- "^transform.batched.opt$"
- "^transformc$"
- "^transformc.opt$"
- "^transformc.batched$"
- "^transformc.batched.opt$"
- "^trig$"
- "^trig.opt$"
- "^trig.batched$"
- "^trig.batched.opt$"
- "^trig-reg.regress.batched.opt$"
- "^vecctr.batched$"
- "^vecctr.batched.opt$"
- "^vector-reg.regress.batched.opt$"
- "^xml-reg.regress.batched.opt$"
- "^gettextureinfo-udim.batched$"
- "^gettextureinfo-udim.batched.opt$"
- "^gettextureinfo-udim-reg.regress.batched.opt$"
- "^pointcloud.batched$"
- "^pointcloud.batched.opt$"
- )
- fi
-
- myctestargs=(
- # src/build-scripts/ci-test.bash
- '--force-new-ctest-process'
- )
-
- local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR
PYTHONPATH
- DEBUG=1 # doubles the floating point tolerance so we avoid FMA related
issues
- CXXFLAGS="-I${T}/usr/include"
- LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
- OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
- OSL_SOURCE_DIR="${S}"
-
- if use python; then
- PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
- fi
-
- cmake_src_test
-
- einfo ""
- einfo "testing render tests in isolation"
- einfo ""
-
- CMAKE_SKIP_TESTS=(
- "^render-background$"
- "^render-bumptest$"
- "^render-mx-furnace-sheen$"
- "^render-mx-burley-diffuse$"
- "^render-mx-conductor$"
- "^render-mx-generalized-schlick-glass$"
- "^render-microfacet$"
- "^render-oren-nayar$"
- "^render-veachmis$"
- "^render-ward$"
- "^render-raytypes.opt$"
- )
-
- myctestargs=(
- # src/build-scripts/ci-test.bash
- '--force-new-ctest-process'
- --repeat until-pass:10
- -R "^render"
- )
-
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use test; then
- rm \
- "${ED}/usr/bin/test"{render,shade{,_dso}} \
- "${ED}/usr/$(get_libdir)/libtestshade.so"* \
- || die
- fi
-
- if use amd64; then
- find "${ED}/usr/$(get_libdir)" -type f -name
'lib_*_oslexec.so' -print0 \
- | while IFS= read -r -d $'\0' batched_lib; do
- patchelf --set-soname "$(basename "${batched_lib}")"
"${batched_lib}" || die
- done
- fi
-}
