gentoo auto-resync : 14:01:2025 - 06:41:37

3 files changed, 2 insertions, 157 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 200992168440..2a603d25b76a 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -6,8 +6,7 @@ AUX osl-oslfile.patch 948 BLAKE2B a3862fd04ef4ae18ad8644829a7e064a13e2bd1d2269ca
 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
-EBUILD osl-1.12.14.0-r3.ebuild 10439 BLAKE2B 1ce29bfd7988636b8c3ca287ebf106b26f5ead7575f9134b5dde1c813df77b4034eb0efcfca830de7ec6373de720800cd32ae80c91e90d34cb923390ec2b49b8 SHA512 dbc37768b5d5c8afb9c1d44b6db737fad57deb0f663f9207c245fe8aa91fa7fa538bf9abdf10734c8cf761ef820dca92aef78b89c9806181d7705fd44e4578a6
-EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 59228846da135c84663ff3d4a12f3370de16f281bf7f03dbd14668581c2b8fd010de16129f1e1957c51da5d83a0c1d9541ad1713ff5b938c22021ff9b84eb74b SHA512 e557e55accb7b1a5b5b07c1198fe92547d067d6687100f4ef54be38e20488bdda2cb7809e218aa7f207358ab6a1dc157d1bf5581a7db42180ed2fd4927f42c22
+EBUILD osl-1.12.14.0-r3.ebuild 10438 BLAKE2B e5340df04a69b5411dba2f16db1e570dd84bc5dd78f79a50b30d1f1b2d87aa376441418cd34741221e537a489eeda5c095da32bda1d4a1dce9b45221a09a76eb SHA512 c7a195b1c1fdd5c4278ac82c086afb23de58e872336bff40b88b32e7045b9666dabb23e1da96752dbf94fac7cbe16f1b61d1b25816a6e6c4f1fce375f558fb18
 EBUILD osl-1.13.10.0-r1.ebuild 7949 BLAKE2B b79ea75f6622de002bb68002c7cc0c1dfa3f0273698e0b1c97a37e45a31633b49153bbc0d4ade9d874de021455a87524084141d98631c462848caa44b38cc5f2 SHA512 1806739ec0a8e42ba3111980fbf144d65119f1b4d7cc479087f5937bcfc28c3827b75dec589346ec0333d16ee53bac9da342857fcfdfd2055dce11aefb50a28f
 EBUILD osl-1.13.12.0-r1.ebuild 7908 BLAKE2B 6bd879152bd18ab8dfbadbfeb9a696c214851ebb62704f97f4d23c615392ed8c332ee0fc1f9f43c28a176b152ad1b2839ba4cc47eb86bb303132b797710c7048 SHA512 10d805b863d8d2ea2e4c2cef312704e09a0fc8b0c0db98735274b5987eb21c97a0fa78755910100e77288a98deea5098603b17b544efbd624f2a00bacdb5957d
 EBUILD osl-9999.ebuild 7908 BLAKE2B 6bd879152bd18ab8dfbadbfeb9a696c214851ebb62704f97f4d23c615392ed8c332ee0fc1f9f43c28a176b152ad1b2839ba4cc47eb86bb303132b797710c7048 SHA512 10d805b863d8d2ea2e4c2cef312704e09a0fc8b0c0db98735274b5987eb21c97a0fa78755910100e77288a98deea5098603b17b544efbd624f2a00bacdb5957d
diff --git a/media-libs/osl/osl-1.12.14.0-r3.ebuild b/media-libs/osl/osl-1.12.14.0-r3.ebuild
index 92d756ff9fb0..3e3f67e8c205 100644
--- a/media-libs/osl/osl-1.12.14.0-r3.ebuild
+++ b/media-libs/osl/osl-1.12.14.0-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]] ; then
 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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	S="${WORKDIR}/OpenShadingLanguage-${PV}"
 fi
 
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
deleted file mode 100644
index 6bbe929b50c3..000000000000
--- a/media-libs/osl/osl-1.12.14.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2024 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="debug 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:=
-	<llvm-core/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 "llvm-core/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/875836
-	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
-	filter-lto
-
-	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[*]}")"
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DVEC_REPORT="yes"
-		)
-	fi
-
-	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
-}