gentoo auto-resync : 02:04:2024 - 14:14:14

3 files changed, 55 insertions, 18 deletions

diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index e2a05e34260f..37e63a88b227 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,11 +1,11 @@
 AUX embree-3.13.4-fix-openimageio-test.patch 4663 BLAKE2B 2b6a5422f51977317c1149673bc8624f56d363d8362f2d3678c86e661d1f9eb6a2319df241d736a0da8e586d86fa6ff524c3fc98fe564f511551efe756b80d7c SHA512 b3b414f8068af8f45ceca91653b9e8cd2f06cfd7cafbd25a9b97ac6e3f30a27f22bbb121be34ee154e9910d3668f798d226199a843316762486ae85685a2ee9d
 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.0-dont-install-tutorials.patch 10219 BLAKE2B ec34fb2456972bb09dd5ce64fa771160b57f4266b834ba92542303817a799c1c2c799e99e3948f779fab3829d25e4776d603dcb6d7828f7505aeb1c9fe1e3a32 SHA512 b0a1bebce5ba6647969552ba1d5061ad8aa7db79fd5f8dc8ba4417b4749811ea2f0076359a61e0cd8bfd46e80e72af3cc6a6212a55e9690b45e45d013e270ae0
+AUX embree-4.3.1-dont-install-tutorials.patch 10020 BLAKE2B ec13bf359eb36059062df7ff1ec3dc9b96d5a3a24cf3de7462200fd5e9759c2697906a407909b6ada4c92a922da3b860e04953e8000d33fa49ba6173e03853be SHA512 82363ace042d6962f3e693178579b1deca709fd6de89b4e893f954b8ca15e17cc76bbb7c0ab0b89a7c91668029d257eee15d1ca86165d659daab120bbd23c4f2
 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
+DIST embree-4.3.1.tar.gz 71110988 BLAKE2B 0ab183fe8fae3948b319c74a922c001d0567d223adab74da3a0f55fd4e4fd5c2c17afeb065da706d411238b7877e208e7041aad9430f109e606ed1a9dd23646f SHA512 da7710c6dfaa90970c223a503702fc7c7dd86c1397372b3d6f51c4377d28d8e62b90ee8c99b70e3aa49e16971a5789bb8f588ea924881b9dd5dd8d5fcd16518a
 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.0.ebuild 3544 BLAKE2B a05f9935034074cad3af13b4eb0e0b2dd5d443603660476c3d8a6d8fa88a79123f31320ae2e2b6a19fbfc350457e91dde3c29451080fc2233f0d02c3ab099622 SHA512 517f3c94682bfc2f255322fd5cb972671c4bdf10264580c62b55c5ff9bd98216078a5489b87a90d9b9eb23d5ee05b803d5d6f67dfa3c058a301806a395fccabe
+EBUILD embree-4.3.1.ebuild 5293 BLAKE2B 68660984698395d7d241beeda4deb7b675bf8e31e22ddf1bba090c7d4109d281258783886a1e6f721ecdb1165038801fda632e1f3e688e68f9078311d2098a7d SHA512 a4b55b55e55d2db9e3d96723d9ce13afab31d02c5ad7e1f7ad9f913deee0fc404fa70d08e9ee24b6280426cae9777f1f19e563464a2591837146f4fd726a6b55
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-4.3.0.ebuild b/media-libs/embree/embree-4.3.1.ebuild
index 04ed9ac7aeb6..4587a4b2855a 100644
--- a/media-libs/embree/embree-4.3.0.ebuild
+++ b/media-libs/embree/embree-4.3.1.ebuild
@@ -10,13 +10,16 @@ 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"
+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[@]}"
+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[@]} )"
+REQUIRED_USE="
+	amd64? ( || ( ${X86_CPU_FLAGS[*]/#/cpu_flags_x86_} ) )
+	arm64? ( cpu_flags_arm_neon )
+"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -30,7 +33,7 @@ DEPEND="${RDEPEND}"
 DOCS=( CHANGELOG.md README.md readme.pdf )
 
 PATCHES=(
-	"${FILESDIR}"/embree-4.3.0-dont-install-tutorials.patch
+	"${FILESDIR}/embree-4.3.1-dont-install-tutorials.patch"
 )
 
 pkg_setup() {
@@ -46,6 +49,15 @@ 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() {
@@ -94,6 +106,9 @@ src_configure() {
 		-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")
@@ -116,8 +131,37 @@ src_configure() {
 			-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.0-dont-install-tutorials.patch b/media-libs/embree/files/embree-4.3.1-dont-install-tutorials.patch
index 8643c7168a71..5f26533c5c44 100644
--- a/media-libs/embree/files/embree-4.3.0-dont-install-tutorials.patch
+++ b/media-libs/embree/files/embree-4.3.1-dont-install-tutorials.patch
@@ -16,7 +16,7 @@ diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
 index f7a182f7f..92ac45de0 100644
 --- a/common/cmake/package.cmake
 +++ b/common/cmake/package.cmake
-@@ -145,7 +145,7 @@ ENDIF()
+@@ -151,7 +151,7 @@ ENDIF()
  # Install Models
  ##############################################################
  
@@ -113,8 +113,8 @@ diff --git a/tutorials/embree_info/CMakeLists.txt b/tutorials/embree_info/CMakeL
 index fa8b74b89..6d10279ff 100644
 --- a/tutorials/embree_info/CMakeLists.txt
 +++ b/tutorials/embree_info/CMakeLists.txt
-@@ -18,8 +18,10 @@ ADD_EXECUTABLE(embree_info embree_info.cpp)
- TARGET_LINK_LIBRARIES(embree_info embree)
+@@ -22,8 +22,10 @@ ELSE()
+ ENDIF()
  
  SET_PROPERTY(TARGET embree_info PROPERTY FOLDER tutorials/single)
 -INSTALL(TARGETS embree_info DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
@@ -126,13 +126,6 @@ index fa8b74b89..6d10279ff 100644
  
  IF (EMBREE_SYCL_SUPPORT)
    SET_PROPERTY(TARGET embree_info APPEND PROPERTY COMPILE_FLAGS "-fsycl -Xclang -fsycl-allow-func-ptr -fsycl-targets=spir64")
-@@ -31,4 +33,4 @@ IF (COMMAND SIGN_TARGET)
-   SIGN_TARGET(embree_info)
- ENDIF()
- 
--ENDIF()
-\ No newline at end of file
-+ENDIF()
 diff --git a/tutorials/embree_tests/CMakeLists.txt b/tutorials/embree_tests/CMakeLists.txt
 index ab62b1954..b3647bc2d 100644
 --- a/tutorials/embree_tests/CMakeLists.txt