commit: 884fa684aa710570e8b3929ea3fee9e4867e9121 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Apr 21 17:44:39 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 22 00:37:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884fa684
media-gfx/blender: drop oneapi from non live ebuilds Requires SYCL/DCP++ from ::science which barely builds these days. Closes: https://bugs.gentoo.org/941990 Bug: https://bugs.gentoo.org/882645 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/blender/blender-4.1.1-r5.ebuild | 8 ++------ media-gfx/blender/blender-4.2.4-r2.ebuild | 16 +--------------- media-gfx/blender/blender-4.3.2-r2.ebuild | 10 +--------- profiles/arch/amd64/package.use.mask | 2 +- profiles/arch/base/package.use.mask | 6 +++++- 5 files changed, 10 insertions(+), 32 deletions(-) diff --git a/media-gfx/blender/blender-4.1.1-r5.ebuild b/media-gfx/blender/blender-4.1.1-r5.ebuild index 37551c00853a..aac5acc037a0 100644 --- a/media-gfx/blender/blender-4.1.1-r5.ebuild +++ b/media-gfx/blender/blender-4.1.1-r5.ebuild @@ -37,7 +37,7 @@ SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack - jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl + jemalloc jpeg2k man +nanovdb ndof nls +oidn openal +openexr +openmp openpgl +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X " @@ -97,11 +97,7 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-2.1.0 ) - oneapi? ( || ( - dev-libs/intel-compute-runtime:0[l0] - dev-libs/intel-compute-runtime:legacy[l0] - ) - ) + oneapi? ( dev-libs/intel-compute-runtime:=[l0] ) openexr? ( >=dev-libs/imath-3.1.7:= >=media-libs/openexr-3.2.1:0= diff --git a/media-gfx/blender/blender-4.2.4-r2.ebuild b/media-gfx/blender/blender-4.2.4-r2.ebuild index 80d0f8b1a07c..ac5f6e417696 100644 --- a/media-gfx/blender/blender-4.2.4-r2.ebuild +++ b/media-gfx/blender/blender-4.2.4-r2.ebuild @@ -36,7 +36,7 @@ SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack - jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl + jemalloc jpeg2k man +nanovdb ndof nls +oidn openal +openexr +openmp +openpgl +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X " @@ -96,11 +96,6 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-2.1.0 ) - oneapi? ( || ( - dev-libs/intel-compute-runtime:0[l0] - dev-libs/intel-compute-runtime:legacy[l0] - ) - ) openexr? ( >=dev-libs/imath-3.1.7:= >=media-libs/openexr-3.2.1:0= @@ -209,12 +204,6 @@ blender_get_version() { pkg_pretend() { blender_check_requirements - - if use oneapi; then - einfo "The Intel oneAPI support is rudimentary." - einfo "" - einfo "Please report any bugs you find to https://bugs.gentoo.org/"; - fi } pkg_setup() { @@ -325,9 +314,6 @@ src_configure() { -DWITH_CYCLES_DEVICE_HIP="$(usex hip)" -DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels)) - -DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)" - -DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))" - -DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra -DWITH_CYCLES_EMBREE="$(usex embree)" -DWITH_CYCLES_OSL=$(usex osl) diff --git a/media-gfx/blender/blender-4.3.2-r2.ebuild b/media-gfx/blender/blender-4.3.2-r2.ebuild index 776e8cc148b5..11a7fe03aad6 100644 --- a/media-gfx/blender/blender-4.3.2-r2.ebuild +++ b/media-gfx/blender/blender-4.3.2-r2.ebuild @@ -36,9 +36,9 @@ SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack - jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X + jemalloc jpeg2k man +nanovdb ndof nls +oidn openal +openexr +openmp +openpgl " REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -96,11 +96,6 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-2.1.0 ) - oneapi? ( || ( - dev-libs/intel-compute-runtime:0[l0] - dev-libs/intel-compute-runtime:legacy[l0] - ) - ) openexr? ( >=dev-libs/imath-3.1.7:= >=media-libs/openexr-3.2.1:0= @@ -326,9 +321,6 @@ src_configure() { -DWITH_CYCLES_DEVICE_HIP="$(usex hip)" -DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels)) - -DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)" - -DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))" - -DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra -DWITH_CYCLES_EMBREE="$(usex embree)" -DWITH_CYCLES_OSL=$(usex osl) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 6dccd5a05794..104f7fc64bb7 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -112,7 +112,7 @@ sys-apps/hwloc -rocm -l0 # Paul Zander <[email protected]> (2024-04-20) # only keyworded for amd64 currently -media-gfx/blender -gnome -oneapi -renderdoc -vulkan +media-gfx/blender -gnome -renderdoc -vulkan # Ionen Wolkens <[email protected]> (2024-04-16) # dev-qt/qtlanguageserver:6 is keyworded here diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index bf117c729534..56f8d0fa2139 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Paul Zander <[email protected]> (2025-04-20) +# requires SYCL/DCP++ from ::science +media-gfx/blender oneapi + # Sam James <[email protected]> (2025-03-11) # The COBOL frontend only allows building on a small number of platforms # for now until more testing and integration is done. @@ -85,7 +89,7 @@ sys-apps/hwloc rocm l0 # Paul Zander <[email protected]> (2024-04-20) # only keyworded for amd64 currently -media-gfx/blender gnome oneapi renderdoc vulkan +media-gfx/blender gnome renderdoc vulkan # Ionen Wolkens <[email protected]> (2024-04-16) # dev-qt/qtlanguageserver:6 currently has very few keywords
