gentoo auto-resync : 09:05:2023 - 23:42:14

3 files changed, 61 insertions, 7 deletions

diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 6ca7ca0e6f92..5bb30d44897c 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,7 +1,8 @@
 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
 DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
 DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95
 EBUILD embree-3.13.4.ebuild 3739 BLAKE2B 329e06999f84678b02a2bee9476e737a21b69a77bb409a8517131df1c784c3dd1f21905c0a035f3749e5d535f54625ae351a0204fa8e46a7e93f899a597806ff SHA512 2c4f0b25a0f50106506dfe799239504bcb31233318c9d34ec409edc3a8a34387d3f11b30218ddbd6cc88ff80f5203e56f182ad29b606f6a9673816daddc7a217
-EBUILD embree-3.13.5.ebuild 3740 BLAKE2B 1132437172f41d2bd08c871067559e3e8943feebd780f7810b51970a46decdf0bcdeeb901c3a3b2d4112fe766e77dfb2a1e6432bfe66ed5855f7910fbb81b2c3 SHA512 927aec0f390a00cb772af279ffa0f5c45e9565ce4292f4eb7d2ba34c0db611a8658b3974bf0232749e29aa98c6d28817e1f3e2f9638319e537e024b2f8d4178e
+EBUILD embree-3.13.5.ebuild 3677 BLAKE2B 81ed2229a9f0a210a2c3ff60f1f18f2a26b16e06736a3e2c0bd3c6065d143c1bcb35be389f8f682feabe91bdba38233c0a97df22ac6bc1721c499b815ad659d8 SHA512 651135bc0c89ca7a7aede6c39854fd2ad650097a98a85094e3b3344ddff5a91c20895909ef78c1cebc4f2d60488322cacb27fb7d644af98483dd8ed62111166e
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
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 000000000000..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 "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")
+ IF (APPLE)
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")   # makes sure code runs on older MacOSX versions
+   # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")             # link against libc++ which supports C++11 features
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flax-vector-conversions")
+ ELSE(APPLE)
+   IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") # issues link error for undefined symbols in shared library