[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-gfx/blender/, media-libs/openpgl/, profiles/, ...
commit: 5c2ef969d489dc220f6001c228cd7b9367a77f03 Author: Paul Zander gmail com> AuthorDate: Tue Mar 26 14:06:11 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 2 11:26:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2ef969 media-libs/embree: 4.3.1 bump, fix slot, remove mask, re-enable tests Split up REQUIRED_USE per arch. Closes: https://bugs.gentoo.org/927843 Closes: https://bugs.gentoo.org/927833 Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35927 Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-3.3.15.ebuild| 2 +- media-gfx/blender/blender-3.3.6-r1.ebuild | 2 +- media-gfx/blender/blender-3.3.8.ebuild | 2 +- media-gfx/blender/blender-3.6.0.ebuild | 2 +- media-gfx/blender/blender-3.6.5.ebuild | 2 +- media-gfx/blender/blender-3.6.8.ebuild | 2 +- media-gfx/blender/blender-4.0.1-r1.ebuild | 2 +- media-gfx/blender/blender-4.0.2.ebuild | 2 +- media-gfx/blender/blender-.ebuild | 2 +- media-libs/embree/Manifest | 2 +- .../{embree-4.3.0.ebuild => embree-4.3.1.ebuild} | 54 -- ...h => embree-4.3.1-dont-install-tutorials.patch} | 13 ++ media-libs/openpgl/openpgl-0.5.0.ebuild| 2 +- profiles/package.mask | 5 -- 14 files changed, 63 insertions(+), 31 deletions(-) diff --git a/media-gfx/blender/blender-3.3.15.ebuild b/media-gfx/blender/blender-3.3.15.ebuild index faf2fe0203cd..de6e734737f0 100644 --- a/media-gfx/blender/blender-3.3.15.ebuild +++ b/media-gfx/blender/blender-3.3.15.ebuild @@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS} collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( =media-libs/embree-3.10.0[raymask] ) + embree? ( >=media-libs/embree-3.10.0:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild b/media-gfx/blender/blender-3.3.6-r1.ebuild index 7f36b281370f..e09d6c4b17ac 100644 --- a/media-gfx/blender/blender-3.3.6-r1.ebuild +++ b/media-gfx/blender/blender-3.3.6-r1.ebuild @@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS} collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( =media-libs/embree-3.10.0[raymask] ) + embree? ( >=media-libs/embree-3.10.0:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild index fb5b111de13e..1e762b11e628 100644 --- a/media-gfx/blender/blender-3.3.8.ebuild +++ b/media-gfx/blender/blender-3.3.8.ebuild @@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS} collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( =media-libs/embree-3.10.0[raymask] ) + embree? ( >=media-libs/embree-3.10.0:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) diff --git a/media-gfx/blender/blender-3.6.0.ebuild b/media-gfx/blender/blender-3.6.0.ebuild index 49ca6280a4dd..e2f45202cf11 100644 --- a/media-gfx/blender/blender-3.6.0.ebuild +++ b/media-gfx/blender/blender-3.6.0.ebuild @@ -70,7 +70,7 @@ RDEPEND="${PYTHON_DEPS} collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( =media-libs/embree-3.10.0[raymask] ) + embree? ( >=media-libs/embree-3.10.0:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) diff --git a/media-gfx/blender/blender-3.6.5.ebuild b/media-gfx/blender/blender-3.6.5.ebuild index 8dc4de747a8c..bc7d8f123206 100644 --- a/media-gfx/blender/blender-3.6.5.ebuild +++ b/media-gfx/blender/blender-3.6.5.ebuild @@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS} collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( >=media-libs/embree-3.10.0[raymask] ) + embree? ( >=media-libs/embree-3.10.0:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8.ebuild index 8dc4de747a8c..bc7d8f123206 100644 --- a/media-gfx/blender/blender-3.6.8.ebuild +++ b/media-gfx/blender/blender-3.6.8.ebuild @@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS} collada? ( >=media-libs/opencollada-1.6.68 ) color-management?
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 6523ef2c99db1ba28395f2d6b8ca8e8f46564f53 Author: Eli Schwartz gmail com> AuthorDate: Tue Mar 26 04:41:01 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 26 12:27:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6523ef2c media-libs/embree: mark as LTO-unsafe Closes: https://bugs.gentoo.org/859838 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.4.ebuild | 7 ++- media-libs/embree/embree-3.13.5.ebuild | 7 ++- media-libs/embree/embree-4.3.0.ebuild | 5 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 1925f9f320b4..9786e02cfb22 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -57,6 +57,11 @@ src_prepare() { } 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 diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild index 7a4464c22033..02aed35aa2cc 100644 --- a/media-libs/embree/embree-3.13.5.ebuild +++ b/media-libs/embree/embree-3.13.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,6 +56,11 @@ src_prepare() { } 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 diff --git a/media-libs/embree/embree-4.3.0.ebuild b/media-libs/embree/embree-4.3.0.ebuild index 370913e57a52..04ed9ac7aeb6 100644 --- a/media-libs/embree/embree-4.3.0.ebuild +++ b/media-libs/embree/embree-4.3.0.ebuild @@ -49,6 +49,11 @@ src_prepare() { } 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 0e0641f5d60402280cb676cc0da65239eb422026 Author: Sam James gentoo org> AuthorDate: Mon Mar 25 18:56:23 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 18:56:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0641f5 media-libs/embree: crank copyright Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-4.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-4.3.0.ebuild b/media-libs/embree/embree-4.3.0.ebuild index 05a813da049f..370913e57a52 100644 --- a/media-libs/embree/embree-4.3.0.ebuild +++ b/media-libs/embree/embree-4.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
commit: 853f778d6113be2e57db1d9927b1ded860ff3580 Author: Sebastian Parborg gmail com> AuthorDate: Wed Jan 17 11:39:14 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 18:54:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=853f778d media-libs/embree: Bump to 4.3.0 Closes: https://bugs.gentoo.org/912279 Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/embree/Manifest | 1 + media-libs/embree/embree-4.3.0.ebuild | 118 .../embree-4.3.0-dont-install-tutorials.patch | 203 + 3 files changed, 322 insertions(+) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index 514a411dba17..3478edbe8dae 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -1,2 +1,3 @@ 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.0.tar.gz 71028239 BLAKE2B 7834ed7851d36c32ce3e88a3ddb02e8316422699ec78a662ef81ef0eb9f66b260ce2f7438739531e2b63f817a931a19ba35da156e8e09a42a78e6c077314e615 SHA512 8f61401175464b34243e899464f44a196b520c08e1c44a417bf980cfa7b191859bbaab1029278123654e5ffb91e2f8a85af1d881affddcc7e344a7e8a8066262 diff --git a/media-libs/embree/embree-4.3.0.ebuild b/media-libs/embree/embree-4.3.0.ebuild new file mode 100644 index ..05a813da049f --- /dev/null +++ b/media-libs/embree/embree-4.3.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2023 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="3" +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="|| ( ${CPU_FLAGS[@]} )" + +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.0-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 +} + +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* + + # 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) +
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 958acb2ffefb980fb7be3cfcfd5c667e567184d4 Author: Violet Purcell inventati org> AuthorDate: Sun Jul 9 14:06:50 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jul 26 08:00:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958acb2f media-libs/embree: Filter LTO with clang Closes: https://bugs.gentoo.org/910164 Signed-off-by: Violet Purcell inventati.org> Closes: https://github.com/gentoo/gentoo/pull/31811 Signed-off-by: Joonas Niilola gentoo.org> media-libs/embree/embree-3.13.4.ebuild | 5 - media-libs/embree/embree-3.13.5.ebuild | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 247a69b0fb6c..1925f9f320b4 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic linux-info +inherit cmake flag-o-matic linux-info toolchain-funcs DESCRIPTION="Collection of high-performance ray tracing kernels" HOMEPAGE="https://github.com/embree/embree; @@ -67,6 +67,9 @@ src_configure() { filter-flags -m* + # https://bugs.gentoo.org/910164 + tc-is-clang && filter-lto + 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 diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild index 1f94e528f380..7a4464c22033 100644 --- a/media-libs/embree/embree-3.13.5.ebuild +++ b/media-libs/embree/embree-3.13.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic linux-info +inherit cmake flag-o-matic linux-info toolchain-funcs DESCRIPTION="Collection of high-performance ray tracing kernels" HOMEPAGE="https://github.com/embree/embree; @@ -66,6 +66,9 @@ src_configure() { filter-flags -m* + # https://bugs.gentoo.org/910164 + tc-is-clang && filter-lto + 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 136cbc8bd50200894e7a8eeef35e2c47ba119e39 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jun 10 20:02:30 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 10 20:46:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136cbc8b media-libs/embree: unkeyword 3.13.4 for ~x86, no revdeps Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/embree/embree-3.13.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 3c9f945a7e83..247a69b0fb6c 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64" 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[@]%:*}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
commit: 6e16952c578fdc0e662e2986bf8139df0d8c3530 Author: Sebastian Parborg gmail com> AuthorDate: Mon May 8 12:59:51 2023 + Commit: Sam James gentoo org> CommitDate: Tue May 9 17:50:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e16952c media-libs/embree: Fix arches and REQUIRED_USE Embree does not support anything else than amd64 and arm64. The other arches will not compile. arm64 needs a patch to work on linux in the current 3.x.x release Closes: https://bugs.gentoo.org/851705 Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.5.ebuild | 12 ++--- .../embree/files/embree-3.13.5-fix-arm64.patch | 53 ++ 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild index 7b1ffb2691e9..1f94e528f380 100644 --- a/media-libs/embree/embree-3.13.5.ebuild +++ b/media-libs/embree/embree-3.13.5.ebuild @@ -11,13 +11,11 @@ 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 ) +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 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 )" +IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]}" +REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )" BDEPEND=" virtual/pkgconfig @@ -39,6 +37,7 @@ DOCS=( CHANGELOG.md README.md readme.pdf ) PATCHES=( "${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.patch + "${FILESDIR}"/${PN}-3.13.5-fix-arm64.patch ) pkg_setup() { @@ -106,6 +105,7 @@ src_configure() { -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx) -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2) -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq) + # TODO look into neon 2x support -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) diff --git a/media-libs/embree/files/embree-3.13.5-fix-arm64.patch b/media-libs/embree/files/embree-3.13.5-fix-arm64.patch new file mode 100644 index ..ae6e39c43e75 --- /dev/null +++ b/media-libs/embree/files/embree-3.13.5-fix-arm64.patch @@ -0,0 +1,53 @@ +Based on: https://github.com/embree/embree/commit/82ca6b5ccb7abe0403a658a0e079926478f04cb1 +Tested in: https://bugs.gentoo.org/851705 + +Without this patch, it will only build on ARM Mac computers + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e807351401..e8b08b1247 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -160,11 +160,13 @@ OPTION(EMBREE_MIN_WIDTH "Enables min-width feature to enlarge curve and point th + # Platform detection and defaults + ## + +-IF (APPLE) +- IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")) +-MESSAGE(STATUS "Building for Apple silicon") +-SET(EMBREE_ARM ON) +- ENDIF() ++# detect ARM compilation ++IF (APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")) ++ MESSAGE(STATUS "Building for Apple silicon") ++ SET(EMBREE_ARM ON) ++ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") ++ MESSAGE(STATUS "Building for AArch64") ++ SET(EMBREE_ARM ON) + ENDIF() + + SET(EMBREE_TASKING_SYSTEM "TBB" CACHE STRING "Selects tasking system") +diff --git a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake +index f36d79ca25..365212bdda 100644 +--- a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake +@@ -26,9 +26,12 @@ IF (EMBREE_IGNORE_CMAKE_CXX_FLAGS) + ENDIF() + + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++ + IF (EMBREE_ARM) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char") # treat 'char' as 'signed char' ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions") # allow lax vector type conversions + ENDIF (EMBREE_ARM) ++ + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") # enables most warnings + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security") # enables string format vulnerability warnings + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")# disables clearing an object of type ‘XXX’ with no trivial copy-assignment; use assignment or value-initialization instead +@@ -89,7 +92,6 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
commit: a745fa9c26344a753e39289694f72b9375aaba1f Author: Sebastian Parborg gmail com> AuthorDate: Mon May 1 11:48:53 2023 + Commit: Sam James gentoo org> CommitDate: Mon May 1 15:14:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a745fa9c media-libs/embree: Bump to 3.13.5 Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/embree/Manifest | 1 + media-libs/embree/embree-3.13.5.ebuild | 134 + .../files/embree-3.13.5-fix-openimageio-test.patch | 71 +++ 3 files changed, 206 insertions(+) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index a056b4c9a819..514a411dba17 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -1 +1,2 @@ DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca +DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95 diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild new file mode 100644 index ..7b1ffb2691e9 --- /dev/null +++ b/media-libs/embree/embree-3.13.5.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic linux-info + +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 )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=media-libs/glfw-3.2.1 + virtual/opengl + ispc? ( dev-lang/ispc ) + tbb? ( dev-cpp/tbb:= ) + tutorial? ( + media-libs/libjpeg-turbo + >=media-libs/libpng-1.6.34:0= + >=media-libs/openimageio-1.8.7:0= + ) +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md README.md readme.pdf ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.13.5-fix-openimageio-test.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 +} + +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 +
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 8f7c2a576b8f1c5a3ea8ff16bafbc3483b7570d3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 26 07:48:44 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 26 19:16:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7c2a57 media-libs/embree: drop 3.13.0-r2, 3.13.2, 3.13.3 Closes: https://bugs.gentoo.org/887549 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/embree/Manifest| 3 - media-libs/embree/embree-3.13.0-r2.ebuild | 113 - media-libs/embree/embree-3.13.2.ebuild| 132 -- media-libs/embree/embree-3.13.3.ebuild| 132 -- 4 files changed, 380 deletions(-) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index cf510251420e..a056b4c9a819 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -1,4 +1 @@ -DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f -DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f -DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca diff --git a/media-libs/embree/embree-3.13.0-r2.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild deleted file mode 100644 index f72392a0812c.. --- a/media-libs/embree/embree-3.13.0-r2.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 ~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 ${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 "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 -
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 5dd50ab7705b09c6cef8a015fdf8c9d4e41ef248 Author: Sam James gentoo org> AuthorDate: Mon Dec 26 03:19:30 2022 + Commit: Sam James gentoo org> CommitDate: Mon Dec 26 03:19:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd50ab7 media-libs/embree: Stabilize 3.13.4 amd64, #887549 Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 10b3cb8db86e..3c9f945a7e83 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -11,7 +11,7 @@ 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" +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[@]%:*}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/files/, media-libs/embree/
commit: 8736545cf858627f6f1725da4bcf375e7216a5bb Author: Sebastian Parborg gmail com> AuthorDate: Wed Jul 20 15:57:12 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 11 07:33:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8736545c media-libs/embree: Version bump to 3.13.4 Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Joonas Niilola gentoo.org> media-libs/embree/Manifest | 1 + media-libs/embree/embree-3.13.4.ebuild | 133 + .../files/embree-3.13.4-fix-openimageio-test.patch | 71 +++ 3 files changed, 205 insertions(+) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index 9807f5532831..cf510251420e 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -1,3 +1,4 @@ DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd +DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild new file mode 100644 index ..7d71777f2596 --- /dev/null +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2022 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="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 )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=media-libs/glfw-3.2.1 + virtual/opengl + ispc? ( dev-lang/ispc ) + tbb? ( dev-cpp/tbb:= ) + tutorial? ( + media-libs/libjpeg-turbo + >=media-libs/libpng-1.6.34:0= + >=media-libs/openimageio-1.8.7:0= + ) +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md README.md readme.pdf ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.13.4-fix-openimageio-test.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 +} + +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 +
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: bfe296c6fc4595e250ea782ec0d714c6a099b13c Author: Joonas Niilola gentoo org> AuthorDate: Thu Aug 11 07:29:50 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 11 07:33:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe296c6 media-libs/embree: multi-line REQUIRED_USE for readability, consistency Signed-off-by: Joonas Niilola gentoo.org> media-libs/embree/embree-3.13.4.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 7d71777f2596..0cae154ea5cd 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -16,7 +16,8 @@ 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 )" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) + x86? ( cpu_flags_x86_sse2 )" BDEPEND=" virtual/pkgconfig
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 260b412b77143995ce60236610dd2abdaaef27c3 Author: Joonas Niilola gentoo org> AuthorDate: Thu Aug 11 07:32:52 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 11 07:33:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260b412b media-libs/embree: drop unused eclass inherit Signed-off-by: Joonas Niilola gentoo.org> media-libs/embree/embree-3.13.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 0cae154ea5cd..10b3cb8db86e 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic linux-info toolchain-funcs +inherit cmake flag-o-matic linux-info DESCRIPTION="Collection of high-performance ray tracing kernels" HOMEPAGE="https://github.com/embree/embree;
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: a610f8dcd1293282cd6548172fbc4c501ecc4027 Author: Sam James gentoo org> AuthorDate: Tue Nov 23 21:35:34 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 23 21:35:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a610f8dc media-libs/embree: add 3.13.2 Signed-off-by: Sam James gentoo.org> media-libs/embree/Manifest | 1 + media-libs/embree/embree-3.13.2.ebuild | 132 + 2 files changed, 133 insertions(+) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index cc27e4a85af7..f7fae53b125f 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -1 +1,2 @@ DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f +DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f diff --git a/media-libs/embree/embree-3.13.2.ebuild b/media-libs/embree/embree-3.13.2.ebuild new file mode 100644 index ..94efef93e9b9 --- /dev/null +++ b/media-libs/embree/embree-3.13.2.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 static-libs ${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 "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 + + # 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 + #
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 6c0347d62785bd4ed21773ca7afa708090bc3032 Author: Sam James gentoo org> AuthorDate: Sun Oct 31 05:53:35 2021 + Commit: Sam James gentoo org> CommitDate: Sun Oct 31 05:53:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0347d6 media-libs/embree: Stabilize 3.13.0-r2 amd64, #803884 Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.0-r2.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild index fb7a6b0b575..136ad000762 100644 --- a/media-libs/embree/embree-3.13.0-r2.ebuild +++ b/media-libs/embree/embree-3.13.0-r2.ebuild @@ -11,7 +11,7 @@ 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" +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[@]%:*}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: c8cf3014f3c41600d43580a9516b1766186e0d15 Author: Sam James gentoo org> AuthorDate: Fri Oct 29 22:16:54 2021 + Commit: Sam James gentoo org> CommitDate: Fri Oct 29 22:22:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cf3014 media-libs/embree: add tbb subslot operator Signed-off-by: Sam James gentoo.org> media-libs/embree/{embree-3.13.0-r1.ebuild => embree-3.13.0-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild similarity index 99% rename from media-libs/embree/embree-3.13.0-r1.ebuild rename to media-libs/embree/embree-3.13.0-r2.ebuild index ad1b682ba09..fb7a6b0b575 100644 --- a/media-libs/embree/embree-3.13.0-r1.ebuild +++ b/media-libs/embree/embree-3.13.0-r2.ebuild @@ -24,7 +24,7 @@ RDEPEND=" >=media-libs/glfw-3.2.1 virtual/opengl ispc? ( dev-lang/ispc ) - tbb? ( dev-cpp/tbb ) + tbb? ( dev-cpp/tbb:= ) tutorial? ( >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7:0=
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 83672643c5b1c40210084b5d5ed1170c846e3c77 Author: Sam James gentoo org> AuthorDate: Sun Sep 19 03:29:18 2021 + Commit: Sam James gentoo org> CommitDate: Sun Sep 19 03:29:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83672643 media-libs/embree: Keyword 3.13.0-r1 ppc64, #795279 Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild index b3e2399b41c..ad1b682ba09 100644 --- a/media-libs/embree/embree-3.13.0-r1.ebuild +++ b/media-libs/embree/embree-3.13.0-r1.ebuild @@ -11,7 +11,7 @@ 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 ~x86" +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[@]%:*}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: c8255dc5a617930f74760a6f4147f1742efda1fa Author: Sam James gentoo org> AuthorDate: Sun Sep 19 03:08:13 2021 + Commit: Sam James gentoo org> CommitDate: Sun Sep 19 03:08:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8255dc5 media-libs/embree: Keyword 3.13.0-r1 arm, #795279 Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild index 4c2719eb7c6..b3e2399b41c 100644 --- a/media-libs/embree/embree-3.13.0-r1.ebuild +++ b/media-libs/embree/embree-3.13.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~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[@]%:*}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 0898a38e10c58b65e1efdf8a40d97947b0ff2447 Author: Sam James gentoo org> AuthorDate: Sun Sep 19 03:08:02 2021 + Commit: Sam James gentoo org> CommitDate: Sun Sep 19 03:08:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0898a38e media-libs/embree: Keyword 3.13.0-r1 arm64, #795279 Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild index f77d5a1eb87..4c2719eb7c6 100644 --- a/media-libs/embree/embree-3.13.0-r1.ebuild +++ b/media-libs/embree/embree-3.13.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~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[@]%:*}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 6e17560f8922f9b12c3184946b691cb016e58667 Author: Sam James gentoo org> AuthorDate: Wed Aug 4 02:24:11 2021 + Commit: Sam James gentoo org> CommitDate: Wed Aug 4 02:24:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e17560f 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 gentoo.org> media-libs/embree/{embree-3.13.0.ebuild => embree-3.13.0-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild similarity index 100% rename from media-libs/embree/embree-3.13.0.ebuild rename to media-libs/embree/embree-3.13.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 687e88e1d62e728b09144c89932f3e9dec90e215 Author: Sebastian Parborg gmail com> AuthorDate: Sat Jun 12 18:24:02 2021 + Commit: Sam James gentoo org> CommitDate: Wed Aug 4 02:14:52 2021 + 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 gmail.com> Signed-off-by: Sam James 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 @@ Enables double indexed poly layout. - - When enabled, Embree compiles with stack protection against return address overrides. - Build Embree with support for ISPC applications. Enables ray mask support. + + When enabled, Embree compiles with stack protection against return address overrides. + Stack protection will wield a minor performance decrease in return for higher security. + Use TBB instead of the built-in Embree tasking system.
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 9656f71d32c51af1206273864a10b52f60b5157c Author: Sam James gentoo org> AuthorDate: Thu Jun 10 17:53:19 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jun 10 17:53:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9656f71d media-libs/embree: set IUSE=+raymask Blender is the only reverse dependency and it needs this enabled. Reported-by: Kobboi Signed-off-by: Sam James gentoo.org> media-libs/embree/embree-3.13.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0.ebuild index 548f969a2cf..7fb5564741f 100644 --- a/media-libs/embree/embree-3.13.0.ebuild +++ b/media-libs/embree/embree-3.13.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="3" 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 static-libs ${CPU_FLAGS[@]%:*}" BDEPEND=" virtual/pkgconfig "
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: b3c1f19a681667a0ed090285f039ec6425eb38d8 Author: Sebastian Parborg gmail com> AuthorDate: Wed Apr 28 00:50:48 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jun 10 00:19:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c1f19a media-libs/embree: New package Embree is a collection of high-performance ray tracing kernels, developed at Intel. The target users of Embree are graphics application engineers who want to improve the performance of their photo-realistic rendering application by leveraging Embree's performance-optimized ray tracing kernels. Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/embree/Manifest | 1 + media-libs/embree/embree-3.13.0.ebuild | 107 + media-libs/embree/metadata.xml | 42 + 3 files changed, 150 insertions(+) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest new file mode 100644 index 000..cc27e4a85af --- /dev/null +++ b/media-libs/embree/Manifest @@ -0,0 +1 @@ +DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0.ebuild new file mode 100644 index 000..548f969a2cf --- /dev/null +++ b/media-libs/embree/embree-3.13.0.ebuild @@ -0,0 +1,107 @@ +# 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; +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~x86" +SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SLOT="3" +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[@]%:*}" +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + ispc? ( dev-lang/ispc ) + >=media-libs/glfw-3.2.1 + tbb? ( dev-cpp/tbb ) + tutorial? ( + >=media-libs/libpng-1.6.34:0= + >=media-libs/openimageio-1.8.7 + virtual/jpeg:0 + ) + virtual/opengl +" +DEPEND="${RDEPEND}" +RESTRICT="mirror" +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=( + -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
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/, profiles/
commit: 228561ab0d314414b61b8dccc22c5436aacb9b71 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 14 19:55:52 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Aug 14 20:00:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228561ab media-libs/embree: Remove last-rited pkg, #595396 media-libs/embree/Manifest| 1 - media-libs/embree/embree-2.8.0.ebuild | 59 --- media-libs/embree/metadata.xml| 14 - profiles/package.mask | 4 --- 4 files changed, 78 deletions(-) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest deleted file mode 100644 index d6f46d9a81a..000 --- a/media-libs/embree/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST embree-2.8.0.tar.gz 1728824 SHA256 5d070241141161d7ec46fcc7fb9998226738c37e1c4a16b93420dba7d9068b81 SHA512 df9e9a66a8f5972bf22eb7d03d8d6cd17f06a10105f7f42cb6866d76cd203c94496df808558e9aad8b407e7e7d962c0f543d49cd86784f877206654414f3d162 WHIRLPOOL 9685a525d4ee9788ddce3f5e6e20729f619484790e412d22e8e58aac825ad70dbb825b48bf515f10ca8e1c330899fa565912cc4aefe2844c9ec8dea22387ac68 diff --git a/media-libs/embree/embree-2.8.0.ebuild b/media-libs/embree/embree-2.8.0.ebuild deleted file mode 100644 index df3fa0c4a82..000 --- a/media-libs/embree/embree-2.8.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit cmake-utils multilib toolchain-funcs flag-o-matic - -DESCRIPTION="Collection of high-performance ray tracing kernels" -HOMEPAGE="https://embree.github.io; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick ispc jpeg openexr png static-libs" - -RDEPEND="dev-cpp/tbb - media-libs/freeglut - imagemagick? ( - || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) - ) - ispc? ( dev-lang/ispc ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng:0 )" -DEPEND="${RDEPEND}" - -src_prepare() { - filter-flags "-march=*" - sed -e "s:PREFIX}/lib:PREFIX}/$(get_libdir):g" \ - -e "s:lib/cmake:$(get_libdir)/cmake:g" \ - -e "/LICENSE.txt/d" \ - -e "/DIRECTORY tutorials/d" \ - -i common/cmake/package.cmake || die - sed -e "s/gcc/$(tc-getCC)/" \ - -e "s/g++/$(tc-getCXX)/" \ - -e "s/-fPIC/${CXXFLAGS} &/" \ - -i common/cmake/gcc.cmake || die - sed -e "/COMPONENT lib/ s/\(DESTINATION \)lib/\1$(get_libdir)/g" \ - -i kernels/xeon/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_TUTORIALS=OFF - $(cmake-utils_use_enable static-libs STATIC_LIB) - $(cmake-utils_use_enable ispc ISPC_SUPPORT) - $(cmake-utils_use_use jpeg LIBJPEG) - $(cmake-utils_use_use png LIBPNG) - $(cmake-utils_use_use imagemagick IMAGE_MAGICK) - $(cmake-utils_use_use openexr OPENEXR) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so -} diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml deleted file mode 100644 index d0b41d94ff0..000 --- a/media-libs/embree/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - Enables support for the Intel SPMD Program Compiler. - Enables BMP, GIF, PNG, TGA, TIFF image codecs. - Enables PNG image codecs. - Enables JPEG image codecs. - Enables OpenEXR image codecs. - - - embree/embree - - diff --git a/profiles/package.mask b/profiles/package.mask index 652ae697427..e5d8272cace 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -308,10 +308,6 @@ net-analyzer/nepenthes app-text/mbtpdfasm # Pacho Ramos(14 Jul 2017) -# No reverse deps, not buildable with gcc6 (#595396). Removal in a month. -media-libs/embree - -# Pacho Ramos (14 Jul 2017) # Multiple unresolved bugs (#600680), need major version bumps and a # maintainer, removal in 2 months. dev-libs/libRocket
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: a06fb48bbf1e42520e2da163dd3c5a2e21db6874 Author: Pacho Ramos gentoo org> AuthorDate: Tue Jun 20 12:40:52 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Jun 20 12:53:24 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06fb48b media-libs/embree: Cleanup metadata due to retirement Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/embree/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml index 187b64dcb9c..d0b41d94ff0 100644 --- a/media-libs/embree/metadata.xml +++ b/media-libs/embree/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - xarthis...@gentoo.org - Kacper Kowalik - Enables support for the Intel SPMD Program Compiler. Enables BMP, GIF, PNG, TGA, TIFF image codecs.
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: 31291e49771f2376b4fdafd44a3846fd7fcc622f Author: Kacper Kowalik gentoo org> AuthorDate: Fri Feb 12 22:43:17 2016 + Commit: Kacper Kowalik gentoo org> CommitDate: Fri Feb 12 22:43:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31291e49 media-libs/embree: Initial import, ebuild written by me. Package-Manager: portage-2.2.27 media-libs/embree/Manifest| 1 + media-libs/embree/embree-2.8.0.ebuild | 60 +++ media-libs/embree/metadata.xml| 15 + 3 files changed, 76 insertions(+) diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest new file mode 100644 index 000..d6f46d9 --- /dev/null +++ b/media-libs/embree/Manifest @@ -0,0 +1 @@ +DIST embree-2.8.0.tar.gz 1728824 SHA256 5d070241141161d7ec46fcc7fb9998226738c37e1c4a16b93420dba7d9068b81 SHA512 df9e9a66a8f5972bf22eb7d03d8d6cd17f06a10105f7f42cb6866d76cd203c94496df808558e9aad8b407e7e7d962c0f543d49cd86784f877206654414f3d162 WHIRLPOOL 9685a525d4ee9788ddce3f5e6e20729f619484790e412d22e8e58aac825ad70dbb825b48bf515f10ca8e1c330899fa565912cc4aefe2844c9ec8dea22387ac68 diff --git a/media-libs/embree/embree-2.8.0.ebuild b/media-libs/embree/embree-2.8.0.ebuild new file mode 100644 index 000..6f6926d --- /dev/null +++ b/media-libs/embree/embree-2.8.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils multilib toolchain-funcs flag-o-matic + +DESCRIPTION="Collection of high-performance ray tracing kernels" +HOMEPAGE="https://embree.github.io; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick ispc jpeg openexr png static-libs" + +RDEPEND="dev-cpp/tbb + media-libs/freeglut + imagemagick? ( + || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) + ) + ispc? ( dev-lang/ispc ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng:0 )" +DEPEND="${RDEPEND}" + +src_prepare() { + filter-flags "-march=*" + sed -e "s:PREFIX}/lib:PREFIX}/$(get_libdir):g" \ + -e "s:lib/cmake:$(get_libdir)/cmake:g" \ + -e "/LICENSE.txt/d" \ + -e "/DIRECTORY tutorials/d" \ + -i common/cmake/package.cmake || die + sed -e "s/gcc/$(tc-getCC)/" \ + -e "s/g++/$(tc-getCXX)/" \ + -e "s/-fPIC/${CXXFLAGS} &/" \ + -i common/cmake/gcc.cmake || die + sed -e "/COMPONENT lib/ s/\(DESTINATION \)lib/\1$(get_libdir)/g" \ + -i kernels/xeon/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_TUTORIALS=OFF + $(cmake-utils_use_enable static-libs STATIC_LIB) + $(cmake-utils_use_enable ispc ISPC_SUPPORT) + $(cmake-utils_use_use jpeg LIBJPEG) + $(cmake-utils_use_use png LIBPNG) + $(cmake-utils_use_use imagemagick IMAGE_MAGICK) + $(cmake-utils_use_use openexr OPENEXR) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so +} diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml new file mode 100644 index 000..b4dc96f --- /dev/null +++ b/media-libs/embree/metadata.xml @@ -0,0 +1,15 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + xarthis...@gentoo.org + Kacper Kowalik + + + Enables support for the Intel SPMD Program Compiler. + Enables BMP, GIF, PNG, TGA, TIFF image codecs. + Enables PNG image codecs. + Enables JPEG image codecs. + Enables OpenEXR image codecs. + +