From 6e17560f8922f9b12c3184946b691cb016e58667 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 4 Aug 2021 03:24:11 +0100 Subject: media-libs/embree: revision bump for subslot operator We need to bump revisions for adding/subscribing to subslot operators. Fixes: 687e88e1d62e728b09144c89932f3e9dec90e215 Signed-off-by: Sam James --- media-libs/embree/embree-3.13.0-r1.ebuild | 113 ++++++++++++++++++++++++++++++ media-libs/embree/embree-3.13.0.ebuild | 113 ------------------------------ 2 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 media-libs/embree/embree-3.13.0-r1.ebuild delete mode 100644 media-libs/embree/embree-3.13.0.ebuild (limited to 'media-libs/embree') diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild new file mode 100644 index 000000000000..f77d5a1eb87c --- /dev/null +++ b/media-libs/embree/embree-3.13.0-r1.ebuild @@ -0,0 +1,113 @@ +# 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 ~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=" + >=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 + + if ! ( cat /proc/cpuinfo | grep sse2 > /dev/null ) ; then + die "You need a CPU with at least sse2 support" + fi +} + +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 "march" 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 + # and it fails to link properly. + # https://github.com/embree/embree/issues/115 + + 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 + -DEMBREE_COMPACT_POLYS=$(usex compact-polys) + -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 + -DEMBREE_IGNORE_INVALID_RAYS=OFF # default + -DEMBREE_MAX_ISA:STRING="NONE" # Set to NONE so we can manually switch on ISAs below + -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) + -DEMBREE_RAY_PACKETS=ON # default + -DEMBREE_STACK_PROTECTOR=$(usex ssp) + -DEMBREE_STATIC_LIB=$(usex static-libs) + -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 +} diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0.ebuild deleted file mode 100644 index f77d5a1eb87c..000000000000 --- a/media-libs/embree/embree-3.13.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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 ~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=" - >=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 - - if ! ( cat /proc/cpuinfo | grep sse2 > /dev/null ) ; then - die "You need a CPU with at least sse2 support" - fi -} - -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 "march" 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 - # and it fails to link properly. - # https://github.com/embree/embree/issues/115 - - 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 - -DEMBREE_COMPACT_POLYS=$(usex compact-polys) - -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 - -DEMBREE_IGNORE_INVALID_RAYS=OFF # default - -DEMBREE_MAX_ISA:STRING="NONE" # Set to NONE so we can manually switch on ISAs below - -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) - -DEMBREE_RAY_PACKETS=ON # default - -DEMBREE_STACK_PROTECTOR=$(usex ssp) - -DEMBREE_STATIC_LIB=$(usex static-libs) - -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 -} -- cgit v1.2.3-65-gdbad