commit: 292616cc1ca91cf03b0ac9b72610710e0896f164
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Sun Jan 26 16:51:14 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 7 13:21:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292616cc
media-gfx/blender: unslot LLVM version from dev-util/hip and media-libs/oidn
Both hip-cycles and oidn do not care about underlying LLVM version used for
HIPCC compiler.
It can easily be llvm-19, while mesa and osl are using llvm-18.
There is no revbump as no binary code change is expected. blender->hip->clang
and oidn->hip->clang dependency is still locked, it is just locked in another
place.
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
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-r2.ebuild | 13 +++----------
media-gfx/blender/blender-4.2.1.ebuild | 13 +++----------
media-gfx/blender/blender-4.2.4.ebuild | 11 ++---------
media-gfx/blender/blender-4.3.2.ebuild | 13 +++----------
media-gfx/blender/blender-9999.ebuild | 13 +++----------
5 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild
b/media-gfx/blender/blender-4.1.1-r2.ebuild
index b39222330cbf..fb05122a58e1 100644
--- a/media-gfx/blender/blender-4.1.1-r2.ebuild
+++ b/media-gfx/blender/blender-4.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -86,14 +86,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp[cxx] )
gnome? ( gui-libs/libdecor )
- hip? (
- llvm_slot_17? (
- dev-util/hip:0/5.7
- )
- llvm_slot_18? (
- >=dev-util/hip-6.1:=[llvm_slot_18(-)]
- )
- )
+ hip? ( >=dev-util/hip-5.7 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -103,7 +96,7 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+ oidn? ( >=media-libs/oidn-2.1.0 )
oneapi? ( dev-libs/intel-compute-runtime[l0] )
openexr? (
>=dev-libs/imath-3.1.7:=
diff --git a/media-gfx/blender/blender-4.2.1.ebuild
b/media-gfx/blender/blender-4.2.1.ebuild
index 3a809e39731f..c58782732586 100644
--- a/media-gfx/blender/blender-4.2.1.ebuild
+++ b/media-gfx/blender/blender-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -85,14 +85,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp[cxx] )
gnome? ( gui-libs/libdecor )
- hip? (
- llvm_slot_17? (
- dev-util/hip:0/5.7
- )
- llvm_slot_18? (
- >=dev-util/hip-6.1:=[llvm_slot_18(-)]
- )
- )
+ hip? ( >=dev-util/hip-5.7 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -102,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+ oidn? ( >=media-libs/oidn-2.1.0 )
oneapi? ( dev-libs/intel-compute-runtime[l0] )
openexr? (
>=dev-libs/imath-3.1.7:=
diff --git a/media-gfx/blender/blender-4.2.4.ebuild
b/media-gfx/blender/blender-4.2.4.ebuild
index 1d63fa59b338..7d8618e63bae 100644
--- a/media-gfx/blender/blender-4.2.4.ebuild
+++ b/media-gfx/blender/blender-4.2.4.ebuild
@@ -85,14 +85,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp[cxx] )
gnome? ( gui-libs/libdecor )
- hip? (
- llvm_slot_17? (
- dev-util/hip:0/5.7
- )
- llvm_slot_18? (
- >=dev-util/hip-6.1:=[llvm_slot_18(-)]
- )
- )
+ hip? ( >=dev-util/hip-5.7 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -102,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+ oidn? ( >=media-libs/oidn-2.1.0 )
oneapi? ( dev-libs/intel-compute-runtime[l0] )
openexr? (
>=dev-libs/imath-3.1.7:=
diff --git a/media-gfx/blender/blender-4.3.2.ebuild
b/media-gfx/blender/blender-4.3.2.ebuild
index b062e630b1a5..c5735ca5f00f 100644
--- a/media-gfx/blender/blender-4.3.2.ebuild
+++ b/media-gfx/blender/blender-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -85,14 +85,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp[cxx] )
gnome? ( gui-libs/libdecor )
- hip? (
- llvm_slot_17? (
- dev-util/hip:0/5.7
- )
- llvm_slot_18? (
- >=dev-util/hip-6.1:=[llvm_slot_18(-)]
- )
- )
+ hip? ( >=dev-util/hip-5.7 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -102,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+ oidn? ( >=media-libs/oidn-2.1.0 )
oneapi? ( dev-libs/intel-compute-runtime[l0] )
openexr? (
>=dev-libs/imath-3.1.7:=
diff --git a/media-gfx/blender/blender-9999.ebuild
b/media-gfx/blender/blender-9999.ebuild
index cd2204670f17..47a316667ba0 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -85,14 +85,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gmp? ( dev-libs/gmp[cxx] )
gnome? ( gui-libs/libdecor )
- hip? (
- llvm_slot_17? (
- dev-util/hip:0/5.7
- )
- llvm_slot_18? (
- >=dev-util/hip-6.1:=[llvm_slot_18(-)]
- )
- )
+ hip? ( >=dev-util/hip-5.7 )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:2= )
@@ -102,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] )
+ oidn? ( >=media-libs/oidn-2.1.0 )
oneapi? ( dev-libs/intel-compute-runtime[l0] )
openexr? (
>=dev-libs/imath-3.1.7:=
