gentoo auto-resync : 10:01:2024 - 19:03:44

3 files changed, 150 insertions, 3 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 55a2a4c68b4c..051fdf1f1c52 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,7 +1,9 @@
 DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
 DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
+DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
 DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
 EBUILD osl-1.12.11.0.ebuild 2654 BLAKE2B 03dbc702cf4ee912aaa9c8e6fc367c1d329e4197c921b83530ef067655bc5d9707709ff1faabccec73afc5cdca1c35e13b332f27c1753e995d15e175be27faa2 SHA512 eb64532b37668c315ece45468dff7de849a80cd4a4d977e9ec3fe248d844deb431eeefeb54e6cfdc886cdae8db25573cd6345e7df0ab09c8dd8a0844f5bc17bc
 EBUILD osl-1.12.13.0.ebuild 2937 BLAKE2B d0cc000f15b02c06109d3bfeec16423da744b8b3aa4eae200cc2e34edc92d5aa9dc63652e6291e4deb37e96dc0c2815a936e920cbb560c72936543e63b977876 SHA512 d0293f173cbaff89eef8c7d00bf4a1c23b10af4cfe4091d9cf0dbda9a4321ebc8f8954e1fca40c59ca2f539583dfced2ac61f634a9d3a5579fdffde97a3defc9
+EBUILD osl-1.12.14.0.ebuild 3696 BLAKE2B 73bf112684b06c5c75521a8df1e7963551a21caabb53754cc8455d949417079bca07afbf092f7c173490a5ed0003aa163a2731ce8a5b7be4bf4fbfaf36688024 SHA512 fe1b2b7bb061eeba5dbee874e9fa4a429430c8b9aadc473aaa6736ac824bd84389a0365154ad06e4ebb92ede7198c6611310772bc787b2c553683eb542f52a3c
 EBUILD osl-1.12.7.0.ebuild 2761 BLAKE2B b70f2c5c5d7a8cd3d5031f35562e3266d21e5212a53ca5ea2ea4c8d2476651095e6140c6490648ab0fcc2c629e81d4ec628155bbea8d78899446e906596d065d SHA512 daede9ce4d5d366bcba462adfad893fe19d9d41b05adc807632b9d67422b452170a2cb453fefba826877f4bbafc4639311aab457f16ffc324b66f8688c0e517c
-MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
+MISC metadata.xml 928 BLAKE2B 83ad1e0e7bcbed3f4c279b1da4683b8413a30c9b85d97de88b61c2941749a34183016c5f024a486801e7c4e78c4e4286d3f88a11a935763dd3e91056b6e5a93d SHA512 b171f20751545e25e27e9fc85161d0de1d6290c36b712004b4068fb2cfa223935662c88f6804f905ca0843407fac02dd1aeb4e80a603ad7f5f89acdfaabb83c8
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index a300ead37dfa..bd83cdb5a001 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -16,9 +16,10 @@
 	</longdescription>
 	<use>
 		<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
-		<flag name="qt5">Build the osltoy binary</flag>
+		<flag name="gui">Build the osltoy binary (with Qt5)</flag>
+		<flag name="qt6">Build the osltoy binary (with Qt6)</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">imageworks/OpenShadingLanguage</remote-id>
+		<remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
new file mode 100644
index 000000000000..9cfb9be255ac
--- /dev/null
+++ b/media-libs/osl/osl-1.12.14.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 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="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:=
+	<sys-devel/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 "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	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[*]}")"
+		-DVEC_REPORT=yes
+	)
+
+	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
+}