gentoo auto-resync : 15:08:2024 - 12:22:30

2 files changed, 176 insertions, 0 deletions

diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 37e63a88b227..6056f8d9316c 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -5,7 +5,9 @@ AUX embree-4.3.1-dont-install-tutorials.patch 10020 BLAKE2B ec13bf359eb36059062d
 DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
 DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95
 DIST embree-4.3.1.tar.gz 71110988 BLAKE2B 0ab183fe8fae3948b319c74a922c001d0567d223adab74da3a0f55fd4e4fd5c2c17afeb065da706d411238b7877e208e7041aad9430f109e606ed1a9dd23646f SHA512 da7710c6dfaa90970c223a503702fc7c7dd86c1397372b3d6f51c4377d28d8e62b90ee8c99b70e3aa49e16971a5789bb8f588ea924881b9dd5dd8d5fcd16518a
+DIST embree-4.3.3.tar.gz 71114884 BLAKE2B 154d95a5e04d86d13738b0cb28782d0f47ec4c7c1af207fdbeb17805873be85501881e6699e488477af483505c181afdf95d8199d2f54de6623fe06cc77ec603 SHA512 f614c72c5e5c83b8936d37d4e916711b3ab29329786e96944e851a41d5e2358cf7ac739c145aee131403b0b91f7e2ce5422e892dc88d490e29356f79b47c8581
 EBUILD embree-3.13.4.ebuild 3921 BLAKE2B ead945d61e7a2d09f42696fae28dae644a2a6cdcf6f525ab544f5b070c892b20d83c05c4363f2ae38f3719516ca275b1e7f4c310cc87f5cb618dc070c50b5759 SHA512 bb4f5fecceb3ff58e0ea55ce14a864fc7200833178e4e2e5f694a4840451b79c79d749bc9ea460e207daf8bf9ee49c9d19d344a69e78cbb8088c0abb35d32b85
 EBUILD embree-3.13.5.ebuild 3864 BLAKE2B 3f461c95f8fddceccc32d73be5d5e2e47badfdd72cd34b464a5d85e2eb7e1251c6eb8c7ca4669fc7e6b3172f7eca9cb674254d64d3a0cd94bd83ae4e6170927c SHA512 d8081f7e2cd73825cc322b9843e64bf8bd0bd123b7ab7c87dc4e19daa5bce17589e434c129e3b1e30232a3bc6a54496a5635ce9d94a20ca3345e8c9ccb14bcf0
 EBUILD embree-4.3.1.ebuild 5293 BLAKE2B 68660984698395d7d241beeda4deb7b675bf8e31e22ddf1bba090c7d4109d281258783886a1e6f721ecdb1165038801fda632e1f3e688e68f9078311d2098a7d SHA512 a4b55b55e55d2db9e3d96723d9ce13afab31d02c5ad7e1f7ad9f913deee0fc404fa70d08e9ee24b6280426cae9777f1f19e563464a2591837146f4fd726a6b55
+EBUILD embree-4.3.3.ebuild 5511 BLAKE2B 92f3d0cd3642ebdccde5382497d487f4545a0dd818ae73ffb2b42ffb86c90af1f052d22425a8369f06885a603943f821468794013a456499d0b9b1aeba30bfb3 SHA512 a1ee3afbdc18e3891a6d672287c50659c53ec14866d34f6656a9422f3e22c86825982e3320a9b4d9f1c37720433e7f4fd15e43cbfb09d372413ab371873e3177
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-4.3.3.ebuild b/media-libs/embree/embree-4.3.3.ebuild
new file mode 100644
index 000000000000..eb4bc120565a
--- /dev/null
+++ b/media-libs/embree/embree-4.3.3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="-* ~amd64 ~arm64"
+X86_CPU_FLAGS=( sse2 sse4_2 avx avx2 avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
+IUSE="compact-polys ispc +raymask ssp +tbb test ${CPU_FLAGS[*]}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
+	arm? ( cpu_flags_arm_neon )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+PATCHES=(
+	"${FILESDIR}/embree-4.3.1-dont-install-tutorials.patch"
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+
+	# don't redefine _FORTIFY_SOURCE https://bugs.gentoo.org/895016
+	sed -e '/-D_FORTIFY_SOURCE=2/d' \
+		-i common/cmake/*.cmake \
+		|| die
+
+	# raise cmake minimum version to silence warning
+	sed -e 's#CMAKE_MINIMUM_REQUIRED(VERSION 3.[0-9].0)#CMAKE_MINIMUM_REQUIRED(VERSION 3.5)#I' \
+	    -i \
+	        CMakeLists.txt \
+	        kernels/rthwif/CMakeLists.txt \
+	        tutorials/embree_info/CMakeLists.txt \
+	        tutorials/minimal/CMakeLists.txt \
+	    || die
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/859838
+	# https://github.com/embree/embree/issues/481
+	filter-lto
+
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "m*" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "m*" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -m*
+
+	# https://bugs.gentoo.org/910164
+	tc-is-clang && filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# Default culling settings for Blender
+		# (Cycles will not render correctly without these)
+		# Some Embree tests will fail with these settings though...
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_BACKFACE_CULLING_CURVES=ON
+		-DEMBREE_BACKFACE_CULLING_SPHERES=ON
+
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# Make sure that we are using our custom compilie flags
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+
+		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_MAX_ISA:STRING="NONE"
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+
+		# TODO figure out sycl support
+		-DEMBREE_SYCL_SUPPORT="no"
+
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		# Tutorial binaries are required by the tests
+		-DEMBREE_TUTORIALS=$(usex test)
+		-DEMBREE_ZIP_MODE=OFF
+	)
+
+	if { use arm && usex cpu_flags_arm_neon; } || use arm64; then
+		mycmakeargs+=(
+			-DEMBREE_ISA_NEON="yes"
+			# TODO look into neon 2x support
+			# -DEMBREE_ISA_NEON2X="yes"
+		)
+	fi
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTING=ON
+			-DEMBREE_TESTING_INSTALL_TESTS=OFF
+			-DEMBREE_TESTING_INTENSITY=4
+			# These tutorials are not used by the default tests
+			-DEMBREE_TUTORIALS_GLFW=OFF
+			-DEMBREE_TUTORIALS_INSTALL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# NOTE Some Embree tests will fail due to EMBREE_BACKFACE_CULLING settings for blender...
+	local CMAKE_SKIP_TESTS=(
+		'^embree_verify$'
+		'^embree_verify_i2$'
+		'^viewer_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_coherent_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_quad_coherent_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_3.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_7.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_8.ecs(|_ispc)$'
+		'^viewer_grid_coherent_models_curves_round_line_segments_9.ecs(|_ispc)$'
+		'^hair_geometry(|_ispc)$'
+		'^embree_tests$'
+	)
+
+	cmake_src_test
+}