diff options
author | Yiyang Wu <xgreenlandforwyy@gmail.com> | 2023-12-11 18:43:34 +0800 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2024-02-20 15:12:10 +0200 |
commit | f29e2e89d4592109c91211090ba5562014fc299a (patch) | |
tree | 8bb9f030a06914c3d4ff701d9da48e7e1f948a19 /media-gfx/blender | |
parent | media-gfx/openvdb: add 11.0.0 (diff) | |
download | gentoo-f29e2e89d4592109c91211090ba5562014fc299a.tar.gz gentoo-f29e2e89d4592109c91211090ba5562014fc299a.tar.bz2 gentoo-f29e2e89d4592109c91211090ba5562014fc299a.zip |
media-gfx/blender: require hip-5.7, hip enable on unstable
Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx/blender')
-rw-r--r-- | media-gfx/blender/blender-4.0.1-r1.ebuild (renamed from media-gfx/blender/blender-4.0.1.ebuild) | 11 | ||||
-rw-r--r-- | media-gfx/blender/blender-9999.ebuild | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/media-gfx/blender/blender-4.0.1.ebuild b/media-gfx/blender/blender-4.0.1-r1.ebuild index a943d6078e8c..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 ) @@ -259,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) @@ -356,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 bc907241e946..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 ) |