gentoo auto-resync : 05:09:2024 - 12:28:40

6 files changed, 126 insertions, 15 deletions

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 00b10ffb4559..5f155b022dd0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -8,6 +8,8 @@ AUX blender-4.0.1-openvdb-11.patch 3236 BLAKE2B e749db26f88b1e5329741a09c306ddd1
 AUX blender-4.0.2-CUDA_NVCC_FLAGS.patch 627 BLAKE2B 45c9f327ee6d2fbd45446ba0787f6de9dd77364a9a0b8b1b7683acfc5f359c5745df5747e4359ba0609cbc7dfbcb569e5f6ebace433f1ab9b87305435c9fd680 SHA512 13784a75a7fc303fa548c1d8c79e4435c40c32beb1f00c05dbe2731d1d3cd19ae202ff0b4ef9eff10e9bbd6c6f52024220a843d237dd91c27077bd91552dd6a2
 AUX blender-4.0.2-FindClang.patch 451 BLAKE2B 4b57395d440b590f9b2e097b74fbcf46dbe12fd13536cb335b914246995ede928f1208872c5044e1d0ecb1a702d0c46b656eb4b3abc3b0ed149abaf0d74bd433 SHA512 21aa3e158585184dfc1ccd931b53142cf436507a9126f4cee465214e7183553d02451babc5a636d3eb4ae0fd3ed0f0effb7b8962889f6dbec3e9476a61d0bbb2
 AUX blender-4.0.2-r1-osl-1.13.patch 14364 BLAKE2B fdee46fa3c5b1dc9a48499573e6bda242e2aa5d57f17e8b1e1a262673c5c2912c75cc8c531a30bcc0fd5019c4ff50ae089d0987e15ff1d57137e00f903356738 SHA512 2020b4f34c50ab1bb911a3b37b95a3da2a7f754e0b0ead7f651664131aa19debc00f8a8d32871b467bfdce9d83c43ca4597309351512635fdaf35f98c82266ff
+AUX blender-4.1.1-FindLLVM.patch 1388 BLAKE2B 721ba19ba6bdfde1672889d530bbd252665c12568363920561b7cfb7491e98a130cf0accc197f46a760c1bc57357183ce89903f2555125097d23361f1fe39ea7 SHA512 b13e8efaaf711bfba2a015b65153988c7ca9042e58785a483987634110c2bbdaec311744c633b7402dfaaca321984a5dc3fc549689c21fe0bfd6c27d890289da
+AUX blender-4.1.1-numpy.patch 1060 BLAKE2B 76b4c83e852f25be042c2a8267ad2b55fcbf8c3d4c3c2d1e8640e349174029de13a791d53e66215126dc76cdefca40b1e9f253e317f02f6d40a04652e9519bd5 SHA512 d3047c0eba1ce6d4cb68df65bd1563b7eb7c14253ff82edfcdae0a19d8270027a45273442258e0afef19bf1e805b99b91ae76a95fb4a0ada0454ee75f36c43b1
 DIST blender-3.3.15.tar.xz 41928632 BLAKE2B d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e SHA512 d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff
 DIST blender-3.3.21.tar.xz 41940868 BLAKE2B 74874226a0f690d2b81c0f96c441f519bd37ff0fec5c2dcae0f4f673d55863e2b2edbd60d2ed05890c440c5287e4cab943646cf4029d7c8287a636ac405e9bce SHA512 715a9808b25fe4c90ee3097edf21bdb3facfec51df0f6b6c6404a95bafe417d1e4998994f532ae9bac1e95de84cc8fd8fce8f8e672f9117646ad840074344d0e
 DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
@@ -22,8 +24,8 @@ EBUILD blender-3.3.8.ebuild 13722 BLAKE2B 12465f59bb137aaa869216b623df34fb8758a7
 EBUILD blender-3.6.15.ebuild 14133 BLAKE2B 97030e2d089b2bd7cc7e8a3e0c4b8b302c168f3b12be5e18366493776095fd4b95b2107691f467f67fb95e006b3d5ad5442dddff8e39fa53044dbaf263f79216 SHA512 3d90056f798ce49c5028ff860296e1c18201d44fea9056c59150b6b6815d3ac98e03e9b1ba2aa985e883996e7755dec6ef27a9799e889c21bd6d539940fe858c
 EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c
 EBUILD blender-4.0.2-r1.ebuild 17323 BLAKE2B da8dd2e98235314e7acf564867c688ce8ca258ef154b6fecfee4b247360bfd1eda7d2d0a42b37356cf79b061bf3f2d3c862f19db77f29b74701a29c3e36e4eed SHA512 f6ec16f31c2ecb1578b1d0222fb02041753cf225347cefdd0b75ab28386ecf9840d54be5366e9e7231b05aca1a84f3d52a10c801a2431a289182e1a1a0ac0aa8
