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 <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35927
Signed-off-by: Sam James <sam@gentoo.org>

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/opencolorio-2.3.0:= )
 	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.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/opencolorio-2.3.0:= )
 	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.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/opencolorio-2.3.0:= )
 	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.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/opencolorio-2.3.0:= )
 	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.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? ( 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-4.0.1-r1.ebuild b/media-gfx/blender/blender-4.0.1-r1.ebuild
index 0475458f0e06..a6f05f4a1015 100644
--- a/media-gfx/blender/blender-4.0.1-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.1-r1.ebuild
@@ -71,7 +71,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.13.0[raymask] )
+	embree? ( >=media-libs/embree-3.13.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-4.0.2.ebuild b/media-gfx/blender/blender-4.0.2.ebuild
index dfad5adeb33d..28ec3c64f723 100644
--- a/media-gfx/blender/blender-4.0.2.ebuild
+++ b/media-gfx/blender/blender-4.0.2.ebuild
@@ -70,7 +70,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.13.0[raymask] )
+	embree? ( >=media-libs/embree-3.13.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-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 1af60209e3c9..8beccfa7ce4f 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -71,7 +71,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.13.0[raymask] )
+	embree? ( >=media-libs/embree-3.13.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-libs/embree/Manifest b/media-libs/embree/Manifest
index 3478edbe8dae..e007a68a16b3 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +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
+DIST embree-4.3.1.tar.gz 71110988 BLAKE2B 0ab183fe8fae3948b319c74a922c001d0567d223adab74da3a0f55fd4e4fd5c2c17afeb065da706d411238b7877e208e7041aad9430f109e606ed1a9dd23646f SHA512 da7710c6dfaa90970c223a503702fc7c7dd86c1397372b3d6f51c4377d28d8e62b90ee8c99b70e3aa49e16971a5789bb8f588ea924881b9dd5dd8d5fcd16518a
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
diff --git a/media-libs/openpgl/openpgl-0.5.0.ebuild b/media-libs/openpgl/openpgl-0.5.0.ebuild
index 02987ca560ce..2ee1fc5e7840 100644
--- a/media-libs/openpgl/openpgl-0.5.0.ebuild
+++ b/media-libs/openpgl/openpgl-0.5.0.ebuild
@@ -19,7 +19,7 @@ IUSE="${CPU_FLAGS[@]} debug"
 REQUIRED_USE="|| ( ${CPU_FLAGS[@]} )"
 
 RDEPEND="
-	media-libs/embree
+	media-libs/embree:=
 	dev-cpp/tbb:=
 "
 DEPEND="${RDEPEND}"
diff --git a/profiles/package.mask b/profiles/package.mask
index 610b77dd465d..19de1a4bd7a5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -139,11 +139,6 @@ app-misc/tek
 # Removal on 2024-04-25.  Bug #924925.
 dev-libs/zthread
 
-# Ionen Wolkens <ionen@gentoo.org> (2024-03-26)
-# Breaks revdeps that need embree-3 and seems intended to be
-# SLOT=4. Mask until the situation is improved (bug #927833).
->=media-libs/embree-4
-
 # Eli Schwartz <eschwartz93@gmail.com> (2024-03-24)
 # Broken with modern compilers, broken with LTO. Upstream website no
 # longer exists. Unmaintained in Gentoo, no reverse dependencies.