commit: 687e88e1d62e728b09144c89932f3e9dec90e215 Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> AuthorDate: Sat Jun 12 18:24:02 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Aug 4 02:14:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687e88e1
media-libs/embree: Implement remaining feedback from review task Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/embree/embree-3.13.0.ebuild | 20 +++++++++++++------- media-libs/embree/metadata.xml | 7 ++++--- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0.ebuild index 7fb5564741f..f77d5a1eb87 100644 --- a/media-libs/embree/embree-3.13.0.ebuild +++ b/media-libs/embree/embree-3.13.0.ebuild @@ -7,29 +7,32 @@ inherit cmake flag-o-matic linux-info toolchain-funcs DESCRIPTION="Collection of high-performance ray tracing kernels" HOMEPAGE="https://github.com/embree/embree"; -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86" SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" SLOT="3" +KEYWORDS="~amd64 ~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[@]%:*}" +RESTRICT="mirror" + BDEPEND=" virtual/pkgconfig " RDEPEND=" - ispc? ( dev-lang/ispc ) >=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 + >=media-libs/openimageio-1.8.7:0= virtual/jpeg:0 ) - virtual/opengl " DEPEND="${RDEPEND}" -RESTRICT="mirror" + DOCS=( CHANGELOG.md README.md readme.pdf ) pkg_setup() { @@ -62,6 +65,9 @@ src_configure() { filter-flags -march=* 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 -DEMBREE_BACKFACE_CULLING=OFF # default @@ -93,7 +99,7 @@ src_configure() { -DEMBREE_TUTORIALS=$(usex tutorial) ) # Disable asserts - append-flags -DNDEBUG + append-cppflags -DNDEBUG if use tutorial; then mycmakeargs+=( diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml index 9fb89375a78..dcaede1dd58 100644 --- a/media-libs/embree/metadata.xml +++ b/media-libs/embree/metadata.xml @@ -20,15 +20,16 @@ <flag restrict=">=media-libs/embree-3.12.2" name="compact-polys"> Enables double indexed poly layout. </flag> - <flag restrict=">=media-libs/embree-3.12.2" name="ssp"> - When enabled, Embree compiles with stack protection against return address overrides. - </flag> <flag restrict=">=media-libs/embree-3.12.2" name="ispc"> Build Embree with support for ISPC applications. </flag> <flag restrict=">=media-libs/embree-3.12.2" name="raymask"> Enables ray mask support. </flag> + <flag restrict=">=media-libs/embree-3.12.2" name="ssp"> + When enabled, Embree compiles with stack protection against return address overrides. + Stack protection will wield a minor performance decrease in return for higher security. + </flag> <flag restrict=">=media-libs/embree-3.12.2" name="tbb"> Use TBB instead of the built-in Embree tasking system. </flag>