-EBUILD blender-4.1.1-r2.ebuild 17228 BLAKE2B cb0fa27d3d2ac3b5e964f4fa1c10fc1e831c6d3d8a1f68093356aea80d99d942b421fe4db5ab97b69646c046391bfe6bfc24471245d4fa6cd138e182493fd359 SHA512 49ee9a06312e0e4f1b37c2489ae1297cb8fd7e505bf27839b8f13b050ff2b7d2af116602e4ea62716ed30f8e19c06276346985d0c594f83985b99a6b013e73a3
+EBUILD blender-4.1.1-r2.ebuild 17612 BLAKE2B 6c730678d9ee6f98127a3df5df269ee06a3bbb69e6bd2d4d06195ae8efa424484a83b3a77cd58c0e1a8e2d516f67e0d38737cd199f4ee66c59f1bfc045dfd308 SHA512 4afc54c172de9eb3fe0d71a23f59b32f232ce66847272bbe8b03e770bb228a0e22c0556bbc7338294d9488ad221e4c117e557e85f1f32c44ebecc1cf6bbb72bc
 EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4
-EBUILD blender-4.2.1.ebuild 17084 BLAKE2B f3e0fc7622c35b8e3c10be61e9b0bd2d07d04ea8c1f2aa7c43d20e72228434955f41ba863fc239e6e7971fce711acb4eecddc040c3a325337f78ca1fe7e8890a SHA512 407fafa5ccc112df0d235c3c0a539e2d783a2e99634f62ff286e9fcce9a07a47e5125516643148e4ae23ff10686b4a74ccdb2d12fae874dee6ee740e445d8622
-EBUILD blender-9999.ebuild 17084 BLAKE2B f3e0fc7622c35b8e3c10be61e9b0bd2d07d04ea8c1f2aa7c43d20e72228434955f41ba863fc239e6e7971fce711acb4eecddc040c3a325337f78ca1fe7e8890a SHA512 407fafa5ccc112df0d235c3c0a539e2d783a2e99634f62ff286e9fcce9a07a47e5125516643148e4ae23ff10686b4a74ccdb2d12fae874dee6ee740e445d8622
+EBUILD blender-4.2.1.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510
+EBUILD blender-9999.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510
 MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9
diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild b/media-gfx/blender/blender-4.1.1-r2.ebuild
index 949e78360f96..b39222330cbf 100644
--- a/media-gfx/blender/blender-4.1.1-r2.ebuild
+++ b/media-gfx/blender/blender-4.1.1-r2.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-# matches media-libs/osl
+# NOTE must match media-libs/osl
 LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 
 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -102,7 +103,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-2.1.0 )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
 	oneapi? ( dev-libs/intel-compute-runtime[l0] )
 	openexr? (
 		>=dev-libs/imath-3.1.7:=
@@ -186,6 +187,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
 	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
 )
 
 blender_check_requirements() {
@@ -343,9 +346,7 @@ src_configure() {
 		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
 		-DWITH_FFTW3=$(usex fftw)
 		-DWITH_GHOST_WAYLAND=$(usex wayland)
-		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
 		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
-		-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
 		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
@@ -393,6 +394,13 @@ src_configure() {
 		-DWITH_XR_OPENXR=no
 	)
 
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
 	# requires dev-vcs/git
 	if [[ ${PV} = *9999* ]] ; then
 		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
@@ -420,6 +428,13 @@ src_configure() {
 		)
 	fi
 
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use arm64 && append-flags -flax-vector-conversions
 
diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1.ebuild
index 59269e65e9da..88bb85849015 100644
--- a/media-gfx/blender/blender-4.2.1.ebuild
+++ b/media-gfx/blender/blender-4.2.1.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-# matches media-libs/osl
+# NOTE must match media-libs/osl
 LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 
 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -101,7 +102,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-2.1.0 )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
 	oneapi? ( dev-libs/intel-compute-runtime[l0] )
 	openexr? (
 		>=dev-libs/imath-3.1.7:=
@@ -185,6 +186,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
 	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
 )
 
 blender_check_requirements() {
@@ -340,9 +343,7 @@ src_configure() {
 		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
 		-DWITH_FFTW3=$(usex fftw)
 		-DWITH_GHOST_WAYLAND=$(usex wayland)
-		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
 		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
-		-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
 		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
@@ -390,6 +391,13 @@ src_configure() {
 		-DWITH_XR_OPENXR=no
 	)
 
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
 	# requires dev-vcs/git
 	if [[ ${PV} = *9999* ]] ; then
 		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
@@ -417,6 +425,13 @@ src_configure() {
 		)
 	fi
 
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use arm64 && append-flags -flax-vector-conversions
 
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 59269e65e9da..88bb85849015 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{11..12} )
-# matches media-libs/osl
+# NOTE must match media-libs/osl
 LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 
 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -101,7 +102,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-2.1.0 )
+	oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
 	oneapi? ( dev-libs/intel-compute-runtime[l0] )
 	openexr? (
 		>=dev-libs/imath-3.1.7:=
@@ -185,6 +186,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.2-FindClang.patch"
 	"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
+	"${FILESDIR}/${PN}-4.1.1-numpy.patch"
 )
 
 blender_check_requirements() {
@@ -340,9 +343,7 @@ src_configure() {
 		-DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)"
 		-DWITH_FFTW3=$(usex fftw)
 		-DWITH_GHOST_WAYLAND=$(usex wayland)
-		-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
 		-DWITH_GHOST_WAYLAND_DYNLOAD="no"
-		-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
 		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
@@ -390,6 +391,13 @@ src_configure() {
 		-DWITH_XR_OPENXR=no
 	)
 
+	if has_version ">=dev-python/numpy-2"; then
+		mycmakeargs+=(
+			-DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include"
+			-DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include"
+		)
+	fi
+
 	# requires dev-vcs/git
 	if [[ ${PV} = *9999* ]] ; then
 		mycmakeargs+=( -DWITH_BUILDINFO="yes" )
@@ -417,6 +425,13 @@ src_configure() {
 		)
 	fi
 
+	if use wayland; then
+		mycmakeargs+=(
+			-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
+			-DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)"
+		)
+	fi
+
 	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
 	use arm64 && append-flags -flax-vector-conversions
 
diff --git a/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch
new file mode 100644
index 000000000000..e8e1c349b956
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch
@@ -0,0 +1,38 @@
+From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= <jannik.glueckert@gmail.com>
+Date: Fri, 23 Aug 2024 13:17:34 +0200
+Subject: [PATCH] fix FindLLVM lookup
+
+find out our installed libnames and use that in the lookup
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git build_files/cmake/Modules/FindLLVM.cmake build_files/cmake/Modules/FindLLVM.cmake
+index 4c7cc5f..21c760e 100644
+--- a/build_files/cmake/Modules/FindLLVM.cmake
++++ b/build_files/cmake/Modules/FindLLVM.cmake
+@@ -54,16 +54,21 @@ if(NOT LLVM_LIBPATH)
+   set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+   mark_as_advanced(LLVM_LIBPATH)
+ endif()
++if(NOT LLVM_LIBNAMES)
++  execute_process(COMMAND ${LLVM_CONFIG} --libnames
++	  OUTPUT_VARIABLE LLVM_LIBNAMES
++          OUTPUT_STRIP_TRAILING_WHITESPACE)
++  set(LLVM_LIBNAMES ${LLVM_LIBNAMES} CACHE PATH "Name of the LLVM libraries")
++  mark_as_advanced(LLVM_LIBNAMES)
++endif()
+ 
+ if(LLVM_STATIC)
+   find_library(LLVM_LIBRARY
+-               NAMES LLVMAnalysis # first of a whole bunch of libs to get
++               NAMES ${LLVM_LIBNAMES}
+                PATHS ${LLVM_LIBPATH})
+ else()
+   find_library(LLVM_LIBRARY
+-               NAMES
+-                 LLVM-${LLVM_VERSION}
+-                 LLVMAnalysis  # check for the static library as a fall-back
++               NAMES ${LLVM_LIBNAMES}
+                PATHS ${LLVM_LIBPATH})
+ endif()
+ 
diff --git a/media-gfx/blender/files/blender-4.1.1-numpy.patch b/media-gfx/blender/files/blender-4.1.1-numpy.patch
new file mode 100644
index 000000000000..bd76da8b5959
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.1.1-numpy.patch
@@ -0,0 +1,26 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 23 Aug 2024 13:19:21 +0200
+Subject: [PATCH] fix numpy lookup
+
+use cmake config for find_package()
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/build_files/cmake/platform/platform_unix.cmake
++++ b/build_files/cmake/platform/platform_unix.cmake
+@@ -463,13 +463,13 @@ if(WITH_BOOST)
+     endif()
+     list(APPEND __boost_packages system)
+     set(Boost_NO_WARN_NEW_VERSIONS ON)
+-    find_package(Boost 1.48 COMPONENTS ${__boost_packages})
++    find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages})
+     if(NOT Boost_FOUND)
+       # try to find non-multithreaded if -mt not found, this flag
+       # doesn't matter for us, it has nothing to do with thread
+       # safety, but keep it to not disturb build setups
+       set(Boost_USE_MULTITHREADED OFF)
+-      find_package(Boost 1.48 COMPONENTS ${__boost_packages})
++      find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages})
+     endif()
+     unset(__boost_packages)
+     if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU)