From 518b45bffd19d0b75715f338985f96c459f9d129 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Sep 2024 12:28:34 +0100 Subject: gentoo auto-resync : 04:09:2024 - 12:28:34 --- media-libs/embree/Manifest | 5 +- media-libs/embree/embree-3.13.5-r1.ebuild | 143 ++++++++++++++++++ media-libs/embree/embree-3.13.5.ebuild | 142 ----------------- media-libs/embree/embree-4.3.1-r1.ebuild | 168 +++++++++++++++++++++ media-libs/embree/embree-4.3.1.ebuild | 167 -------------------- .../files/embree-4.3.2-fix-output-operator.patch | 43 ++++++ 6 files changed, 357 insertions(+), 311 deletions(-) create mode 100644 media-libs/embree/embree-3.13.5-r1.ebuild delete mode 100644 media-libs/embree/embree-3.13.5.ebuild create mode 100644 media-libs/embree/embree-4.3.1-r1.ebuild delete mode 100644 media-libs/embree/embree-4.3.1.ebuild create mode 100644 media-libs/embree/files/embree-4.3.2-fix-output-operator.patch (limited to 'media-libs/embree') diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index 6056f8d9316c..ba3b32eb8ac0 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -2,12 +2,13 @@ AUX embree-3.13.4-fix-openimageio-test.patch 4663 BLAKE2B 2b6a5422f51977317c1149 AUX embree-3.13.5-fix-arm64.patch 2739 BLAKE2B 9e636bc3f4e49564f156cc977c98466bb58efe772af099143feac8e887cb81b9124332268f08cc11e72e9fb4d316f20a44bda7e7a96c906e7091f19fc0408d21 SHA512 392848fce7faf2085eb1b06bd7c7490fd4f0e356d30f9967b18013376ab7f64e9b31bd4144ddbb1b5492c560044b354382fbdbc9377e7736961fe2dd37f893fe AUX embree-3.13.5-fix-openimageio-test.patch 4526 BLAKE2B c1560a8122df45ad860ac9d19108cdc4920ab2e4d06c6ba968d6c43e88e4c6d47c26a463abf0f21db8290572172b6448b4ec579b6df9875b4e55688191cfed13 SHA512 f40d3cbcd62f16aea89e3d1873dccf020a2aa07679f5f99ae47f3fcc9e66dab9f2422c713a8cbc39dd1c09a2a838e3dbb4b859c785f503a154eee4cc244a3cc8 AUX embree-4.3.1-dont-install-tutorials.patch 10020 BLAKE2B ec13bf359eb36059062df7ff1ec3dc9b96d5a3a24cf3de7462200fd5e9759c2697906a407909b6ada4c92a922da3b860e04953e8000d33fa49ba6173e03853be SHA512 82363ace042d6962f3e693178579b1deca709fd6de89b4e893f954b8ca15e17cc76bbb7c0ab0b89a7c91668029d257eee15d1ca86165d659daab120bbd23c4f2 +AUX embree-4.3.2-fix-output-operator.patch 1747 BLAKE2B 6c2dd9c2e3b5a7a33dd7eaf2159845cdadc524ddd5de648b7a484917cc1d1315c223816401a59424038722ca82cf4841d524a400eaec22dcce4b508723835515 SHA512 20e36b8513196d7c7d33361be4206d65018e8ec4fe6346f150dbf972fbd22b1b5a3ef190dce860804946d4f2e3aae9c1b276e1779bb7045d0b02f502673d4e33 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-3.13.5-r1.ebuild 3917 BLAKE2B a50704b0732bb8c77d1bdfeb031be56b56c2a28c54da228d81f961efb685a321b71c24e207f782a182848efc1855efc61edf646be27b7a9e1e8e2c14173e7312 SHA512 26e456865d9fc15b4475442898462178cc2eda1869061b234b62fbcd2a74abdb14535a1837ceb18842c78428d6aab4b841e310010940b9003e8489c8bba055bb +EBUILD embree-4.3.1-r1.ebuild 5346 BLAKE2B a9c23a3f08214530dc4ed6936645b212e06470bfdd368c320b359fd97508091f05a2312b2964c141c06602dc04ddddb04b0ce866653786cfef984e0a49cafd8e SHA512 3c2c6c33d74aabefa19b54ef5f663693716cc7b37a7920213109595ab81be9337f71bd5d1479a89c84eb7c16159451fcb847f9ae23dd15f54086f0898d733c5f 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-3.13.5-r1.ebuild b/media-libs/embree/embree-3.13.5-r1.ebuild new file mode 100644 index 000000000000..44cfda6f3f18 --- /dev/null +++ b/media-libs/embree/embree-3.13.5-r1.ebuild @@ -0,0 +1,143 @@ +# 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="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 tutorial ${CPU_FLAGS[@]}" +REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )" + +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 + "${FILESDIR}"/${PN}-3.13.5-fix-arm64.patch + "${FILESDIR}/${PN}-4.3.2-fix-output-operator.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() { + # -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=( + # 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) + # 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) + -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_TUTORIALS_LIBJPEG=ON + -DEMBREE_TUTORIALS_LIBPNG=ON + -DEMBREE_TUTORIALS_OPENIMAGEIO=ON + ) + fi + + cmake_src_configure +} diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild deleted file mode 100644 index 02aed35aa2cc..000000000000 --- a/media-libs/embree/embree-3.13.5.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# 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="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 tutorial ${CPU_FLAGS[@]}" -REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )" - -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 - "${FILESDIR}"/${PN}-3.13.5-fix-arm64.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() { - # -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=( - # 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) - # 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) - -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_TUTORIALS_LIBJPEG=ON - -DEMBREE_TUTORIALS_LIBPNG=ON - -DEMBREE_TUTORIALS_OPENIMAGEIO=ON - ) - fi - - cmake_src_configure -} diff --git a/media-libs/embree/embree-4.3.1-r1.ebuild b/media-libs/embree/embree-4.3.1-r1.ebuild new file mode 100644 index 000000000000..7459d7d763b4 --- /dev/null +++ b/media-libs/embree/embree-4.3.1-r1.ebuild @@ -0,0 +1,168 @@ +# 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_} ) ) + arm64? ( 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" + "${FILESDIR}/${PN}-4.3.2-fix-output-operator.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 + + # 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) + # 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) + -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 + ) + + # 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 + -DEMBREE_TUTORIALS_LIBJPEG=OFF + -DEMBREE_TUTORIALS_LIBPNG=OFF + -DEMBREE_TUTORIALS_OPENIMAGEIO=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO="yes" + ) + 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$' + '^viewer_models_curves_round_line_segments_7.ecs$' + '^viewer_models_curves_round_line_segments_8.ecs$' + '^viewer_models_curves_round_line_segments_9.ecs$' + '^viewer_coherent_models_curves_round_line_segments_3.ecs$' + '^viewer_coherent_models_curves_round_line_segments_7.ecs$' + '^viewer_coherent_models_curves_round_line_segments_8.ecs$' + '^viewer_coherent_models_curves_round_line_segments_9.ecs$' + '^viewer_quad_coherent_models_curves_round_line_segments_3.ecs$' + '^viewer_quad_coherent_models_curves_round_line_segments_7.ecs$' + '^viewer_quad_coherent_models_curves_round_line_segments_8.ecs$' + '^viewer_quad_coherent_models_curves_round_line_segments_9.ecs$' + '^viewer_grid_coherent_models_curves_round_line_segments_3.ecs$' + '^viewer_grid_coherent_models_curves_round_line_segments_7.ecs$' + '^viewer_grid_coherent_models_curves_round_line_segments_8.ecs$' + '^viewer_grid_coherent_models_curves_round_line_segments_9.ecs$' + '^hair_geometry$' + '^embree_tests$' + ) + + cmake_src_test +} diff --git a/media-libs/embree/embree-4.3.1.ebuild b/media-libs/embree/embree-4.3.1.ebuild deleted file mode 100644 index 4587a4b2855a..000000000000 --- a/media-libs/embree/embree-4.3.1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# 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_} ) ) - arm64? ( 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 - - # 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) - # 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) - -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 - ) - - # 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 - -DEMBREE_TUTORIALS_LIBJPEG=OFF - -DEMBREE_TUTORIALS_LIBPNG=OFF - -DEMBREE_TUTORIALS_OPENIMAGEIO=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO="yes" - ) - 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$' - '^viewer_models_curves_round_line_segments_7.ecs$' - '^viewer_models_curves_round_line_segments_8.ecs$' - '^viewer_models_curves_round_line_segments_9.ecs$' - '^viewer_coherent_models_curves_round_line_segments_3.ecs$' - '^viewer_coherent_models_curves_round_line_segments_7.ecs$' - '^viewer_coherent_models_curves_round_line_segments_8.ecs$' - '^viewer_coherent_models_curves_round_line_segments_9.ecs$' - '^viewer_quad_coherent_models_curves_round_line_segments_3.ecs$' - '^viewer_quad_coherent_models_curves_round_line_segments_7.ecs$' - '^viewer_quad_coherent_models_curves_round_line_segments_8.ecs$' - '^viewer_quad_coherent_models_curves_round_line_segments_9.ecs$' - '^viewer_grid_coherent_models_curves_round_line_segments_3.ecs$' - '^viewer_grid_coherent_models_curves_round_line_segments_7.ecs$' - '^viewer_grid_coherent_models_curves_round_line_segments_8.ecs$' - '^viewer_grid_coherent_models_curves_round_line_segments_9.ecs$' - '^hair_geometry$' - '^embree_tests$' - ) - - cmake_src_test -} diff --git a/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch b/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch new file mode 100644 index 000000000000..9c28796905a5 --- /dev/null +++ b/media-libs/embree/files/embree-4.3.2-fix-output-operator.patch @@ -0,0 +1,43 @@ +https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d.patch +https://bugs.gentoo.org/938522 +https://bugs.gentoo.org/937275 + +From cda4cf1919bb2a748e78915fbd6e421a1056638d Mon Sep 17 00:00:00 2001 +From: Daniel Opitz +Date: Mon, 13 May 2024 10:17:51 +0200 +Subject: [PATCH] fix output operator, issue #486 + +--- + kernels/geometry/pointi.h | 4 ++-- + kernels/subdiv/bezier_curve.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kernels/geometry/pointi.h b/kernels/geometry/pointi.h +index f81edb9035..aba8ec4ab3 100644 +--- a/kernels/geometry/pointi.h ++++ b/kernels/geometry/pointi.h +@@ -210,9 +210,9 @@ namespace embree + }; + + /*! output operator */ +- friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line) ++ friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point) + { +- return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}"; ++ return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}"; + } + + public: +diff --git a/kernels/subdiv/bezier_curve.h b/kernels/subdiv/bezier_curve.h +index 257e0afd40..5e3b5c83b3 100644 +--- a/kernels/subdiv/bezier_curve.h ++++ b/kernels/subdiv/bezier_curve.h +@@ -135,7 +135,7 @@ namespace embree + } + + friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) { +- return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; ++ return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; + } + }; + -- cgit v1.2.3