gentoo resync : 20.03.2022

4 files changed, 146 insertions, 12 deletions

diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index b8d7ef08927e..19dedc764bdd 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,5 +1,7 @@
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
 DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f
-EBUILD embree-3.13.0-r2.ebuild 3671 BLAKE2B f9833656184addff84fcd49024e8ad82bbb871de8ae5b82a19bf1baf9b2cdbb871b13f8919e6046f3aaaa043aabe8867b8ba17ab121c4b3cf1fc9aafe1b28428 SHA512 a5e7a50b44142baafadfd5157fb6af32a6e702688efa9ea72aa1c8c36fdbc8bf752cb9105d9e2e9f696ae6e8aa833f2a78c47e663d60821dd34e2c05acdb6c8a
-EBUILD embree-3.13.2.ebuild 3775 BLAKE2B ecfd7e1629e2250ac08d4e597e75c2edf9ff32f27180d9108907a31e4915a784b3d5a37f7818304ad205ca1aede6a73792c84ac1391b31a2735c4e13c752efe8 SHA512 edbefc1ee4277f3cf8f2dbb26f5740ae634cfe01b84bc65073b62bbd74df49789e134dd8d76c2e2ee85f7256bb935bce8168840c42b5019b25eaacdecadfdf9c
+DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd
+EBUILD embree-3.13.0-r2.ebuild 3632 BLAKE2B f444cb044ee4ccf93e943c7407d3c03c792ab45dbe7b29c985438de9686ee56d9885541b97eeab9fa1e8bda3c1966a7a8aa0b7f9149ed85963cfb227396920e8 SHA512 72ee5506cc0e7e4b834bc5952cce2627d07c545d380f94e41084db1646191b6ce10821c136f6d3efdd5bc0bfca9fe08831b0716b5b077bd0b5a826f33a7e76d7
+EBUILD embree-3.13.2.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5
+EBUILD embree-3.13.3.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.0-r2.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild
index 136ad000762f..f72392a0812c 100644
--- a/media-libs/embree/embree-3.13.0-r2.ebuild
+++ b/media-libs/embree/embree-3.13.0-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="3"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
 CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
 RESTRICT="mirror"
 
 BDEPEND="
@@ -56,13 +56,13 @@ src_prepare() {
 src_configure() {
 	# 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 "march" compile flags. This is because embree builds modules for the
+	# any "m*" compile flags. This is because embree builds modules for the
 	# different supported ISAs and picks the correct one at runtime.
-	# "march" will pull in cpu instructions that shouldn't be in specific modules
+	# "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 -march=*
+	filter-flags -m*
 
 	local mycmakeargs=(
 		# Currently Intel only host their test files on their internal network.
@@ -93,7 +93,7 @@ src_configure() {
 		-DEMBREE_RAY_MASK=$(usex raymask)
 		-DEMBREE_RAY_PACKETS=ON				# default
 		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=$(usex static-libs)
+		-DEMBREE_STATIC_LIB=OFF
 		-DEMBREE_STAT_COUNTERS=OFF
 		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
 		-DEMBREE_TUTORIALS=$(usex tutorial) )
diff --git a/media-libs/embree/embree-3.13.2.ebuild b/media-libs/embree/embree-3.13.2.ebuild
index 94efef93e9b9..40002cff3ac1 100644
--- a/media-libs/embree/embree-3.13.2.ebuild
+++ b/media-libs/embree/embree-3.13.2.ebuild
@@ -14,7 +14,7 @@ SLOT="3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
 CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
 # Let's be explicit here even though we could simplify it.
 REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
 
@@ -56,13 +56,13 @@ src_prepare() {
 src_configure() {
 	# 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 "march" compile flags. This is because embree builds modules for the
+	# any "m*" compile flags. This is because embree builds modules for the
 	# different supported ISAs and picks the correct one at runtime.
-	# "march" will pull in cpu instructions that shouldn't be in specific modules
+	# "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 -march=*
+	filter-flags -m*
 
 	local mycmakeargs=(
 		# Currently Intel only host their test files on their internal network.
@@ -111,7 +111,7 @@ src_configure() {
 		# default
 		-DEMBREE_RAY_PACKETS=ON
 		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=$(usex static-libs)
+		-DEMBREE_STATIC_LIB=OFF
 		-DEMBREE_STAT_COUNTERS=OFF
 		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
 		-DEMBREE_TUTORIALS=$(usex tutorial))
diff --git a/media-libs/embree/embree-3.13.3.ebuild b/media-libs/embree/embree-3.13.3.ebuild
new file mode 100644
index 000000000000..40002cff3ac1
--- /dev/null
+++ b/media-libs/embree/embree-3.13.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}"
+# Let's be explicit here even though we could simplify it.
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) x86? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="mirror"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=media-libs/glfw-3.2.1
+	virtual/opengl
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb:= )
+	tutorial? (
+		>=media-libs/libpng-1.6.34:0=
+		>=media-libs/openimageio-1.8.7:0=
+		virtual/jpeg:0
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+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
+}
+
+src_configure() {
+	# 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*
+
+	local mycmakeargs=(
+		# Currently Intel only host their test files on their internal network.
+		# So it seems like users can't easily get a hold of these and do
+		# regression testing on their own.
+		-DBUILD_TESTING:BOOL=OFF
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+
+		# default
+		-DEMBREE_BACKFACE_CULLING=OFF
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+
+		# default
+		-DEMBREE_FILTER_FUNCTION=ON
+		# default
+		-DEMBREE_GEOMETRY_CURVE=ON
+		# default
+		-DEMBREE_GEOMETRY_GRID=ON
+		# default
+		-DEMBREE_GEOMETRY_INSTANCE=ON
+		# default
+		-DEMBREE_GEOMETRY_POINT=ON
+		# default
+		-DEMBREE_GEOMETRY_QUAD=ON
+		# default
+		-DEMBREE_GEOMETRY_SUBDIVISION=ON
+		# default
+		-DEMBREE_GEOMETRY_TRIANGLE=ON
+		# default
+		-DEMBREE_GEOMETRY_USER=ON
+		# default
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+		# default
+		-DEMBREE_IGNORE_INVALID_RAYS=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_NEON=$(usex cpu_flags_arm_neon)
+		-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)
+		# default
+		-DEMBREE_RAY_PACKETS=ON
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=OFF
+		-DEMBREE_STAT_COUNTERS=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		-DEMBREE_TUTORIALS=$(usex tutorial))
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use tutorial; then
+		mycmakeargs+=(
+			-DEMBREE_ISPC_ADDRESSING:STRING="64"
+			-DEMBREE_TUTORIALS_LIBJPEG=ON
+			-DEMBREE_TUTORIALS_LIBPNG=ON
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON
+		)
+	fi
+
+	cmake_src_configure
+}