summaryrefslogtreecommitdiff
path: root/media-gfx/blender
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-02-20 17:40:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-02-20 17:40:11 +0000
commitf3439d6caba79c7067991ef0403d855917255726 (patch)
tree1c1816b545d00d4dc70a8a89f386963f5e5f51f9 /media-gfx/blender
parentd6ecedbb65041ed35010095376e87dd7de4270c5 (diff)
gentoo auto-resync : 20:02:2024 - 17:40:11
Diffstat (limited to 'media-gfx/blender')
-rw-r--r--media-gfx/blender/Manifest5
-rw-r--r--media-gfx/blender/blender-4.0.1-r1.ebuild (renamed from media-gfx/blender/blender-4.0.1.ebuild)12
-rw-r--r--media-gfx/blender/blender-9999.ebuild8
-rw-r--r--media-gfx/blender/files/blender-4.0.1-openvdb-11.patch73
4 files changed, 90 insertions, 8 deletions
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index d555b19be162..86bfdf660d8f 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,6 +4,7 @@ AUX blender-3.2.2-support-building-with-musl-libc.patch 5583 BLAKE2B 193548ea616
AUX blender-3.3.0-fix-build-with-boost-1.81.patch 490 BLAKE2B ff9625bec6783a5a55d2d0a8b9afeae718e0c8d714aee42e89577158504b72f6cdc325a3aa4b21291319ed886f722d6216af8ba4680ff5cb046289c9f2dc9f61 SHA512 9a7bad9947c03e3265c07266fb901319665cb2869395c46e5a9a63953772a5af880b6f038e38a695bb9e0cbfaae1f1a08fa61b8a565d2081e6c8d9e6c7a80547
AUX blender-3.3.6-cycles-gcc13.patch 299 BLAKE2B c20c113bf845cb55188cd53c4c3e52e2876430d5b708161afbfd6afd0a50fb7cc4cf099df2202fa8c149bb18dc82e9e880cd083f35b61faaff80852a39358e3f SHA512 8986fd86e1f060c7310e5ecbae8f968faae5257af92f248874d7bccade4b75890a51a97706be653a6441292f0a459aa88b9935f545733eb34ac3b324c0d3b2df
AUX blender-4.0.1-fix-cflags-cleaner.patch 2222 BLAKE2B 2006ddd28ad270417e7832dbb4499752c90e8f6e5372c601a6694ee53aa0f47ed8eaef356e9b605f5add6144ff8fd200a7d9642441a1f213ec92e50e23806842 SHA512 5e130d917db80706b85e49b79803bd19b229bcf6e317789812ff5c0dc706b2c7bf31af43e6a226ee6dea9ee478f76eaefc903657c693f1d2dbcd85f552f2578c
+AUX blender-4.0.1-openvdb-11.patch 3160 BLAKE2B 673d47a5b38e3758a1442173ec17a3bf49151d3d916ccc85946183d269bf016bf50c495f784d79f4635cbf6ba2e9fbdf8ced83130f788590a13fea959266f09e SHA512 13bc4817eb9ea8ddfaca061ae1c1805487284c458057490e124e1b6a76b88a71a5a62f77b6af2d2fb550d755b5c70b90c40f638562239420598078a11450e192
DIST blender-3.3.6.tar.xz 41912972 BLAKE2B 94f9dd1a7993f399d612275ed3cfc1d482b0778d2d0b50ae40b73714b6afce93e036915a5b8ea415b6642b1e2d0a281db15ba8addd95c23771c381050722aac7 SHA512 db453b9c7c0ad508e04f603c970e111afb577f3dc0bd25f2ce47312e8560223dcf0307b0a306014dd79adda76de49b6d26e6e63400cade1430568332fe5b2d57
DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee SHA512 d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
@@ -17,6 +18,6 @@ EBUILD blender-3.4.1-r3.ebuild 13812 BLAKE2B 5203a3df9b11bba999e8ad1c9f420f3cb22
EBUILD blender-3.5.1-r1.ebuild 14058 BLAKE2B 0cd9392356e2c5f4de370e3fafdb1df83eb14711e737a53d151b9d74ea66d46d72918b8bccbd3fa2eb6a7472b4163ada545b4ec6851c4063c2d071bb8deadeb5 SHA512 7f2b225ea53a654078a68800d35edb9d8e2e63312f31002cbbf5654a437ef05f14f581cba2c3df49ddf5f4db8ab88cd931a8c52497e1377d2e1bd633daf54c10
EBUILD blender-3.6.0.ebuild 14058 BLAKE2B 0cd9392356e2c5f4de370e3fafdb1df83eb14711e737a53d151b9d74ea66d46d72918b8bccbd3fa2eb6a7472b4163ada545b4ec6851c4063c2d071bb8deadeb5 SHA512 7f2b225ea53a654078a68800d35edb9d8e2e63312f31002cbbf5654a437ef05f14f581cba2c3df49ddf5f4db8ab88cd931a8c52497e1377d2e1bd633daf54c10
EBUILD blender-3.6.5.ebuild 13964 BLAKE2B 7f20a9f700239826e3d76f0f4a421c3427373e09d929f6cc18d42d45d61e49cf642e62b2fee7ba2a987b0e2a6a8440266bb8ca7e510d7bdf0a30ad91265e4352 SHA512 e223f60c90bd714edaf7b5eb0f96f06c40c690bf44483adcdc28d20e000be20e7e76c57ca9de8413369a52b897aaccf2107d8c7d1f537aa988787e477099d3b8
-EBUILD blender-4.0.1.ebuild 14919 BLAKE2B 3e92c30ecded0a949ed5cb2ef8e2f282f3c627adbfd3b410b7ae5f4abdd5e385fac932bf1bc11d9df1c3fbe12a59b572efb5395681fc2075d2b1c3c69c24cba6 SHA512 8151f0e745851b1aaca3b78baa0cce6b7ba945a7a07d950b3a0b3b0054d2d9059a4022b2bcdb27c8e6602951f512d34897adefb3303aa343bb20947810c49bcf
-EBUILD blender-9999.ebuild 14949 BLAKE2B 940c8af5c80f27f4fc14d5c7bccfea1d04b5f783ab303c057fd530313e81a501e1cc7d7b23a2ed3520c63b2af8a2627cf3dde875212abf1a3d83b50ce3b569d0 SHA512 f18ed5bfa396fee0e597cb568d712f6d8feab1251e5f9c38a562d347409533d6c430f3a04b076efeb6f0de084593038a62544aa06f4ec51c98c46d432ea983d2
+EBUILD blender-4.0.1-r1.ebuild 15105 BLAKE2B b3fdaef064c6cb05f86f097fe3e49bf62a426751e4f5608e8bb0997e58f16977eca30c890e9466a782c7e82d6c7fac0317ba7ea01c33e08983f70ceeae0a96ea SHA512 3f4713dcea4ccb411462c082614e4b05a6b18f1ba7b2bb42150b7da662be68ce18f4152d96075c719f5af91cadd28b4f029c6f44397c8a75d72b2221c4d0ed75
+EBUILD blender-9999.ebuild 15014 BLAKE2B 282e0e6922fbcf4a8aff9e810a5deca4a5a3be2c643dc80ce7209c4b24e2719bd5be1c655ca145f6900197a5ca0fe00c0cd1d89f9aa476984a91b1a6bc922331 SHA512 e41c87f92086a792a886fceeeeacd4fef82064775dd3945033aad14b9f2fb3381a554690c53dd1c07bcc42cce8115e3f110b2e92f081ae45ff3a444e6f28de9c
MISC metadata.xml 3360 BLAKE2B 6d69044997db69c2bcabdb5aec72f95fb424b0f02cdd5bb3a58cc629d782a163d92cc446776451b86a5175c498c95d4869a23c6feec1318ee6d723c3849f3ea1 SHA512 8c37acbe5e9514139b04c473a6e0af46ead1e8377f7a28182abc617713d03c9e71ef47a863b955c3a6788f9e246ea8d426c9dde4952ebfcc6ae490a87175a0d9
diff --git a/media-gfx/blender/blender-4.0.1.ebuild b/media-gfx/blender/blender-4.0.1-r1.ebuild
index 853b1444f8d1..5f4042e3652f 100644
--- a/media-gfx/blender/blender-4.0.1.ebuild
+++ b/media-gfx/blender/blender-4.0.1-r1.ebuild
@@ -27,7 +27,7 @@ SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
IUSE="+bullet +fluid +openexr +tbb
alembic collada +color-management cuda +cycles cycles-bin-kernels
- debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k
+ debug doc +embree +ffmpeg +fftw +gmp hip jack jemalloc jpeg2k
man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv
+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl
+sndfile test +tiff valgrind wayland +webp X"
@@ -38,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
cuda? ( cycles )
cycles? ( openexr tiff )
fluid? ( tbb )
+ hip? ( cycles )
nanovdb? ( openvdb )
openvdb? ( tbb )
optix? ( cuda )
@@ -74,6 +75,7 @@ RDEPEND="${PYTHON_DEPS}
ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp )
+ hip? ( >=dev-util/hip-5.7.1 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -91,7 +93,7 @@ RDEPEND="${PYTHON_DEPS}
openpgl? ( >=media-libs/openpgl-0.5.0 )
opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
openvdb? (
- >=media-gfx/openvdb-10.0.0:=[nanovdb?]
+ >=media-gfx/openvdb-10.1.0:=[nanovdb?]
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
@@ -143,6 +145,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for releases after Dec 8, 2023
+ "${FILESDIR}/${PN}-4.0.1-openvdb-11.patch"
)
blender_check_requirements() {
@@ -258,10 +261,10 @@ src_configure() {
-DWITH_CYCLES_CUDA_BINARIES=$(usex cuda $(usex cycles-bin-kernels))
-DWITH_CYCLES_DEVICE_ONEAPI=no
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda)
- -DWITH_CYCLES_DEVICE_HIP=no
+ -DWITH_CYCLES_DEVICE_HIP=$(usex hip)
-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-DWITH_CYCLES_EMBREE=$(usex embree)
- -DWITH_CYCLES_HIP_BINARIES=no
+ -DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels))
-DWITH_CYCLES_ONEAPI_BINARIES=no
-DWITH_CYCLES_OSL=$(usex osl)
-DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
@@ -355,6 +358,7 @@ src_configure() {
if use cycles-bin-kernels; then
use cuda && CYCLES_TEST_DEVICES+=( "CUDA" )
use optix && CYCLES_TEST_DEVICES+=( "OPTIX" )
+ use hip && CYCLES_TEST_DEVICES+=( "HIP" )
fi
mycmakeargs+=(
-DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo "${CYCLES_TEST_DEVICES[*]}")"
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index d1c33bb35bd4..d54fb423595c 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="${PYTHON_DEPS}
ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp )
- hip? ( dev-util/hip )
+ hip? ( >=dev-util/hip-5.7.1 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -93,7 +93,7 @@ RDEPEND="${PYTHON_DEPS}
openpgl? ( >=media-libs/openpgl-0.5.0 )
opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
openvdb? (
- >=media-gfx/openvdb-10.0.0:=[nanovdb?]
+ >=media-gfx/openvdb-10.1.0:=[nanovdb?]
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
@@ -143,6 +143,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.1-openvdb-11.patch"
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch b/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch
new file mode 100644
index 000000000000..d9455222c6a7
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch
@@ -0,0 +1,73 @@
+--- a/intern/cycles/scene/image_vdb.cpp 2023-11-23 14:42:38.772685628 +0100
++++ b/intern/cycles/scene/image_vdb.cpp 2023-11-23 15:19:55.475804922 +0100
+@@ -11,7 +11,14 @@
+ # include <openvdb/tools/Dense.h>
+ #endif
+ #ifdef WITH_NANOVDB
+-# include <nanovdb/util/OpenToNanoVDB.h>
++# include <nanovdb/NanoVDB.h>
++# define NANOVDB_VERSION(major, minor, patch) (major << 21 | minor << 10 | patch)
++# if NANOVDB_VERSION(NANOVDB_MAJOR_VERSION_NUMBER, NANOVDB_MINOR_VERSION_NUMBER, NANOVDB_PATCH_VERSION_NUMBER) >= NANOVDB_VERSION(32, 6, 0)
++# include <nanovdb/util/CreateNanoGrid.h>
++# else
++# include <nanovdb/util/OpenToNanoVDB.h>
++# endif
++# undef NANOVDB_VERSION
+ #endif
+
+ CCL_NAMESPACE_BEGIN
+@@ -55,20 +62,35 @@
+ FloatGridType floatgrid(*openvdb::gridConstPtrCast<GridType>(grid));
+ if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) {
+ if (precision == 0) {
+- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
+- typename FloatGridType::TreeType,
+- nanovdb::FpN>(floatgrid);
++ if constexpr (nanovdb::Version() >= nanovdb::Version(32,6,0)) {
++ nanogrid = nanovdb::createNanoGrid(floatgrid);
++ }
++ else {
++ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
++ typename FloatGridType::TreeType,
++ nanovdb::FpN>(floatgrid);
++ }
+ return true;
+ }
+- else if (precision == 16) {
+- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
+- typename FloatGridType::TreeType,
+- nanovdb::Fp16>(floatgrid);
++ if (precision == 16) {
++ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) {
++ nanogrid = nanovdb::createNanoGrid(floatgrid);
++ }
++ else {
++ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer,
++ typename FloatGridType::TreeType,
++ nanovdb::Fp16>(floatgrid);
++ }
+ return true;
+ }
+ }
+
+- nanogrid = nanovdb::openToNanoVDB(floatgrid);
++ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) {
++ nanogrid = nanovdb::createNanoGrid(floatgrid);
++ }
++ else {
++ nanogrid = nanovdb::openToNanoVDB(floatgrid);
++ }
+ }
+ catch (const std::exception &e) {
+ VLOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " << e.what();
+--- a/CMakeLists.txt 2023-11-23 15:59:58.715805024 +0100
++++ b/CMakeLists.txt 2023-11-23 16:06:42.352711508 +0100
+@@ -1461,7 +1461,7 @@
+ endif()
+
+ if(WITH_OPENVDB)
+- list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB)
++ list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB -DNANOVDB_USE_OPENVDB)
+
+ if(WITH_OPENVDB_3_ABI_COMPATIBLE)
+ list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 04:49:14 +0000