[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7d28b7a38c00eebd245f3641492f5f120ee4eff4 Author: Sam James gentoo org> AuthorDate: Sun Jun 2 21:13:20 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jun 2 21:13:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d28b7a3 media-gfx/blender: Stabilize 4.1.1 amd64, #932981 Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-4.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.1.ebuild index 94e2599fa018..654e53884672 100644 --- a/media-gfx/blender/blender-4.1.1.ebuild +++ b/media-gfx/blender/blender-4.1.1.ebuild @@ -27,7 +27,7 @@ else # https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz # ) # " - KEYWORDS="~amd64 ~arm ~arm64" + KEYWORDS="amd64 ~arm ~arm64" RESTRICT="test" # the test archive returns LFS references. fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: b21ed7f74a49938222b7dac2d9f7e1613012bcb4
Author: Paul Zander gmail com>
AuthorDate: Sat Apr 20 10:19:48 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 23 21:00:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21ed7f7
media-gfx/blender: add 4.1.1
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36376
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
.../{blender-.ebuild => blender-4.1.1.ebuild} | 95 --
media-gfx/blender/blender-.ebuild | 95 --
3 files changed, 145 insertions(+), 46 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9fd976b345d2..d1ef07dd9e00 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,3 +2,4 @@ DIST blender-3.3.15.tar.xz 41928632 BLAKE2B
d93d7d47183fcd7afa547b8d3f0bd7240ea2
DIST blender-3.3.8.tar.xz 41915180 BLAKE2B
7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76
SHA512
63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
DIST blender-3.6.8.tar.xz 70453744 BLAKE2B
5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7
SHA512
a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
DIST blender-4.0.2.tar.xz 73281252 BLAKE2B
6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983
SHA512
c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
+DIST blender-4.1.1.tar.xz 82146268 BLAKE2B
1ab4a6c1046851ef619394c62fc73794430dc091e2cab26d3d1d542e9d4519889e9b9731606385e9dc8657448ca3827875526f4a57dd1b5c326a73d8a6f9be8d
SHA512
13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-4.1.1.ebuild
similarity index 85%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-4.1.1.ebuild
index aab785d58255..94e2599fa018 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-4.1.1.ebuild
@@ -33,12 +33,13 @@ fi
LICENSE="|| ( GPL-3 BL )"
SLOT="${PV%.*}"
-IUSE="+bullet +fluid +openexr +tbb
- alembic collada +color-management cuda +cycles cycles-bin-kernels
- debug doc +embree +ffmpeg +fftw +gmp gnome 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"
+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
+ +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio
+ renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X
+"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
@@ -95,6 +96,7 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-2.1.0 )
+ oneapi? ( dev-libs/intel-compute-runtime[l0] )
openexr? (
>=dev-libs/imath-3.1.7:=
>=media-libs/openexr-3.2.1:0=
@@ -102,7 +104,7 @@ RDEPEND="${PYTHON_DEPS}
openpgl? ( media-libs/openpgl:= )
opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
openvdb? (
- >=media-gfx/openvdb-11:=[nanovdb?]
+ >=media-gfx/openvdb-11.0.0:=[nanovdb?]
dev-libs/c-blosc:=
)
optix? ( dev-libs/optix )
@@ -130,6 +132,18 @@ RDEPEND="${PYTHON_DEPS}
media-libs/mesa[wayland]
sys-apps/dbus
)
+ vulkan? (
+ media-libs/shaderc
+ dev-util/spirv-tools
+ dev-util/glslang
+ media-libs/vulkan-loader
+ )
+ otf? (
+ media-libs/harfbuzz
+ )
+ renderdoc? (
+ media-gfx/renderdoc
+ )
X? (
x11-libs/libX11
x11-libs/libXi
@@ -139,6 +153,10 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
dev-cpp/eigen:=
+ vulkan? (
+ dev-util/spirv-headers
+ dev-util/vulkan-headers
+ )
"
BDEPEND="
@@ -188,6 +206,8 @@ blender_get_version() {
pkg_pretend() {
blender_check_requirements
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/, profiles/arch/base/, ...
commit: 175d65e779e69e5702ca52cb3af973a2fa0b0e62
Author: Paul Zander gmail com>
AuthorDate: Thu Mar 28 22:08:25 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 21 12:50:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175d65e7
media-gfx/blender: add 4.0.2-r1, cleanup
hopefully fixed osl build
re-added hip flag in 4.0.2-r1
hide test code in release versions
Bug: https://bugs.gentoo.org/693200
Closes: https://bugs.gentoo.org/925534
Closes: https://bugs.gentoo.org/927281
Closes: https://bugs.gentoo.org/927715
Closes: https://bugs.gentoo.org/927835
Closes: https://bugs.gentoo.org/927931
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35973
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.15.ebuild| 4 +-
media-gfx/blender/blender-3.3.8.ebuild | 4 +-
media-gfx/blender/blender-3.6.8.ebuild | 4 +-
...lender-4.0.2.ebuild => blender-4.0.2-r1.ebuild} | 128 +---
media-gfx/blender/blender-.ebuild | 119 ---
.../blender/files/blender-4.0.1-openvdb-11.patch | 2 +
.../files/blender-4.0.2-CUDA_NVCC_FLAGS.patch | 14 +
.../blender/files/blender-4.0.2-FindClang.patch| 14 +
.../blender/files/blender-4.0.2-r1-osl-1.13.patch | 342 +
profiles/arch/amd64/package.use.mask | 4 +
profiles/arch/base/package.use.mask| 4 +
11 files changed, 556 insertions(+), 83 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.15.ebuild
b/media-gfx/blender/blender-3.3.15.ebuild
index ff1e6ffd66d6..1582fb82925a 100644
--- a/media-gfx/blender/blender-3.3.15.ebuild
+++ b/media-gfx/blender/blender-3.3.15.ebuild
@@ -22,8 +22,8 @@ else
KEYWORDS="~amd64 ~arm ~arm64"
fi
-SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
+SLOT="${PV%.*}"
IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
@@ -94,7 +94,7 @@ RDEPEND="${PYTHON_DEPS}
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
- >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+ =media-libs/opensubdiv-3.4.0 )
openvdb? (
- >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+ =media-libs/opensubdiv-3.4.0 )
openvdb? (
- >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+ https://www.blender.org;
if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
+ EGIT_LFS="yes"
+ inherit git-r3
EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
+ EGIT_SUBMODULES=( '*' '-lib/*' )
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
+ RESTRICT="!test? ( test )"
else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ SRC_URI="
+ https://download.blender.org/source/${P}.tar.xz
+ "
+ # test? (
+ #
https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut
1-2)-release.tar.gz
+ # )
+ # "
KEYWORDS="~amd64 ~arm ~arm64"
+ RESTRICT="test" # the test archive returns LFS references.
fi
-SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
+SLOT="${PV%.*}"
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 gnome 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"
-RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
cycles? ( openexr tiff tbb )
fluid? ( tbb )
+ gnome? ( wayland )
+ hip? ( cycles )
nanovdb? ( openvdb )
openvdb? ( tbb openexr )
optix? ( cuda )
@@ -45,7 +54,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
test? ( color-management )"
# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/install_deps.sh
+# build_files/build_environment/cmake/versions.cmake
RDEPEND="${PYTHON_DEPS}
app-arch/zstd
dev-libs/boost:=[nls?]
@@ -70,10 +79,12 @@ RDEPEND="${PYTHON_DEPS}
collada? ( >=media-libs/opencollada-1.6.68 )
color-management? ( media-libs/opencolorio:= )
cuda? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: a3988fcecc9300b902dcf548c639c0633bc39c2e
Author: Joonas Niilola gentoo org>
AuthorDate: Fri Apr 12 13:08:25 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Apr 12 13:08:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3988fce
media-gfx/blender: Stabilize 3.6.8 amd64, #929066
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-3.6.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-3.6.8.ebuild
b/media-gfx/blender/blender-3.6.8.ebuild
index d3624ee81240..4d93c8e6c515 100644
--- a/media-gfx/blender/blender-3.6.8.ebuild
+++ b/media-gfx/blender/blender-3.6.8.ebuild
@@ -20,7 +20,7 @@ else
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
# SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 594ae153bd1bf9f03fbcb315bc42bd1c9541d678
Author: Eli Schwartz gmail com>
AuthorDate: Thu Apr 11 03:00:37 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 11 16:28:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594ae153
media-gfx/blender: drop old
Blender has a bunch of LTS releases, and we package several different
versions for each major.minor slot. There really is no reason to package
multiple bugfix/patch releases, though, so drop everything other than:
- latest bugfix per slot
- latest stable bugfix per slot
(The 3.3 slot has stable ebuilds and also an unstable newer one, so we
keep two ebuilds in a single slot until the latter is stabled.)
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest| 4 -
media-gfx/blender/blender-3.3.6-r1.ebuild | 429 -
media-gfx/blender/blender-3.6.0.ebuild| 449 --
media-gfx/blender/blender-3.6.5.ebuild| 447 --
media-gfx/blender/blender-4.0.1-r1.ebuild | 502 --
5 files changed, 1831 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index c6839f84536c..9fd976b345d2 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,8 +1,4 @@
DIST blender-3.3.15.tar.xz 41928632 BLAKE2B
d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e
SHA512
d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff
-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.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
-DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
DIST blender-3.6.8.tar.xz 70453744 BLAKE2B
5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7
SHA512
a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
-DIST blender-4.0.1.tar.xz 73278416 BLAKE2B
06c3397e8c28f544ec5d207db195e33824e9ddeb1b468342e4e7c18773b00b6b42282e8318a7ae96c7a7c81c7e0626e666953d00bf78bf64922047bd563d625a
SHA512
288e5a04f274ab351c8517e6de2195f414e618a82fb2a3b2aede5f9120aa6a41f20bc2c4e5190c47b69da841bb1ebe15e9ffee737c1cc2b5979a28b0e1f4c5ae
DIST blender-4.0.2.tar.xz 73281252 BLAKE2B
6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983
SHA512
c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
deleted file mode 100644
index d74d8aa14fc9..
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 python3_11 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="amd64 ~arm
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: df523208fa8693f7a79da43a7d2283414c7ba9b4
Author: Eli Schwartz gmail com>
AuthorDate: Tue Apr 9 22:32:51 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 9 23:00:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df523208
media-gfx/blender: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/859607
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.15.ebuild | 5 +
media-gfx/blender/blender-3.3.6-r1.ebuild | 5 +
media-gfx/blender/blender-3.3.8.ebuild| 5 +
media-gfx/blender/blender-3.6.0.ebuild| 5 +
media-gfx/blender/blender-3.6.5.ebuild| 5 +
media-gfx/blender/blender-3.6.8.ebuild| 5 +
media-gfx/blender/blender-4.0.1-r1.ebuild | 5 +
media-gfx/blender/blender-4.0.2.ebuild| 5 +
media-gfx/blender/blender-.ebuild | 5 +
9 files changed, 45 insertions(+)
diff --git a/media-gfx/blender/blender-3.3.15.ebuild
b/media-gfx/blender/blender-3.3.15.ebuild
index 30eb3d17cd54..ff1e6ffd66d6 100644
--- a/media-gfx/blender/blender-3.3.15.ebuild
+++ b/media-gfx/blender/blender-3.3.15.ebuild
@@ -214,6 +214,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index aa9fecc21155..d74d8aa14fc9 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -214,6 +214,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index c8e316c77c10..a6bf20c9427b 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -214,6 +214,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index d31784b69cc7..1178dfac92bf 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -224,6 +224,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/media-gfx/blender/blender-3.6.5.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
index 22136fab3ffc..d3624ee81240 100644
--- a/media-gfx/blender/blender-3.6.5.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -222,6 +222,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/media-gfx/blender/blender-3.6.8.ebuild
b/media-gfx/blender/blender-3.6.8.ebuild
index 22136fab3ffc..d3624ee81240 100644
--- a/media-gfx/blender/blender-3.6.8.ebuild
+++ b/media-gfx/blender/blender-3.6.8.ebuild
@@ -222,6 +222,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/media-gfx/blender/blender-4.0.1-r1.ebuild
b/media-gfx/blender/blender-4.0.1-r1.ebuild
index f13df05fbed5..aa0d93cd840f 100644
--- a/media-gfx/blender/blender-4.0.1-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.1-r1.ebuild
@@ -240,6 +240,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/859607
+ # https://projects.blender.org/blender/blender/issues/120444
+ filter-lto
+
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 9f3a9ffe77c2d14976de165515dca8573d8233f5
Author: Paul Zander gmail com>
AuthorDate: Fri Apr 5 08:50:53 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 7 13:45:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3a9ffe
media-gfx/blender: change openpgl slot spec
Closes: https://bugs.gentoo.org/928528
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36115
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.6.0.ebuild| 2 +-
media-gfx/blender/blender-3.6.5.ebuild| 2 +-
media-gfx/blender/blender-3.6.8.ebuild| 2 +-
media-gfx/blender/blender-4.0.1-r1.ebuild | 2 +-
media-gfx/blender/blender-4.0.2.ebuild| 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 0e65b2f2660c..d31784b69cc7 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- openpgl? ( media-libs/openpgl:0/0.5= )
+ openpgl? ( media-libs/openpgl:0/0.5 )
opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-3.6.5.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
index d353ecd72f39..22136fab3ffc 100644
--- a/media-gfx/blender/blender-3.6.5.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -86,7 +86,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- openpgl? ( media-libs/openpgl:0/0.5= )
+ openpgl? ( media-libs/openpgl:0/0.5 )
opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-3.6.8.ebuild
b/media-gfx/blender/blender-3.6.8.ebuild
index d353ecd72f39..22136fab3ffc 100644
--- a/media-gfx/blender/blender-3.6.8.ebuild
+++ b/media-gfx/blender/blender-3.6.8.ebuild
@@ -86,7 +86,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- openpgl? ( media-libs/openpgl:0/0.5= )
+ openpgl? ( media-libs/openpgl:0/0.5 )
opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-4.0.1-r1.ebuild
b/media-gfx/blender/blender-4.0.1-r1.ebuild
index 0b6b4edad7b5..f13df05fbed5 100644
--- a/media-gfx/blender/blender-4.0.1-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.1-r1.ebuild
@@ -90,7 +90,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- openpgl? ( media-libs/openpgl:0/0.5= )
+ openpgl? ( media-libs/openpgl:0/0.5 )
opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
openvdb? (
>=media-gfx/openvdb-10.1.0:=[nanovdb?]
diff --git a/media-gfx/blender/blender-4.0.2.ebuild
b/media-gfx/blender/blender-4.0.2.ebuild
index 8c0b8c7c87cc..662c91322e77 100644
--- a/media-gfx/blender/blender-4.0.2.ebuild
+++ b/media-gfx/blender/blender-4.0.2.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- openpgl? ( media-libs/openpgl:0/0.5= )
+ openpgl? ( media-libs/openpgl:0/0.5 )
opensubdiv? ( >=media-libs/opensubdiv-3.5.0 )
openvdb? (
>=media-gfx/openvdb-10.0.0:=[nanovdb?]
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 0330b00ef5fcac518392eeb5eab7fdb4712b68eb
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 17 11:58:36 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0330b00e
media-gfx/blender: Drop 3.4.1-r3, 3.5.1-r1
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest| 2 -
media-gfx/blender/blender-3.4.1-r3.ebuild | 441 -
media-gfx/blender/blender-3.5.1-r1.ebuild | 444 --
3 files changed, 887 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 0d2630aac5f1..1d6f0d8dfac1 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,5 @@
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
-DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
DIST blender-3.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
DIST blender-4.0.1.tar.xz 73278416 BLAKE2B
06c3397e8c28f544ec5d207db195e33824e9ddeb1b468342e4e7c18773b00b6b42282e8318a7ae96c7a7c81c7e0626e666953d00bf78bf64922047bd563d625a
SHA512
288e5a04f274ab351c8517e6de2195f414e618a82fb2a3b2aede5f9120aa6a41f20bc2c4e5190c47b69da841bb1ebe15e9ffee737c1cc2b5979a28b0e1f4c5ae
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
deleted file mode 100644
index 9e1598a6230f..
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 python3_11 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
- test +tiff valgrind wayland X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- fluid? ( tbb )
- openvdb? ( tbb )
- optix? ( cuda )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-#
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 2067d985d343c6a99ceb2bcdebb623d17a9e8592
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 17 12:06:01 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2067d985
media-gfx/blender: Bump to 3.3.15, 3.6.8, 4.0.2
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 3 +
media-gfx/blender/blender-3.3.15.ebuild | 427
media-gfx/blender/blender-3.6.8.ebuild | 442 +
media-gfx/blender/blender-4.0.2.ebuild | 486
4 files changed, 1358 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1d6f0d8dfac1..c6839f84536c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,8 @@
+DIST blender-3.3.15.tar.xz 41928632 BLAKE2B
d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e
SHA512
d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff
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.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
+DIST blender-3.6.8.tar.xz 70453744 BLAKE2B
5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7
SHA512
a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
DIST blender-4.0.1.tar.xz 73278416 BLAKE2B
06c3397e8c28f544ec5d207db195e33824e9ddeb1b468342e4e7c18773b00b6b42282e8318a7ae96c7a7c81c7e0626e666953d00bf78bf64922047bd563d625a
SHA512
288e5a04f274ab351c8517e6de2195f414e618a82fb2a3b2aede5f9120aa6a41f20bc2c4e5190c47b69da841bb1ebe15e9ffee737c1cc2b5979a28b0e1f4c5ae
+DIST blender-4.0.2.tar.xz 73281252 BLAKE2B
6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983
SHA512
c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b
diff --git a/media-gfx/blender/blender-3.3.15.ebuild
b/media-gfx/blender/blender-3.3.15.ebuild
new file mode 100644
index ..2fece6ff362a
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.15.ebuild
@@ -0,0 +1,427 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
+RESTRICT="!test? ( test ) test"
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7ad248f7a7d3311343111e3556a97ffd8f85473c
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 17 11:42:58 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad248f7
media-gfx/blender: Update live ebuild python and oidn requirements
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index d54fb423595c..af70681a664f 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{11..12} )
inherit check-reqs cmake cuda flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
@@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- oidn? ( >=media-libs/oidn-1.4.0 )
+ oidn? ( >=media-libs/oidn-2.1.0 )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d2f8caafedd8e6d2aeb462872597226253628e90 Author: Sam James gentoo org> AuthorDate: Mon Mar 25 18:56:11 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 25 18:56:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f8caaf media-gfx/blender: crank copyright Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-3.3.15.ebuild | 2 +- media-gfx/blender/blender-3.6.8.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/blender/blender-3.3.15.ebuild b/media-gfx/blender/blender-3.3.15.ebuild index 2fece6ff362a..faf2fe0203cd 100644 --- a/media-gfx/blender/blender-3.3.15.ebuild +++ b/media-gfx/blender/blender-3.3.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8.ebuild index bfc712d40621..8dc4de747a8c 100644 --- a/media-gfx/blender/blender-3.6.8.ebuild +++ b/media-gfx/blender/blender-3.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 75261efb8a8f2753309351220778b0b34590456d
Author: Sam James gentoo org>
AuthorDate: Mon Mar 25 18:54:43 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75261efb
media-gfx/blender: add hack for USE=man
Closes: https://bugs.gentoo.org/925254
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-4.0.1-r1.ebuild | 7 +--
media-gfx/blender/blender-4.0.2.ebuild| 7 +--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/media-gfx/blender/blender-4.0.1-r1.ebuild
b/media-gfx/blender/blender-4.0.1-r1.ebuild
index 5f4042e3652f..0475458f0e06 100644
--- a/media-gfx/blender/blender-4.0.1-r1.ebuild
+++ b/media-gfx/blender/blender-4.0.1-r1.ebuild
@@ -400,11 +400,14 @@ src_install() {
# Pax mark blender for hardened support.
pax-mark m "${BUILD_DIR}"/bin/blender
- cmake_src_install
-
if use man; then
+ # XXX: Stupid temporary hack for bug #925254
+ cmake_src_install -j1
+
# Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
+ else
+ cmake_src_install
fi
if use doc; then
diff --git a/media-gfx/blender/blender-4.0.2.ebuild
b/media-gfx/blender/blender-4.0.2.ebuild
index a3d8c753a9c5..dfad5adeb33d 100644
--- a/media-gfx/blender/blender-4.0.2.ebuild
+++ b/media-gfx/blender/blender-4.0.2.ebuild
@@ -393,11 +393,14 @@ src_install() {
# Pax mark blender for hardened support.
pax-mark m "${BUILD_DIR}"/bin/blender
- cmake_src_install
-
if use man; then
+ # XXX: Stupid temporary hack for bug #925254
+ cmake_src_install -j1
+
# Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
+ else
+ cmake_src_install
fi
if use doc; then
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d6a49278fce2aaedc156af350264b3a4bca9166e
Author: Sebastian Parborg gmail com>
AuthorDate: Thu Jan 18 17:35:39 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a49278
media-gfx/blender: Update required_use and make the configure step strict
With WITH_STRICT_BUILD_OPTIONS, it should now error out if a build
option can not be enabled instead of just warning and disabling it.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-4.0.2.ebuild | 15 ++-
media-gfx/blender/blender-.ebuild | 16 ++--
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/media-gfx/blender/blender-4.0.2.ebuild
b/media-gfx/blender/blender-4.0.2.ebuild
index 853b1444f8d1..a3d8c753a9c5 100644
--- a/media-gfx/blender/blender-4.0.2.ebuild
+++ b/media-gfx/blender/blender-4.0.2.ebuild
@@ -36,12 +36,12 @@ RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
- cycles? ( openexr tiff )
+ cycles? ( openexr tiff tbb )
fluid? ( tbb )
nanovdb? ( openvdb )
- openvdb? ( tbb )
+ openvdb? ( tbb openexr )
optix? ( cuda )
- osl? ( cycles )
+ osl? ( cycles pugixml )
test? ( color-management )"
# Library versions for official builds can be found in the blender source
directory in:
@@ -252,6 +252,7 @@ src_configure() {
-DWITH_ALEMBIC=$(usex alembic)
-DWITH_BOOST=yes
-DWITH_BULLET=$(usex bullet)
+ -DWITH_CLANG=$(usex osl)
-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-DWITH_CODEC_SNDFILE=$(usex sndfile)
-DWITH_CYCLES=$(usex cycles)
@@ -286,6 +287,7 @@ src_configure() {
-DWITH_INPUT_NDOF=$(usex ndof)
-DWITH_INTERNATIONAL=$(usex nls)
-DWITH_JACK=$(usex jack)
+ -DWITH_LLVM=$(usex osl)
-DWITH_MATERIALX=no
-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-DWITH_MEM_VALGRIND=$(usex valgrind)
@@ -309,6 +311,7 @@ src_configure() {
-DWITH_PYTHON_INSTALL_ZSTANDARD=no
-DWITH_SDL=$(usex sdl)
-DWITH_STATIC_LIBS=no
+ -DWITH_STRICT_BUILD_OPTIONS=yes
-DWITH_SYSTEM_EIGEN3=yes
-DWITH_SYSTEM_FREETYPE=yes
-DWITH_SYSTEM_LZO=yes
@@ -343,12 +346,6 @@ src_configure() {
# Ease compiling with required gcc similar to cuda_sanitize but
for cmake
use cuda && use cycles-bin-kernels && mycmakeargs+=(
-DCUDA_HOST_COMPILER="$(cuda_gccdir)" )
fi
- if tc-is-clang ; then
- mycmakeargs+=(
- -DWITH_CLANG=yes
- -DWITH_LLVM=yes
- )
- fi
if use test ; then
local CYCLES_TEST_DEVICES=( "CPU" )
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index bbc7162d1b80..b6449853c804 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -36,13 +36,13 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
- cycles? ( openexr tiff )
+ cycles? ( openexr tiff tbb )
fluid? ( tbb )
hip? ( cycles )
nanovdb? ( openvdb )
- openvdb? ( tbb )
+ openvdb? ( tbb openexr )
optix? ( cuda )
- osl? ( cycles )
+ osl? ( cycles pugixml )
test? ( color-management )"
# Library versions for official builds can be found in the blender source
directory in:
@@ -254,6 +254,7 @@ src_configure() {
-DWITH_ALEMBIC=$(usex alembic)
-DWITH_BOOST=yes
-DWITH_BULLET=$(usex bullet)
+ -DWITH_CLANG=$(usex osl)
-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-DWITH_CODEC_SNDFILE=$(usex sndfile)
-DWITH_CYCLES=$(usex cycles)
@@ -273,7 +274,6 @@ src_configure() {
-DWITH_FFTW3=$(usex fftw)
-DWITH_GHOST_WAYLAND=$(usex wayland)
-DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
- -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
-DWITH_GHOST_WAYLAND_DYNLOAD=no
-DWITH_GHOST_WAYLAND_LIBDECOR=no
-DWITH_GHOST_X11=$(usex X)
@@ -288,6 +288,7 @@ src_configure() {
-DWITH_INPUT_NDOF=$(usex ndof)
-DWITH_INTERNATIONAL=$(usex nls)
-DWITH_JACK=$(usex jack)
+ -DWITH_LLVM=$(usex osl)
-DWITH_MATERIALX=no
-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-DWITH_MEM_VALGRIND=$(usex valgrind)
@@ -311,6 +312,7 @@ src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: e34c3b0fb9c348e7fff18390f3838d7d72a47ef8
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 17 16:36:23 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34c3b0f
media-gfx/blender: Fix live ebuild tests
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index af70681a664f..bbc7162d1b80 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -46,7 +46,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
test? ( color-management )"
# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/install_deps.sh
+# build_files/build_environment/cmake/versions.cmake
RDEPEND="${PYTHON_DEPS}
app-arch/zstd
dev-libs/boost:=[nls?]
@@ -234,7 +234,7 @@ src_prepare() {
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR
${T}/usr)|g" -i tests/CMakeLists.txt || die
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
build_files/cmake/Modules/GTestTesting.cmake || die
+ sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
build_files/cmake/testing.cmake || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 3a71b3f62470c0cc9273206f697fb31e72492020
Author: Sv. Lockal gmail com>
AuthorDate: Wed Jan 17 16:51:00 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a71b3f6
media-gfx/blender: fix error "string sub-command REGEX, mode REPLACE needs at
least 6 arguments"
See also:
https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
Closes: https://bugs.gentoo.org/922324
Signed-off-by: Sv. Lockal gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-4.0.2.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-4.0.2.ebuild
b/media-gfx/blender/blender-4.0.2.ebuild
index d25fbbdc4137..853b1444f8d1 100644
--- a/media-gfx/blender/blender-4.0.2.ebuild
+++ b/media-gfx/blender/blender-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -141,6 +141,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for
releases after Dec 8, 2023
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7d664af0f5bd7a6fd9cc7b7e97440ba9ba723ae2
Author: Sebastian Parborg gmail com>
AuthorDate: Mon Mar 25 16:05:45 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 25 18:54:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d664af0
media-gfx/blender: Update live ebuild
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34869
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index b6449853c804..1af60209e3c9 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -11,8 +11,8 @@ DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
+ EGIT_LFS="yes"
+ inherit git-r3
EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
else
@@ -182,13 +182,10 @@ src_unpack() {
git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
+ # TODO
+ #if use test; then
- if use test; then
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- fi
-
ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
- subversion_fetch ${ASSETS_SVN_URL} ../lib/assets
+ #fi
else
default
if use test; then
@@ -257,6 +254,7 @@ src_configure() {
-DWITH_CLANG=$(usex osl)
-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-DWITH_CODEC_SNDFILE=$(usex sndfile)
+ -DWITH_CPU_CHECK=no
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_CUDA_BINARIES=$(usex cuda $(usex
cycles-bin-kernels))
-DWITH_CYCLES_DEVICE_ONEAPI=no
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: f29e2e89d4592109c91211090ba5562014fc299a
Author: Yiyang Wu gmail com>
AuthorDate: Mon Dec 11 10:43:34 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Feb 20 13:12:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f29e2e89
media-gfx/blender: require hip-5.7, hip enable on unstable
Signed-off-by: Yiyang Wu gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
.../blender/{blender-4.0.1.ebuild => blender-4.0.1-r1.ebuild} | 11 +++
media-gfx/blender/blender-.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
similarity index 97%
rename from media-gfx/blender/blender-4.0.1.ebuild
rename to 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? ( =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? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: 32822cad445a3b80067723488e8d9fa487dfc03d
Author: Sv. Lockal gmail com>
AuthorDate: Sun Jan 21 09:47:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 21 11:20:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32822cad
media-gfx/blender: fix error "string sub-command REGEX, mode REPLACE needs at
least 6 arguments"
See also:
https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
Closes: https://bugs.gentoo.org/922324
Signed-off-by: Sv. Lockal gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-4.0.1.ebuild | 4 +++
.../files/blender-4.0.1-fix-cflags-cleaner.patch | 39 ++
2 files changed, 43 insertions(+)
diff --git a/media-gfx/blender/blender-4.0.1.ebuild
b/media-gfx/blender/blender-4.0.1.ebuild
index 389d34b7495b..f25d645c6efb 100644
--- a/media-gfx/blender/blender-4.0.1.ebuild
+++ b/media-gfx/blender/blender-4.0.1.ebuild
@@ -141,6 +141,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for
releases after Dec 8, 2023
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
new file mode 100644
index ..d28db84d8c36
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
@@ -0,0 +1,39 @@
+Fix CMake Error: string sub-command REGEX, mode REPLACE needs at least 6
arguments total to command.
+https://bugs.gentoo.org/922324
+https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
+--- a/build_files/cmake/macros.cmake
b/build_files/cmake/macros.cmake
+@@ -750,11 +750,11 @@ macro(remove_c_flag
+ _flag)
+
+ foreach(f ${ARGV})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE
${CMAKE_C_FLAGS_RELEASE})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL
${CMAKE_C_FLAGS_MINSIZEREL})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO
${CMAKE_C_FLAGS_RELWITHDEBINFO})
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE
"${CMAKE_C_FLAGS_RELEASE}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL
"${CMAKE_C_FLAGS_MINSIZEREL}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO
"${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endforeach()
+ unset(f)
+ endmacro()
+@@ -763,11 +763,11 @@ macro(remove_cxx_flag
+ _flag)
+
+ foreach(f ${ARGV})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG
${CMAKE_CXX_FLAGS_DEBUG})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE
${CMAKE_CXX_FLAGS_RELEASE})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL
${CMAKE_CXX_FLAGS_MINSIZEREL})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL
"${CMAKE_CXX_FLAGS_MINSIZEREL}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+ endforeach()
+ unset(f)
+ endmacro()
\ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 95a05202350785cbbe702a490c3af98cb85aa21c
Author: Sv. Lockal gmail com>
AuthorDate: Sun Jan 21 10:05:23 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 21 11:20:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a05202
media-gfx/blender: fix ld.lld: error: version script assignment error
Closes: https://bugs.gentoo.org/922600
Signed-off-by: Sv. Lockal gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34938
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 3 +++
media-gfx/blender/blender-3.3.8.ebuild| 3 +++
media-gfx/blender/blender-3.4.1-r3.ebuild | 3 +++
media-gfx/blender/blender-3.5.1-r1.ebuild | 3 +++
media-gfx/blender/blender-3.6.0.ebuild| 3 +++
media-gfx/blender/blender-3.6.5.ebuild| 3 +++
media-gfx/blender/blender-4.0.1.ebuild| 3 +++
media-gfx/blender/blender-.ebuild | 3 +++
8 files changed, 24 insertions(+)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 768a2184b1da..7f36b281370f 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -214,6 +214,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
local mycmakeargs=(
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 8c5a61506379..fb5b111de13e 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -214,6 +214,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
local mycmakeargs=(
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 4aaedf1edb2f..9e1598a6230f 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -221,6 +221,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
blender_get_version
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 285b90bd4fb0..49ca6280a4dd 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -224,6 +224,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
blender_get_version
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 285b90bd4fb0..49ca6280a4dd 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -224,6 +224,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
blender_get_version
diff --git a/media-gfx/blender/blender-3.6.5.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
index 28026d5ce3d9..8dc4de747a8c 100644
--- a/media-gfx/blender/blender-3.6.5.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -222,6 +222,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
blender_get_version
diff --git a/media-gfx/blender/blender-4.0.1.ebuild
b/media-gfx/blender/blender-4.0.1.ebuild
index f25d645c6efb..853b1444f8d1 100644
--- a/media-gfx/blender/blender-4.0.1.ebuild
+++ b/media-gfx/blender/blender-4.0.1.ebuild
@@ -237,6 +237,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
blender_get_version
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index d40dcde6602e..d1c33bb35bd4 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -235,6 +235,9 @@ src_prepare() {
}
src_configure() {
+ # Workaround for bug #922600
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
append-lfs-flags
blender_get_version
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: bc421f9b0e4645fec3d49a8fe6754e1877c0d700
Author: Paul Zander gmail com>
AuthorDate: Fri Dec 8 12:17:16 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Dec 11 13:33:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc421f9b
media-gfx/blender: fix VariableScope QA
Changed the test location to T as ED is not allowed outside
src_install(). This mirrors the earlier changes in blender-4.0.x.
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34222
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 12 ++--
media-gfx/blender/blender-3.3.8.ebuild| 12 ++--
media-gfx/blender/blender-3.4.1-r3.ebuild | 12 ++--
media-gfx/blender/blender-3.5.1-r1.ebuild | 12 ++--
media-gfx/blender/blender-3.6.0.ebuild| 12 ++--
media-gfx/blender/blender-3.6.5.ebuild| 12 ++--
6 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index d454ab1fd985..178e873c32b8 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -208,8 +208,8 @@ src_prepare() {
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g"
-i tests/CMakeLists.txt || die
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g"
-i build_files/cmake/Modules/GTestTesting.cmake || die
+ sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
tests/CMakeLists.txt || die
+ sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
build_files/cmake/Modules/GTestTesting.cmake || die
fi
}
@@ -302,13 +302,13 @@ src_configure() {
src_test() {
# A lot of tests needs to have access to the installed data files.
# So install them into the image directory now.
- cmake_src_install
+ DESTDIR="${T}" cmake_build install
blender_get_version
# Define custom blender data/script file paths not be able to find them
otherwise during testing.
# (Because the data is in the image directory and it will default to
look in /usr/share)
- export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
- export
BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
+ export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+ export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
# Sanity check that the script and datafile path is valid.
# If they are not vaild, blender will fallback to the default path
which is not what we want.
@@ -318,7 +318,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr "${ED}"/* || die
+ rm -fr "${T}"/usr || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index fb54fb0bca6b..8847eb3d3172 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -208,8 +208,8 @@ src_prepare() {
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g"
-i tests/CMakeLists.txt || die
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g"
-i build_files/cmake/Modules/GTestTesting.cmake || die
+ sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
tests/CMakeLists.txt || die
+ sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i
build_files/cmake/Modules/GTestTesting.cmake || die
fi
}
@@ -305,13 +305,13 @@ src_configure() {
src_test() {
# A lot of tests needs to have access to the installed data files.
# So install them into the image directory now.
- cmake_src_install
+ DESTDIR="${T}" cmake_build install
blender_get_version
# Define custom blender data/script file paths not be able to find them
otherwise during testing.
# (Because the data is in the image directory and it will default to
look in /usr/share)
- export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
- export
BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
+ export BLENDER_SYSTEM_SCRIPTS="${T}/usr/share/blender/${BV}/scripts"
+ export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles"
# Sanity check that the script and datafile path is valid.
# If they are not vaild, blender will fallback to the default path
which is not what we
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 8affb5749fc86c363f0a47b4931e14769918a509
Author: Paul Zander gmail com>
AuthorDate: Fri Nov 17 16:46:45 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 22 11:34:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8affb574
media-gfx/blender: add 4.0.1, update
dds support is now provided via openimageio, dropped the useflag.
Adjusted the cmake options to use yes/no, so the options we don't set
explicitly show up as ON/OFF.
Added new cmake options.
Dropped explicit setting of DEBUG options as advised by @DarkDefender in
https://github.com/gentoo/gentoo/pull/33875#issuecomment-1816840959.
They can be passed via MYCMAKEARGS if needed.
Changed the test location to T as ED is not allowed outside
src_install().
Introduced code so cycles tests use all configured devices. They will
still fail because CUDA devices can't be found in sandbox.
Added code that sets a supported CUDA_HOST_COMPILER via cuda.eclass when
using gcc.
Added HIP support to for testing.
Masked test for 4.0.1 because we don't pull the test source from svn
anymore.
Bug: https://bugs.gentoo.org/895414
Closes: https://bugs.gentoo.org/917482
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33875
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
.../{blender-.ebuild => blender-4.0.1.ebuild} | 146 +---
media-gfx/blender/blender-.ebuild | 147 ++---
media-gfx/blender/metadata.xml | 3 +
4 files changed, 196 insertions(+), 101 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 7c56592c6b76..0d2630aac5f1 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,3 +4,4 @@ DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae55995458
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
DIST blender-3.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
+DIST blender-4.0.1.tar.xz 73278416 BLAKE2B
06c3397e8c28f544ec5d207db195e33824e9ddeb1b468342e4e7c18773b00b6b42282e8318a7ae96c7a7c81c7e0626e666953d00bf78bf64922047bd563d625a
SHA512
288e5a04f274ab351c8517e6de2195f414e618a82fb2a3b2aede5f9120aa6a41f20bc2c4e5190c47b69da841bb1ebe15e9ffee737c1cc2b5979a28b0e1f4c5ae
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-4.0.1.ebuild
similarity index 76%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-4.0.1.ebuild
index d4e734739dd6..1b116ab3679a 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-4.0.1.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-PYTHON_COMPAT=( python3_10 python3_11 )
+PYTHON_COMPAT=( python3_{10..11} )
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+inherit check-reqs cmake cuda flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
@@ -19,25 +19,26 @@ else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb
+IUSE="+bullet +fluid +openexr +tbb
alembic collada +color-management cuda +cycles cycles-bin-kernels
debug doc +embree +ffmpeg +fftw +gmp 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 X"
-RESTRICT="!test? ( test )"
+ +sndfile test +tiff valgrind wayland +webp X"
+RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/
commit: c012c40ba2a384244ad433e37babe4fed402ef0e
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Oct 28 08:52:50 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Oct 28 09:18:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c012c40b
media-gfx/blender: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33556
Signed-off-by: Joonas Niilola gentoo.org>
.../blender/files/blender-4.0.0-ocio-2.3.0.patch | 110 -
1 file changed, 110 deletions(-)
diff --git a/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch
b/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch
deleted file mode 100644
index e6cc4a6fa026..
--- a/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 458917773afb4cdf8e1189c0bf5aff7feda6a664 Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel
-Date: Mon, 2 Oct 2023 17:31:08 +0200
-Subject: [PATCH] Build: changes to build with OpenColorIO 2.3
-
-Ref #113157
- intern/opencolorio/ocio_impl_glsl.cc | 12 +-
- .../ocio_color_space_conversion_shader.cc | 24 +++
- 2 files changed, 35 insertions(+), 1 deletion(-)
-
-diff --git a/intern/opencolorio/ocio_impl_glsl.cc
b/intern/opencolorio/ocio_impl_glsl.cc
-index 8d46a2f0773..35e4d0b7a90 100644
a/intern/opencolorio/ocio_impl_glsl.cc
-+++ b/intern/opencolorio/ocio_impl_glsl.cc
-@@ -343,8 +343,15 @@ static bool addGPULut1D2D(OCIO_GPUTextures ,
- unsigned int height = 0;
- GpuShaderCreator::TextureType channel =
GpuShaderCreator::TEXTURE_RGB_CHANNEL;
- Interpolation interpolation = INTERP_LINEAR;
-+#if OCIO_VERSION_HEX >= 0x0203
-+ /* Always use 2D textures in OpenColorIO 2.3, simpler and same performance.
*/
-+ GpuShaderDesc::TextureDimensions dimensions = GpuShaderDesc::TEXTURE_2D;
-+ shader_desc->getTexture(
-+ index, texture_name, sampler_name, width, height, channel, dimensions,
interpolation);
-+#else
- shader_desc->getTexture(
- index, texture_name, sampler_name, width, height, channel,
interpolation);
-+#endif
-
- const float *values;
- shader_desc->getTextureValues(index, values);
-@@ -358,6 +365,7 @@ static bool addGPULut1D2D(OCIO_GPUTextures ,
-
GPU_R16F;
-
- OCIO_GPULutTexture lut;
-+#if OCIO_VERSION_HEX < 0x0203
- /* There does not appear to be an explicit way to check if a texture is 1D
or 2D.
-* It depends on more than height. So check instead by looking at the
source. */
- std::string sampler1D_name = std::string("sampler1D ") + sampler_name;
-@@ -365,7 +373,9 @@ static bool addGPULut1D2D(OCIO_GPUTextures ,
- lut.texture = GPU_texture_create_1d(
- texture_name, width, 1, format, GPU_TEXTURE_USAGE_SHADER_READ,
values);
- }
-- else {
-+ else
-+#endif
-+ {
- lut.texture = GPU_texture_create_2d(
- texture_name, width, height, 1, format,
GPU_TEXTURE_USAGE_SHADER_READ, values);
- }
-diff --git
a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
-index 4cdbb52a6ba..52492754c0f 100644
a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
-+++
b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
-@@ -95,6 +95,18 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
- return GPU_max_texture_size();
- }
-
-+# if OCIO_VERSION_HEX >= 0x0203
-+ void setAllowTexture1D(bool allowed) override
-+ {
-+allow_texture_1D_ = allowed;
-+ }
-+
-+ bool getAllowTexture1D() const override
-+ {
-+return allow_texture_1D_;
-+ }
-+# endif
-+
- bool addUniform(const char *name, const DoubleGetter _double) override
- {
- /* Check if a resource exists with the same name and assert if it is the
case, returning false
-@@ -201,6 +213,9 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
- uint width,
- uint height,
- TextureType channel,
-+# if OCIO_VERSION_HEX >= 0x0203
-+ OCIO::GpuShaderDesc::TextureDimensions dimensions,
-+# endif
- OCIO::Interpolation interpolation,
- const float *values) override
- {
-@@ -216,7 +231,11 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
- GPUTexture *texture;
- eGPUTextureFormat texture_format = (channel == TEXTURE_RGB_CHANNEL) ?
GPU_RGB16F : GPU_R16F;
- /* A height of 1 indicates a 1D texture according to the OCIO API. */
-+# if OCIO_VERSION_HEX >= 0x0203
-+if (dimensions == OCIO::GpuShaderDesc::TEXTURE_1D) {
-+# else
- if
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 76978b982b12fd206bad2557a957a6ea629a4afc
Author: Paul Zander gmail com>
AuthorDate: Fri Oct 27 12:36:19 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Oct 27 13:58:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76978b98
media-gfx/blender: 3.6.5 drop ocio-2.3.0 patch
Patch no longer needed since
https://github.com/blender/blender/commit/f6558e3a233e19a06f8bbff6c26421db4b40d93e
Closes: https://bugs.gentoo.org/916324
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33544
Signed-off-by: Florian Schmaus gentoo.org>
media-gfx/blender/blender-3.6.5.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/media-gfx/blender/blender-3.6.5.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
index 666044f4f4ae..08a30c9d3d4a 100644
--- a/media-gfx/blender/blender-3.6.5.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -138,10 +138,6 @@ BDEPEND="
)
"
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.0-ocio-2.3.0.patch"
-)
-
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 87e395933a39dd8f611d49d759e3dc10d919a1f8
Author: Paul Zander gmail com>
AuthorDate: Wed Oct 11 15:35:08 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 03:15:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e39593
media-gfx/blender: add quotes around variables containing whitespaces
Signed-off-by: Paul Zander gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 10 +-
media-gfx/blender/blender-3.3.8.ebuild| 18 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 14 +++---
media-gfx/blender/blender-3.5.1-r1.ebuild | 14 +++---
media-gfx/blender/blender-3.6.0.ebuild| 14 +++---
media-gfx/blender/blender-.ebuild | 14 +++---
6 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 8452075832d4..d454ab1fd985 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
- "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
- "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+ "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+ "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+ "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 12beb87e5c35..fb54fb0bca6b 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
- "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
- "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+ "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+ "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+ "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
)
blender_check_requirements() {
@@ -177,7 +177,7 @@ src_unpack() {
if use test; then
#The tests are downloaded from:
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
mkdir -p lib || die
- mv
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+ mv
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
fi
fi
@@ -202,9 +202,9 @@ src_prepare() {
sed -e "s|Exec=blender|Exec=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
sed -e "s|Icon=blender|Icon=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
- mv release/freedesktop/icons/scalable/apps/blender.svg
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
- mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
- mv release/freedesktop/blender.desktop
release/freedesktop/blender-${BV}.desktop || die
+ mv release/freedesktop/icons/scalable/apps/blender.svg
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+ mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+ mv release/freedesktop/blender.desktop
"release/freedesktop/blender-${BV}.desktop" || die
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 801a0d0bf0db..60d40272aa96 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -139,8 +139,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: 2fd9968e3b41730859eb6eca2ac6e71a8fb871a6
Author: Paul Zander gmail com>
AuthorDate: Wed Oct 11 21:23:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 03:15:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd9968e
media-gfx/blender: add 3.6.5, update
* add 3.6.5 LTS
* upstream fixed
https://projects.blender.org/blender/blender/pulls/113163 in
https://projects.blender.org/blender/blender/issues/112917
* add it to 3.6.5
* drop blockers for 3.6.5 and
Signed-off-by: Paul Zander gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
.../{blender-.ebuild => blender-3.6.5.ebuild} | 12 ++-
media-gfx/blender/blender-.ebuild | 4 +-
.../blender/files/blender-4.0.0-ocio-2.3.0.patch | 110 +
4 files changed, 119 insertions(+), 8 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b3c42c94fb98..7c56592c6b76 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,3 +3,4 @@ DIST blender-3.3.8.tar.xz 41915180 BLAKE2B
7fb24afe2151bba53d8c25160bd697145aced
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
DIST blender-3.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
+DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
similarity index 97%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-3.6.5.ebuild
index 38dad31c44af..666044f4f4ae 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
-#
-# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
@@ -68,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
@@ -140,6 +138,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.0-ocio-2.3.0.patch"
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -174,7 +176,7 @@ src_unpack() {
git-r3_src_unpack
git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
- git-r3_checkout "${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons"
+ git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
if use test; then
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 38dad31c44af..d4e734739dd6 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
#
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 260517c66ab9c9a62c189fd7407c01f3501e552c
Author: Sam James gentoo org>
AuthorDate: Fri Oct 27 02:58:05 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 02:58:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260517c6
Revert "media-gfx/blender: add quotes around variables containing whitespaces"
This reverts commit cb351207522b67d82b4b7346a4daf3d119c20830.
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 10 +-
media-gfx/blender/blender-3.3.8.ebuild| 18 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 14 +++---
media-gfx/blender/blender-3.5.1-r1.ebuild | 14 +++---
media-gfx/blender/blender-3.6.0.ebuild| 14 +++---
media-gfx/blender/blender-.ebuild | 14 +++---
6 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index b1c434b9c585..849e211f77de 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
-
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
-
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
- "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
- "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
+ "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
+
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
+
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
+ "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 1f5d50885c97..a312ee90f65b 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
-
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
-
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
- "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
- "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
+ "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
+
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
+
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
+ "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
@@ -177,7 +177,7 @@ src_unpack() {
if use test; then
#The tests are downloaded from:
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
mkdir -p lib || die
- mv
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
+ mv
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
fi
fi
@@ -202,9 +202,9 @@ src_prepare() {
sed -e "s|Exec=blender|Exec=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
sed -e "s|Icon=blender|Icon=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
- mv release/freedesktop/icons/scalable/apps/blender.svg
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
- mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
- mv release/freedesktop/blender.desktop
"release/freedesktop/blender-${BV}.desktop" || die
+ mv release/freedesktop/icons/scalable/apps/blender.svg
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+ mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+ mv release/freedesktop/blender.desktop
release/freedesktop/blender-${BV}.desktop || die
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 91dc3e3014ed..99c65802bed3 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -139,8 +139,8 @@ BDEPEND="
"
PATCHES=(
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 694c68958e60e2e098d63915f8e4dd470bc86905
Author: Sam James gentoo org>
AuthorDate: Fri Oct 27 02:57:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 02:57:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694c6895
Revert "media-gfx/blender: add 3.6.5, update "
This reverts commit 824eb57e50e0f5039d42f39e0caa5461d8d73468.
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-3.6.5.ebuild | 443 -
media-gfx/blender/blender-.ebuild | 4 +-
.../blender/files/blender-4.0.0-ocio-2.3.0.patch | 110 -
4 files changed, 3 insertions(+), 555 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 7c56592c6b76..b3c42c94fb98 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,4 +3,3 @@ DIST blender-3.3.8.tar.xz 41915180 BLAKE2B
7fb24afe2151bba53d8c25160bd697145aced
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
DIST blender-3.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
-DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
diff --git a/media-gfx/blender/blender-3.6.5.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
deleted file mode 100644
index 1f87c0fac6ef..
--- a/media-gfx/blender/blender-3.6.5.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 python3_11 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
-
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb
- alembic collada +color-management cuda +cycles cycles-bin-kernels
- debug doc +embree +ffmpeg +fftw +gmp 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 X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff )
- fluid? ( tbb )
- openvdb? ( tbb )
- optix? ( cuda )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/install_deps.sh
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=[nls?]
- dev-libs/lzo:2=
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/zstandard[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- media-libs/freetype:=[brotli]
- media-libs/libepoxy:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libsamplerate
- >=media-libs/OpenImageIO-2.4.6.0:=
- sys-libs/zlib:=
- virtual/glu
- virtual/libintl
- virtual/opengl
- alembic? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, profiles/updates/, media-libs/OpenShadingLanguage/, ...
commit: 9561ebc2ab427a9c1add754a140e426a180a7337
Author: Sam James gentoo org>
AuthorDate: Fri Oct 27 02:58:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 02:58:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9561ebc2
Revert "media-libs/osl -> media-libs/OpenShadingLanguage: rename"
This reverts commit 0c878b342a1445b3a8e3439e194f38b3a0248331.
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild| 2 +-
media-gfx/blender/blender-3.3.8.ebuild | 2 +-
media-gfx/blender/blender-3.4.1-r3.ebuild| 2 +-
media-gfx/blender/blender-3.5.1-r1.ebuild| 2 +-
media-gfx/blender/blender-3.6.0.ebuild | 2 +-
media-gfx/blender/blender-.ebuild| 2 +-
media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild | 2 +-
media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild | 2 +-
media-libs/OpenShadingLanguage/Manifest | 3 ---
media-libs/osl/Manifest | 3 +++
media-libs/{OpenShadingLanguage => osl}/metadata.xml | 2 +-
.../osl-1.12.11.0.ebuild}| 5 +++--
.../osl-1.12.13.0.ebuild}| 5 +++--
.../OpenShadingLanguage-1.12.7.0.ebuild => osl/osl-1.12.7.0.ebuild} | 5 +++--
profiles/arch/powerpc/ppc64/64le/package.mask| 2 +-
profiles/arch/powerpc/ppc64/package.mask | 2 +-
profiles/updates/4Q-2023 | 1 -
17 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index f228b85b096b..5c0e1c0aea53 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( =media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index f0d90eccb2d6..b5f8b62bf605 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( =media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index ce1a498991a1..ed1983b39c85 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -93,7 +93,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( =media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 9d71790215eb..25d45ab3d9d0 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( =media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 9d71790215eb..25d45ab3d9d0 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( =media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 6040738583aa..5a3cd2cc8b6c 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( =media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf?
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: cb351207522b67d82b4b7346a4daf3d119c20830
Author: Paul Zander gmail com>
AuthorDate: Wed Oct 11 15:35:08 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 02:31:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb351207
media-gfx/blender: add quotes around variables containing whitespaces
Signed-off-by: Paul Zander gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 10 +-
media-gfx/blender/blender-3.3.8.ebuild| 18 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 14 +++---
media-gfx/blender/blender-3.5.1-r1.ebuild | 14 +++---
media-gfx/blender/blender-3.6.0.ebuild| 14 +++---
media-gfx/blender/blender-.ebuild | 14 +++---
6 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 849e211f77de..b1c434b9c585 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
- "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
- "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+ "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+ "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+ "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index a312ee90f65b..1f5d50885c97 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
- "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
- "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+ "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+ "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+ "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
)
blender_check_requirements() {
@@ -177,7 +177,7 @@ src_unpack() {
if use test; then
#The tests are downloaded from:
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
mkdir -p lib || die
- mv
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+ mv
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
fi
fi
@@ -202,9 +202,9 @@ src_prepare() {
sed -e "s|Exec=blender|Exec=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
sed -e "s|Icon=blender|Icon=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
- mv release/freedesktop/icons/scalable/apps/blender.svg
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
- mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
- mv release/freedesktop/blender.desktop
release/freedesktop/blender-${BV}.desktop || die
+ mv release/freedesktop/icons/scalable/apps/blender.svg
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+ mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+ mv release/freedesktop/blender.desktop
"release/freedesktop/blender-${BV}.desktop" || die
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 99c65802bed3..91dc3e3014ed 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -139,8 +139,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: 824eb57e50e0f5039d42f39e0caa5461d8d73468
Author: Paul Zander gmail com>
AuthorDate: Wed Oct 11 21:23:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 02:31:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824eb57e
media-gfx/blender: add 3.6.5, update
* add 3.6.5 LTS
* upstream fixed
https://projects.blender.org/blender/blender/pulls/113163 in
https://projects.blender.org/blender/blender/issues/112917
* add it to 3.6.5
* drop blockers for 3.6.5 and
Signed-off-by: Paul Zander gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
.../{blender-.ebuild => blender-3.6.5.ebuild} | 12 ++-
media-gfx/blender/blender-.ebuild | 4 +-
.../blender/files/blender-4.0.0-ocio-2.3.0.patch | 110 +
4 files changed, 119 insertions(+), 8 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b3c42c94fb98..7c56592c6b76 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,3 +3,4 @@ DIST blender-3.3.8.tar.xz 41915180 BLAKE2B
7fb24afe2151bba53d8c25160bd697145aced
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
DIST blender-3.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
+DIST blender-3.6.5.tar.xz 70447868 BLAKE2B
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
SHA512
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-3.6.5.ebuild
similarity index 97%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-3.6.5.ebuild
index a637534483c4..1f87c0fac6ef 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
-#
-# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
@@ -68,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
@@ -140,6 +138,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.0-ocio-2.3.0.patch"
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -174,7 +176,7 @@ src_unpack() {
git-r3_src_unpack
git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
- git-r3_checkout "${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons"
+ git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
if use test; then
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index a637534483c4..d32731e15fef 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
#
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-libs/embree/, profiles/arch/x86/, ...
commit: 060642c3e2944ee6d37afd3259c424b3a8f5bdec
Author: Paul Zander gmail com>
AuthorDate: Sat Sep 2 12:41:09 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 02:31:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060642c3
media-libs/openimageio -> media-libs/OpenImageIO: rename
* OpenImageIO is now part of AcademySoftwareFoundation, reflect that and
the changed paths
Signed-off-by: Paul Zander gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 2 +-
media-gfx/blender/blender-3.3.8.ebuild | 2 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 2 +-
media-gfx/blender/blender-3.5.1-r1.ebuild | 2 +-
media-gfx/blender/blender-3.6.0.ebuild | 2 +-
media-gfx/blender/blender-.ebuild | 2 +-
media-gfx/blender/metadata.xml | 2 +-
media-libs/OpenImageIO/Manifest| 7 +++
.../OpenImageIO-2.4.12.0.ebuild} | 18 +-
.../OpenImageIO-2.4.13.0.ebuild} | 18 +-
.../OpenImageIO-2.4.6.0-r1.ebuild} | 16
media-libs/{openimageio => OpenImageIO}/metadata.xml | 2 +-
media-libs/embree/embree-3.13.4.ebuild | 2 +-
media-libs/embree/embree-3.13.5.ebuild | 2 +-
media-libs/opencolorio/opencolorio-2.1.3.ebuild| 2 +-
media-libs/opencolorio/opencolorio-2.2.1.ebuild| 2 +-
media-libs/opencolorio/opencolorio-2.3.0.ebuild| 2 +-
media-libs/openimageio/Manifest| 7 ---
media-libs/osl/osl-1.12.11.0.ebuild| 2 +-
media-libs/osl/osl-1.12.13.0.ebuild| 2 +-
media-libs/osl/osl-1.12.7.0.ebuild | 2 +-
profiles/arch/powerpc/package.use.mask | 2 +-
profiles/arch/powerpc/ppc64/64le/package.mask | 2 +-
profiles/arch/powerpc/ppc64/package.mask | 2 +-
profiles/arch/x86/package.use.stable.mask | 2 +-
profiles/updates/4Q-2023 | 1 +
26 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 8452075832d4..ff74f60260ae 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-1.4.1 )
- openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+ openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 12beb87e5c35..ec894f0f44c9 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-1.4.1 )
- openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+ openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 801a0d0bf0db..7aac532555f8 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -82,7 +82,7 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-1.4.1 )
- openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+ openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 879f40ec9257..1cd394e1e6c6 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${PYTHON_DEPS}
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
- >=media-libs/openimageio-2.4.6.0:=
+ >=media-libs/OpenImageIO-2.4.6.0:=
sys-libs/zlib:=
virtual/glu
virtual/libintl
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 879f40ec9257..1cd394e1e6c6 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${PYTHON_DEPS}
media-libs/libjpeg-turbo:=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: bc2bb6bf9446655262e283747f0dc6136ab78225
Author: Sam James gentoo org>
AuthorDate: Tue Oct 3 16:26:54 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 3 16:26:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2bb6bf
media-gfx/blender: Stabilize 3.3.8 amd64, #915118
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 920d4210ff7c..12beb87e5c35 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -19,7 +19,7 @@ else
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
#SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: 580ee060c186678d960994df4f6d21133ac4b393
Author: Sam James gentoo org>
AuthorDate: Tue Oct 3 16:22:20 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 3 16:22:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580ee060
media-gfx/blender: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/914740
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild| 1 +
media-gfx/blender/blender-3.3.8.ebuild | 1 +
media-gfx/blender/blender-3.4.1-r3.ebuild| 1 +
media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch | 12
4 files changed, 15 insertions(+)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 5680b3b6a336..8452075832d4 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index fac6a83ed7f7..920d4210ff7c 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 7a0b020b28fc..801a0d0bf0db 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -140,6 +140,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+ "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
new file mode 100644
index ..955be2424e19
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/914740
+--- a/intern/cycles/util/thread.cpp
b/intern/cycles/util/thread.cpp
+@@ -6,6 +6,8 @@
+ #include "util/system.h"
+ #include "util/windows.h"
+
++#include
++
+ CCL_NAMESPACE_BEGIN
+
+ thread::thread(function run_cb) : run_cb_(run_cb), joined_(false)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 15af81f90147dc0c168ebab363e83dc4d05ae606
Author: Paul Zander gmail com>
AuthorDate: Tue Sep 26 17:55:35 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 26 20:45:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15af81f9
media-gfx/blender: restrict media-libs/opencolorio-2.3.0
opencolorio-2.3.0 breaks blender
https://projects.blender.org/blender/blender/issues/112917
Signed-off-by: Paul Zander gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33068
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 2 +-
media-gfx/blender/blender-3.3.8.ebuild| 2 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 2 +-
media-gfx/blender/blender-3.5.1-r1.ebuild | 2 +-
media-gfx/blender/blender-3.6.0.ebuild| 2 +-
media-gfx/blender/blender-.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 04f62d303e24..eabe2ae0f55b 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 467898aeb69d..b35326bba742 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index ec655cdc80d6..fa0c7edc5a74 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 6195b3959d35..a2be63df0bb2 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 6195b3959d35..a2be63df0bb2 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 581cfd48c748..35361e3747a9 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: b6281e1158d30989b10d1e1f90be1b40c9bf0473
Author: Sam James gentoo org>
AuthorDate: Tue Sep 26 20:47:31 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 26 20:47:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6281e11
media-gfx/blender: add comment for gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 2 ++
media-gfx/blender/blender-3.3.8.ebuild| 2 ++
media-gfx/blender/blender-3.4.1-r3.ebuild | 2 ++
media-gfx/blender/blender-3.5.1-r1.ebuild | 2 ++
media-gfx/blender/blender-3.6.0.ebuild| 2 ++
media-gfx/blender/blender-.ebuild | 2 ++
6 files changed, 12 insertions(+)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index eabe2ae0f55b..5680b3b6a336 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -44,6 +44,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
+#
+# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index b35326bba742..fac6a83ed7f7 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -44,6 +44,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
+#
+# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index fa0c7edc5a74..7a0b020b28fc 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -44,6 +44,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
+#
+# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index a2be63df0bb2..879f40ec9257 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -45,6 +45,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
+#
+# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index a2be63df0bb2..879f40ec9257 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -45,6 +45,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
+#
+# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 35361e3747a9..1d0f62f242c9 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -45,6 +45,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
# Library versions for official builds can be found in the blender source
directory in:
# build_files/build_environment/install_deps.sh
+#
+# https://projects.blender.org/blender/blender/issues/112917.
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: a812d47ab48c8b0cf840d848b9d7fef6f5b15111
Author: Sebastian Parborg gmail com>
AuthorDate: Sun Jul 2 20:54:03 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 16 18:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a812d47a
media-gfx/blender: Bump 3.6.0
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.6.0.ebuild | 428 +
2 files changed, 429 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e79648f1d356..b3c42c94fb98 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,3 +2,4 @@ DIST blender-3.3.6.tar.xz 41912972 BLAKE2B
94f9dd1a7993f399d612275ed3cfc1d482b07
DIST blender-3.3.8.tar.xz 41915180 BLAKE2B
7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76
SHA512
63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
+DIST blender-3.6.0.tar.xz 70428872 BLAKE2B
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
SHA512
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
new file mode 100644
index ..28e3907b79b1
--- /dev/null
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
+
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb
+ alembic collada +color-management cuda +cycles cycles-bin-kernels
+ debug doc +embree +ffmpeg +fftw +gmp 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 X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ optix? ( cuda )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=[brotli]
+ media-libs/libepoxy:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ >=media-libs/openimageio-2.4.6.0:=
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 8b16711c375dffd158379edb95bdb38098c77b2a
Author: Sebastian Parborg gmail com>
AuthorDate: Sun Jul 2 20:15:21 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 16 18:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b16711c
media-gfx/blender: Bump 3.3.8
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.3.8.ebuild | 410 +
2 files changed, 411 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b1c6eae8dfe5..e79648f1d356 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,4 @@
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
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
new file mode 100644
index ..650e8d12291a
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ optix? ( cuda )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=[brotli]
+ media-libs/glew:*
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ embree? ( >=media-libs/embree-3.10.0[raymask] )
+ ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ fftw? ( sci-libs/fftw:3.0= )
+ gmp? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 06e1298c10ac217553b5b64e69e9877f247f9b41
Author: Sebastian Parborg gmail com>
AuthorDate: Sun Jul 2 22:14:28 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 16 18:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e1298c
media-gfx/blender: Fix compilation on arm64
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.8.ebuild| 3 +++
media-gfx/blender/blender-3.4.1-r3.ebuild | 3 +++
media-gfx/blender/blender-3.5.1-r1.ebuild | 3 +++
media-gfx/blender/blender-3.6.0.ebuild| 3 +++
media-gfx/blender/blender-.ebuild | 3 +++
5 files changed, 15 insertions(+)
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 4d537708342b..467898aeb69d 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -282,6 +282,9 @@ src_configure() {
)
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
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 4c94d176f10c..ec655cdc80d6 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -296,6 +296,9 @@ src_configure() {
)
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
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 3a41bd4ce801..6195b3959d35 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -300,6 +300,9 @@ src_configure() {
)
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
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 3a41bd4ce801..6195b3959d35 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -300,6 +300,9 @@ src_configure() {
)
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
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index d6db9dfe90a8..581cfd48c748 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -300,6 +300,9 @@ src_configure() {
)
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
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d6af608ad3b3519f7cbd4e4158afbb7c979d887c
Author: Sebastian Parborg gmail com>
AuthorDate: Sun Jul 2 21:06:55 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 16 18:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6af608a
media-gfx/blender: Disable OSL support per default
Because llvm 16 is now marked stable, there is a very high chance of
users having Blender sefault on startup because of missmatched llvm
libraries.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 10 +-
media-gfx/blender/blender-3.3.8.ebuild| 10 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 10 +-
media-gfx/blender/blender-3.5.1-r1.ebuild | 10 +-
media-gfx/blender/blender-3.6.0.ebuild| 10 +-
media-gfx/blender/blender-.ebuild | 10 +-
6 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 0ba992b8d937..04f62d303e24 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -28,7 +28,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
test +tiff valgrind"
RESTRICT="!test? ( test ) test"
@@ -383,6 +383,14 @@ pkg_postinst() {
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
+ if use osl; then
+ ewarn ""
+ ewarn "OSL is know to cause runtime segfaults if Mesa has been
linked to"
+ ewarn "an other LLVM version than what OSL is linked to."
+ ewarn "See https://bugs.gentoo.org/880671 for more details"
+ ewarn ""
+ fi
+
if ! use python_single_target_python3_10; then
elog "You are building Blender with a newer python version than"
elog "supported by this version upstream."
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index 650e8d12291a..4d537708342b 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -28,7 +28,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
test +tiff valgrind"
RESTRICT="!test? ( test ) test"
@@ -383,6 +383,14 @@ pkg_postinst() {
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
+ if use osl; then
+ ewarn ""
+ ewarn "OSL is know to cause runtime segfaults if Mesa has been
linked to"
+ ewarn "an other LLVM version than what OSL is linked to."
+ ewarn "See https://bugs.gentoo.org/880671 for more details"
+ ewarn ""
+ fi
+
if ! use python_single_target_python3_10; then
elog "You are building Blender with a newer python version than"
elog "supported by this version upstream."
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 78ad154c35e2..4c94d176f10c 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -28,7 +28,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
test +tiff valgrind wayland X"
RESTRICT="!test? ( test )"
@@ -397,6 +397,14 @@ pkg_postinst() {
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
+ if use osl; then
+ ewarn ""
+ ewarn "OSL is know to cause runtime segfaults if Mesa has been
linked to"
+ ewarn "an other LLVM version than what OSL is linked to."
+ ewarn "See https://bugs.gentoo.org/880671 for more details"
+ ewarn ""
+ fi
+
if ! use python_single_target_python3_10; then
elog
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 8e7ae13c4119cceda0de6a883da5d81e07dcff5a
Author: Sebastian Parborg gmail com>
AuthorDate: Sun Jul 2 18:56:20 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 16 18:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7ae13c
media-gfx/blender: Remove bundled libs warning
Blender will not unbundle the libs in question, however they do provide
"WITH_SYSTEM_" where it makes sense.
The vast majority of the bundled libs that do not have settings like
these will not be unbundled and upstream is quite firm with this stance.
Therefore, having a call to action about nagging upstream about it does
not make too much sense.
Closes: https://bugs.gentoo.org/505386
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 7 ---
media-gfx/blender/blender-3.4.1-r3.ebuild | 7 ---
media-gfx/blender/blender-3.5.1-r1.ebuild | 7 ---
media-gfx/blender/blender-.ebuild | 7 ---
4 files changed, 28 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index e2e9970bdc09..0ba992b8d937 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -382,13 +382,6 @@ pkg_postinst() {
elog "home directory. This can be done by starting blender, then"
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
- ewarn
- ewarn "This ebuild does not unbundle the massive amount of 3rd party"
- ewarn "libraries which are shipped with blender. Note that"
- ewarn "these have caused security issues in the past."
- ewarn "If you are concerned about security, file a bug upstream:"
- ewarn " https://developer.blender.org/;
- ewarn
if ! use python_single_target_python3_10; then
elog "You are building Blender with a newer python version than"
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 4f4de607bab6..78ad154c35e2 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -396,13 +396,6 @@ pkg_postinst() {
elog "home directory. This can be done by starting blender, then"
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
- ewarn
- ewarn "This ebuild does not unbundle the massive amount of 3rd party"
- ewarn "libraries which are shipped with blender. Note that"
- ewarn "these have caused security issues in the past."
- ewarn "If you are concerned about security, file a bug upstream:"
- ewarn " https://developer.blender.org/;
- ewarn
if ! use python_single_target_python3_10; then
elog "You are building Blender with a newer python version than"
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index a41f59bcce82..28e3907b79b1 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -400,13 +400,6 @@ pkg_postinst() {
elog "home directory. This can be done by starting blender, then"
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
- ewarn
- ewarn "This ebuild does not unbundle the massive amount of 3rd party"
- ewarn "libraries which are shipped with blender. Note that"
- ewarn "these have caused security issues in the past."
- ewarn "If you are concerned about security, file a bug upstream:"
- ewarn " https://developer.blender.org/;
- ewarn
if ! use python_single_target_python3_10; then
elog "You are building Blender with a newer python version than"
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 5448ff64cb97..e5b31060c53c 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -400,13 +400,6 @@ pkg_postinst() {
elog "home directory. This can be done by starting blender, then"
elog "changing the 'Temporary Files' directory in Blender preferences."
elog
- ewarn
- ewarn "This ebuild does not unbundle the massive amount of 3rd party"
- ewarn "libraries which are shipped with blender. Note that"
- ewarn "these have caused security issues in the past."
- ewarn "If you are concerned about security, file a bug upstream:"
- ewarn " https://developer.blender.org/;
- ewarn
if ! use python_single_target_python3_10; then
elog "You are building Blender with a newer python version than"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 49476cc3492a33122007056692d574961c91646a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 17 11:55:05 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 17 13:18:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49476cc3
media-gfx/blender: drop 3.3.5
Bug: https://bugs.gentoo.org/908375
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-3.3.5.ebuild | 417 -
2 files changed, 418 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9b4f8a177689..b1c6eae8dfe5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,4 +1,3 @@
-DIST blender-3.3.5.tar.xz 41889880 BLAKE2B
145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e
SHA512
021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
DIST blender-3.3.6.tar.xz 41912972 BLAKE2B
94f9dd1a7993f399d612275ed3cfc1d482b0778d2d0b50ae40b73714b6afce93e036915a5b8ea415b6642b1e2d0a281db15ba8addd95c23771c381050722aac7
SHA512
db453b9c7c0ad508e04f603c970e111afb577f3dc0bd25f2ce47312e8560223dcf0307b0a306014dd79adda76de49b6d26e6e63400cade1430568332fe5b2d57
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
diff --git a/media-gfx/blender/blender-3.3.5.ebuild
b/media-gfx/blender/blender-3.3.5.ebuild
deleted file mode 100644
index 7a781db97e77..
--- a/media-gfx/blender/blender-3.3.5.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 python3_11 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
- test +tiff valgrind"
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- fluid? ( tbb )
- openvdb? ( tbb )
- optix? ( cuda )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/install_deps.sh
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=[nls?]
- dev-libs/lzo:2=
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/zstandard[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- media-libs/freetype:=[brotli]
- media-libs/glew:*
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libsamplerate
- sys-libs/zlib:=
- virtual/glu
- virtual/libintl
- virtual/opengl
- alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
- collada? ( >=media-libs/opencollada-1.6.68 )
- color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
- cuda? ( dev-util/nvidia-cuda-toolkit:= )
- embree? ( >=media-libs/embree-3.10.0[raymask] )
- ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
- fftw? ( sci-libs/fftw:3.0= )
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: f04d8c922ee33575b4a16ee59b5a43cf8553bdb0
Author: Sam James gentoo org>
AuthorDate: Fri Jun 16 22:58:51 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 16 22:58:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f04d8c92
media-gfx/blender: Stabilize 3.3.6-r1 amd64, #908375
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index cc5aa34933da..e2e9970bdc09 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -19,7 +19,7 @@ else
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
#SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 6462f89ecfe4d2d9fc49d95c61307f8ecf12ebb0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 29 09:44:28 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 10 22:56:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6462f89e
media-gfx/blender: Switch IUSE=pulseaudio to media-libs/libpulse
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/blender/{blender-3.3.6.ebuild => blender-3.3.6-r1.ebuild}| 2 +-
media-gfx/blender/{blender-3.4.1-r2.ebuild => blender-3.4.1-r3.ebuild} | 2 +-
media-gfx/blender/{blender-3.5.1.ebuild => blender-3.5.1-r1.ebuild}| 2 +-
media-gfx/blender/blender-.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
similarity index 99%
rename from media-gfx/blender/blender-3.3.6.ebuild
rename to media-gfx/blender/blender-3.3.6-r1.ebuild
index 6034a136dbad..cc5aa34933da 100644
--- a/media-gfx/blender/blender-3.3.6.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -100,7 +100,7 @@ RDEPEND="${PYTHON_DEPS}
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb:= )
diff --git a/media-gfx/blender/blender-3.4.1-r2.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
similarity index 99%
rename from media-gfx/blender/blender-3.4.1-r2.ebuild
rename to media-gfx/blender/blender-3.4.1-r3.ebuild
index b7cda8da250a..4f4de607bab6 100644
--- a/media-gfx/blender/blender-3.4.1-r2.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb:= )
diff --git a/media-gfx/blender/blender-3.5.1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
similarity index 99%
rename from media-gfx/blender/blender-3.5.1.ebuild
rename to media-gfx/blender/blender-3.5.1-r1.ebuild
index 2a0147fb25ac..a41f59bcce82 100644
--- a/media-gfx/blender/blender-3.5.1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -97,7 +97,7 @@ RDEPEND="${PYTHON_DEPS}
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb:= )
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 95fefb89052d..5448ff64cb97 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -97,7 +97,7 @@ RDEPEND="${PYTHON_DEPS}
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb:= )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 4957270c6d5760bb160d15002f77bf4a2657f1bb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 10 20:11:16 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 10 20:46:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4957270c
media-gfx/blender: drop 3.3.2, 3.3.3, 3.4.1, 3.4.1-r1
Overshadowed versions.
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/blender/Manifest| 2 -
media-gfx/blender/blender-3.3.2.ebuild| 417 -
media-gfx/blender/blender-3.3.3.ebuild| 417 -
media-gfx/blender/blender-3.4.1-r1.ebuild | 430 --
media-gfx/blender/blender-3.4.1.ebuild| 430 --
5 files changed, 1696 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 0a2e6e498460..9b4f8a177689 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,3 @@
-DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
-DIST blender-3.3.3.tar.xz 41918008 BLAKE2B
6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b
SHA512
1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83
DIST blender-3.3.5.tar.xz 41889880 BLAKE2B
145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e
SHA512
021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
DIST blender-3.3.6.tar.xz 41912972 BLAKE2B
94f9dd1a7993f399d612275ed3cfc1d482b0778d2d0b50ae40b73714b6afce93e036915a5b8ea415b6642b1e2d0a281db15ba8addd95c23771c381050722aac7
SHA512
db453b9c7c0ad508e04f603c970e111afb577f3dc0bd25f2ce47312e8560223dcf0307b0a306014dd79adda76de49b6d26e6e63400cade1430568332fe5b2d57
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
diff --git a/media-gfx/blender/blender-3.3.2.ebuild
b/media-gfx/blender/blender-3.3.2.ebuild
deleted file mode 100644
index fd4e11b2d91a..
--- a/media-gfx/blender/blender-3.3.2.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
- test +tiff valgrind"
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- fluid? ( tbb )
- openvdb? ( tbb )
- optix? ( cuda )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/install_deps.sh
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=[nls?]
- dev-libs/lzo:2=
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/zstandard[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- media-libs/freetype:=[brotli]
- media-libs/glew:*
- media-libs/libjpeg-turbo:=
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: a73ee3d444b55c296e9a48e8ad90d2718b72e2a0 Author: Sam James gentoo org> AuthorDate: Sun May 14 17:01:39 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 14 17:10:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73ee3d4 media-gfx/blender: defer to new global USE=valgrind description Signed-off-by: Sam James gentoo.org> media-gfx/blender/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index f57d99a79c61..5b6cbb8d18d1 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -85,9 +85,5 @@ Use threading building blocks library from dev-cpp/tbb. - - Add support for memory debugging using - dev-util/valgrind -
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 66a8edbbedeeaf3de50e39676ae4bffb3b38376d
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 1 09:38:26 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 15:14:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a8edbb
media-gfx/blender: Drop 2.93
Does not support python 3.11, and upstream will drop support as well in
a few months.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 4 -
media-gfx/blender/blender-2.93.13.ebuild | 402 -
media-gfx/blender/blender-2.93.14.ebuild | 402 -
.../blender/files/blender-2.93.13-openvdb-10.patch | 107 --
...ntern-ghost-fix-typo-in-finding-XF86VMODE.patch | 31 --
.../blender/files/blender-3.0.1-openexr.patch | 190 --
.../files/blender-3.0.1-openimageio-2.3.patch | 29 --
media-gfx/blender/metadata.xml | 3 -
8 files changed, 1168 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index f1fee3592d06..0a2e6e498460 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,3 @@
-DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
-DIST blender-2.93.13.tar.xz 43029716 BLAKE2B
ca222af581c4cddbc3e0607054ee3fd117b672550466d61bbcb608e85627ae78c816d7fb5f49134e17560fc1357de1505c3c17fc96fde1218239289c2d325055
SHA512
c94ff7f7b6521cc1521a1f0a22a5cb135114485dac78556764e25fc25bece168d96f6074959bf1521910191818785c6eac8c17164094415bd6bd7e23e307e56b
-DIST blender-2.93.14.tar.xz 43035804 BLAKE2B
72ca99143da393bb23e15a26e197c5ac45cd0bfb487b5dda617cb42f107dda0518c787294ad799c34712ee5948da81a573880cd642fc26bd1ae437b516ec41b6
SHA512
2b395a6acad808c3d2eb80355320d237fff7c0a188d1455fecd65189d7672927087ab7dcf7d07c3d541279c142846763be8dc495a2aa625c08f17ef543ba8bc5
-DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
DIST blender-3.3.3.tar.xz 41918008 BLAKE2B
6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b
SHA512
1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83
DIST blender-3.3.5.tar.xz 41889880 BLAKE2B
145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e
SHA512
021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
diff --git a/media-gfx/blender/blender-2.93.13.ebuild
b/media-gfx/blender/blender-2.93.13.ebuild
deleted file mode 100644
index f3da165815e3..
--- a/media-gfx/blender/blender-2.93.13.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 python3_10 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
-
- TEST_TARBALL_VERSION=2.93.0
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
- KEYWORDS="amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
- man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7d1101faa1d4e4780a4aed889210b1fa35ab0490
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 1 09:20:44 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 15:13:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d1101fa
media-gfx/blender: Explicitly disable OpenPGL in the 3.4 ebuild
Blender 3.4 only supports the beta versions of OpenPGL ( < 0.5.0 ).
To ensure it doesn't get turned on automatically, we explicitly
disable it now.
Closes: https://bugs.gentoo.org/905108
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.4.1-r2.ebuild | 431 ++
1 file changed, 431 insertions(+)
diff --git a/media-gfx/blender/blender-3.4.1-r2.ebuild
b/media-gfx/blender/blender-3.4.1-r2.ebuild
new file mode 100644
index ..b7cda8da250a
--- /dev/null
+++ b/media-gfx/blender/blender-3.4.1-r2.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ optix? ( cuda )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=[brotli]
+ media-libs/libepoxy:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ embree? ( >=media-libs/embree-3.10.0[raymask] )
+ ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ fftw? ( sci-libs/fftw:3.0= )
+ gmp? ( dev-libs/gmp )
+ jack? ( virtual/jack )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( media-libs/openal )
+ oidn? ( >=media-libs/oidn-1.4.1 )
+ openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+ openexr? (
+ >=dev-libs/imath-3.1.4-r2:=
+ >=media-libs/openexr-3:0=
+ )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
+ openvdb? (
+ >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+ dev-libs/c-blosc:=
+ )
+ optix? ( =media-libs/osl-1.11.16.0-r3:= )
+ pdf? ( media-libs/libharu )
+ potrace? ( media-gfx/potrace )
+ pugixml? ( dev-libs/pugixml )
+ pulseaudio? ( media-sound/pulseaudio )
+ sdl? ( media-libs/libsdl2[sound,joystick] )
+ sndfile? ( media-libs/libsndfile )
+ tbb? ( dev-cpp/tbb:= )
+ tiff? ( media-libs/tiff:= )
+ valgrind? ( dev-util/valgrind )
+ wayland? (
+ >=dev-libs/wayland-1.12
+ >=dev-libs/wayland-protocols-1.15
+ >=x11-libs/libxkbcommon-0.2.0
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 83e11075c561d5196dd1513ad108a03b6aebe3e8
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 1 09:32:10 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 15:13:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e11075
media-gfx/blender: Bump 3.3.6
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.3.6.ebuild | 417 +
2 files changed, 418 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index a3bacfc9cc25..f1fee3592d06 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -5,5 +5,6 @@ DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358
DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
DIST blender-3.3.3.tar.xz 41918008 BLAKE2B
6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b
SHA512
1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83
DIST blender-3.3.5.tar.xz 41889880 BLAKE2B
145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e
SHA512
021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
+DIST blender-3.3.6.tar.xz 41912972 BLAKE2B
94f9dd1a7993f399d612275ed3cfc1d482b0778d2d0b50ae40b73714b6afce93e036915a5b8ea415b6642b1e2d0a281db15ba8addd95c23771c381050722aac7
SHA512
db453b9c7c0ad508e04f603c970e111afb577f3dc0bd25f2ce47312e8560223dcf0307b0a306014dd79adda76de49b6d26e6e63400cade1430568332fe5b2d57
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
diff --git a/media-gfx/blender/blender-3.3.6.ebuild
b/media-gfx/blender/blender-3.3.6.ebuild
new file mode 100644
index ..6034a136dbad
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.6.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ optix? ( cuda )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: a44e0ff7e8385b948a1a307f6e73d8be7e249b84
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 1 09:28:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 15:13:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44e0ff7
media-gfx/blender: Bump to 3.5.1
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.5.1.ebuild | 435 +
2 files changed, 436 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 26a65712459f..a3bacfc9cc25 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -6,3 +6,4 @@ DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d734
DIST blender-3.3.3.tar.xz 41918008 BLAKE2B
6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b
SHA512
1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83
DIST blender-3.3.5.tar.xz 41889880 BLAKE2B
145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e
SHA512
021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
+DIST blender-3.5.1.tar.xz 69780800 BLAKE2B
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
SHA512
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
diff --git a/media-gfx/blender/blender-3.5.1.ebuild
b/media-gfx/blender/blender-3.5.1.ebuild
new file mode 100644
index ..2a0147fb25ac
--- /dev/null
+++ b/media-gfx/blender/blender-3.5.1.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
+
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ # SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb
+ alembic collada +color-management cuda +cycles cycles-bin-kernels
+ debug doc +embree +ffmpeg +fftw +gmp 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 X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ optix? ( cuda )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=[brotli]
+ media-libs/libepoxy:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ >=media-libs/openimageio-2.4.6.0:=
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 30baadfedf224cf64d0fd9fb64e1475ba9098a2c
Author: Sam James gentoo org>
AuthorDate: Mon May 1 01:30:38 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 01:30:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30baadfe
media-gfx/blender: Stabilize 3.3.5 amd64, #904636
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-3.3.5.ebuild
b/media-gfx/blender/blender-3.3.5.ebuild
index 6034a136dbad..7a781db97e77 100644
--- a/media-gfx/blender/blender-3.3.5.ebuild
+++ b/media-gfx/blender/blender-3.3.5.ebuild
@@ -19,7 +19,7 @@ else
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
#SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 70a6bf73959309592da602eac78f1666f85fd946
Author: Sebastian Parborg gmail com>
AuthorDate: Thu Apr 6 10:01:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 02:45:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6bf73
media-gfx/blender: Bump 3.3.5, update python use versions
2.93 will not work with python 3.11, so that version is left out
Closes: https://bugs.gentoo.org/896980
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
.../{blender-.ebuild => blender-3.3.5.ebuild} | 74 --
...blender-.ebuild => blender-3.4.1-r1.ebuild} | 33 --
media-gfx/blender/blender-.ebuild | 2 +-
4 files changed, 44 insertions(+), 66 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 35bf4c6d6a6c..26a65712459f 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,4 +4,5 @@ DIST blender-2.93.14.tar.xz 43035804 BLAKE2B
72ca99143da393bb23e15a26e197c5ac45c
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
DIST blender-3.3.3.tar.xz 41918008 BLAKE2B
6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b
SHA512
1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83
+DIST blender-3.3.5.tar.xz 41889880 BLAKE2B
145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e
SHA512
021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-3.3.5.ebuild
similarity index 87%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-3.3.5.ebuild
index 91dbd95c84f7..6034a136dbad 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-3.3.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_10 python3_11 )
inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
@@ -13,30 +13,29 @@ HOMEPAGE="https://www.blender.org;
if [[ ${PV} = ** ]] ; then
# Subversion is needed for downloading unit test files
inherit git-r3 subversion
- EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
-
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles cycles-bin-kernels \
- debug doc +embree +ffmpeg +fftw +gmp 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 X"
-RESTRICT="!test? ( test )"
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
+RESTRICT="!test? ( test ) test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7f572b9f9d71cce259aa40e839764ed318ae7b8f
Author: Sebastian Parborg gmail com>
AuthorDate: Mon Apr 3 16:17:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 02:45:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f572b9f
media-gfx/blender: Add "cycles-bin-kernels" useflag
This useflag enables precompiling the cycles render kernels at compile
time. This makes it so that the user doesn't have to wait for the
kernels to compile when they are used for the first time.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 3 ++-
media-gfx/blender/metadata.xml| 5 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 73275c6a9326..1ae2234b408e 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -26,7 +26,7 @@ fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
+ alembic collada +color-management cuda +cycles cycles-bin-kernels \
debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
@@ -237,6 +237,7 @@ src_configure() {
-DWITH_CODEC_SNDFILE=$(usex sndfile)
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_CYCLES=$(usex cycles)
+ -DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-DWITH_CYCLES_EMBREE=$(usex embree)
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 41cc89220a5f..dcb3cb492150 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -37,6 +37,11 @@
Build cycles renderer (requires
media-libs/openimageio and
dev-libs/boost).
+
+ Precompile the cycles render kernels for the
CUDA/HIP/OneAPI backends, if they are enabled, at compile time.
+ This makes it so that the user doesn't have to wait for
the kernels to compile when they are used for the first time in Blender.
+ If this option is not on, they will be built as needed
at runtime.
+
Adds DDS textures support to Blender.
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 505af6202a3eacd6c03e1e6857b50fd97e4a2c77
Author: Sebastian Parborg gmail com>
AuthorDate: Sat Apr 15 13:07:45 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 02:45:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505af620
media-gfx/blender: Remove unnecessary backslashes from IUSE
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30498
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 77ff3594ed06..95fefb89052d 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -25,11 +25,11 @@ fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles cycles-bin-kernels \
- debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl \
+IUSE="+bullet +dds +fluid +openexr +tbb
+ alembic collada +color-management cuda +cycles cycles-bin-kernels
+ debug doc +embree +ffmpeg +fftw +gmp 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 X"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: f115e03bb257995464328a27fa1d4aad16c95bdc
Author: Sebastian Parborg gmail com>
AuthorDate: Mon Apr 3 16:41:24 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 02:45:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f115e03b
media-gfx/blender: OpenImageIO is now a hard dependecy in newer Blender versions
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 1ae2234b408e..c804e553b60d 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -28,15 +28,15 @@ LICENSE="|| ( GPL-3 BL )"
IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles cycles-bin-kernels \
debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
- test +tiff valgrind wayland X"
+ man +nanovdb ndof nls openal +oidn +openmp +opensubdiv \
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl \
+ +sndfile test +tiff valgrind wayland X"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
+ cycles? ( openexr tiff )
fluid? ( tbb )
openvdb? ( tbb )
optix? ( cuda )
@@ -59,6 +59,7 @@ RDEPEND="${PYTHON_DEPS}
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
+ >=media-libs/openimageio-2.4.6.0:=
sys-libs/zlib:=
virtual/glu
virtual/libintl
@@ -81,7 +82,6 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-1.4.1 )
- openimageio? ( >=media-libs/openimageio-2.4.6.0:= )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
@@ -273,7 +273,6 @@ src_configure() {
-DWITH_OPENCOLLADA=$(usex collada)
-DWITH_OPENCOLORIO=$(usex color-management)
-DWITH_OPENIMAGEDENOISE=$(usex oidn)
- -DWITH_OPENIMAGEIO=$(usex openimageio)
-DWITH_OPENMP=$(usex openmp)
-DWITH_OPENSUBDIV=$(usex opensubdiv)
-DWITH_OPENVDB=$(usex openvdb)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: e8b52f663a5dca9a397a7d5cc225da5fb5fb7a87
Author: Sebastian Parborg gmail com>
AuthorDate: Mon Apr 3 16:01:36 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 02:45:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b52f66
media-gfx/blender: Update live ebuild
Addons have moved to be a non submodule
Asset libraries have been introduced and Blender bundles a
few default assets per default.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 11870198acb9..73275c6a9326 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -14,8 +14,9 @@ if [[ ${PV} = ** ]] ; then
# Subversion is needed for downloading unit test files
inherit git-r3 subversion
EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
+
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
else
-
SRC_URI="https://projects.blender.org/blender/blender/archive/v${PV}.tar.gz;
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
@@ -168,10 +169,16 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} = ** ]] ; then
git-r3_src_unpack
+
+ git-r3_fetch ${ADDONS_EGIT_REPO_URI}
+ git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons
+
if use test; then
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
subversion_fetch ${TESTS_SVN_URL} ../lib/tests
fi
+
ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
+ subversion_fetch ${ASSETS_SVN_URL} ../lib/assets
else
default
if use test; then
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: c0f7e134663da16630a3fe349c1593f9de8f38b3
Author: Sebastian Parborg gmail com>
AuthorDate: Mon Apr 3 16:35:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 16 02:45:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f7e134
media-gfx/blender: Add path guiding support the live ebuild
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 4 +++-
media-gfx/blender/metadata.xml| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index c804e553b60d..91dbd95c84f7 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -28,7 +28,7 @@ LICENSE="|| ( GPL-3 BL )"
IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles cycles-bin-kernels \
debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openmp +opensubdiv \
+ man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv \
+openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl \
+sndfile test +tiff valgrind wayland X"
RESTRICT="!test? ( test )"
@@ -86,6 +86,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
+ openpgl? ( media-libs/openpgl )
opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
@@ -242,6 +243,7 @@ src_configure() {
-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
+ -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl)
-DWITH_CYCLES_STANDALONE=OFF
-DWITH_CYCLES_STANDALONE_GUI=OFF
-DWITH_DOC_MANPAGE=$(usex man)
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index dcb3cb492150..5107673c50f9 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -65,6 +65,7 @@
Allow OpenCL Graphics Acceleration. This may
require extra graphics card drivers.
Enable OpenImageIO Support
+ Enable path guiding support in
Cycles
Add rendering support form OpenSubdiv from Dreamworks
Animation
through media-libs/opensubdiv.
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 302c6828242dacccb49ffa3139495530093abd55
Author: Sam James gentoo org>
AuthorDate: Fri Feb 17 05:23:01 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 17 05:23:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302c6828
media-gfx/blender: destabilize 2.93.14 for ~amd64
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.93.14.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/blender/blender-2.93.14.ebuild
b/media-gfx/blender/blender-2.93.14.ebuild
index 60c8f2eacc38..e5ed153b5002 100644
--- a/media-gfx/blender/blender-2.93.14.ebuild
+++ b/media-gfx/blender/blender-2.93.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ else
TEST_TARBALL_VERSION=2.93.0
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
- KEYWORDS="amd64 ~arm ~arm64"
+ KEYWORDS="~amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 6598e6d9c4b5e4474e1c31b0603da99f0cfb5e2d
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Feb 3 11:08:24 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 17 05:20:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6598e6d9
media-gfx/blender: Fix building 2.93 with openvdb-10
Closes: https://bugs.gentoo.org/892924
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.93.13.ebuild | 1 +
.../blender/files/blender-2.93.13-openvdb-10.patch | 107 +
2 files changed, 108 insertions(+)
diff --git a/media-gfx/blender/blender-2.93.13.ebuild
b/media-gfx/blender/blender-2.93.13.ebuild
index 244f50a0e39f..60c8f2eacc38 100644
--- a/media-gfx/blender/blender-2.93.13.ebuild
+++ b/media-gfx/blender/blender-2.93.13.ebuild
@@ -126,6 +126,7 @@ BDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-2.93.13-openvdb-10.patch
"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
"${FILESDIR}"/${PN}-3.0.1-openexr.patch
"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
diff --git a/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch
b/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch
new file mode 100644
index ..42db25179cdc
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch
@@ -0,0 +1,107 @@
+--- a/intern/cycles/render/volume.cpp
b/intern/cycles/render/volume.cpp
+@@ -259,7 +259,8 @@ void
VolumeMeshBuilder::add_grid(openvdb::GridBase::ConstPtr grid,
+ void VolumeMeshBuilder::add_padding(int pad_size)
+ {
+ #ifdef WITH_OPENVDB
+- openvdb::tools::dilateVoxels(topology_grid->tree(), pad_size);
++ openvdb::tools::dilateActiveValues(
++ topology_grid->tree(), pad_size, openvdb::tools::NN_FACE,
openvdb::tools::IGNORE_TILES);
+ #else
+ (void)pad_size;
+ #endif
+diff --git a/source/blender/blenkernel/BKE_volume.h
b/source/blender/blenkernel/BKE_volume.h
+index 8b42de7303d..068cdf87d16 100644
+--- a/source/blender/blenkernel/BKE_volume.h
b/source/blender/blenkernel/BKE_volume.h
+@@ -104,7 +104,6 @@ typedef enum VolumeGridType {
+ VOLUME_GRID_INT,
+ VOLUME_GRID_INT64,
+ VOLUME_GRID_MASK,
+- VOLUME_GRID_STRING,
+ VOLUME_GRID_VECTOR_FLOAT,
+ VOLUME_GRID_VECTOR_DOUBLE,
+ VOLUME_GRID_VECTOR_INT,
+@@ -218,8 +217,6 @@ auto BKE_volume_grid_type_operation(const VolumeGridType
grid_type, OpType &)
+ return op.template operator()();
+ case VOLUME_GRID_VECTOR_DOUBLE:
+ return op.template operator()();
+-case VOLUME_GRID_STRING:
+- return op.template operator()();
+ case VOLUME_GRID_MASK:
+ return op.template operator()();
+ case VOLUME_GRID_POINTS:
+diff --git a/source/blender/blenkernel/intern/volume.cc
b/source/blender/blenkernel/intern/volume.cc
+index 39a7725bfa3..a0e2d1a83cd 100644
+--- a/source/blender/blenkernel/intern/volume.cc
b/source/blender/blenkernel/intern/volume.cc
+@@ -1345,9 +1345,6 @@ VolumeGridType BKE_volume_grid_type_openvdb(const
openvdb::GridBase )
+ if (grid.isType()) {
+ return VOLUME_GRID_VECTOR_DOUBLE;
+ }
+- if (grid.isType()) {
+-return VOLUME_GRID_STRING;
+- }
+ if (grid.isType()) {
+ return VOLUME_GRID_MASK;
+ }
+@@ -1383,7 +1380,6 @@ int BKE_volume_grid_channels(const VolumeGrid *grid)
+ case VOLUME_GRID_VECTOR_DOUBLE:
+ case VOLUME_GRID_VECTOR_INT:
+ return 3;
+-case VOLUME_GRID_STRING:
+ case VOLUME_GRID_POINTS:
+ case VOLUME_GRID_UNKNOWN:
+ return 0;
+@@ -1624,13 +1620,8 @@ struct CreateGridWithChangedResolutionOp {
+
+ template typename openvdb::GridBase::Ptr operator()()
+ {
+-if constexpr (std::is_same_v) {
+- return {};
+-}
+-else {
+- return create_grid_with_changed_resolution(static_cast(grid),
+- resolution_factor);
+-}
++return create_grid_with_changed_resolution(static_cast(grid),
++ resolution_factor);
+ }
+ };
+
+diff --git a/source/blender/blenkernel/intern/volume_render.cc
b/source/blender/blenkernel/intern/volume_render.cc
+index c0a205b5673..7ccf04df941 100644
+--- a/source/blender/blenkernel/intern/volume_render.cc
b/source/blender/blenkernel/intern/volume_render.cc
+@@ -77,7 +77,6 @@ static void extract_dense_float_voxels(const VolumeGridType
grid_type,
+ case VOLUME_GRID_VECTOR_INT:
+ return extract_dense_voxels(
+ grid, bbox, reinterpret_cast(r_voxels));
+-case VOLUME_GRID_STRING:
+ case VOLUME_GRID_POINTS:
+ case VOLUME_GRID_UNKNOWN:
+ /* Zero channels to copy. */
+diff --git a/source/blender/makesrna/intern/rna_volume.c
b/source/blender/makesrna/intern/rna_volume.c
+index 3100c1195f4..2854f02a4d4 100644
+--- a/source/blender/makesrna/intern/rna_volume.c
b/source/blender/makesrna/intern/rna_volume.c
+@@ -241,7 +241,6 @@
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 29b4e922e6f0f824b8b5ec20f8528f4a499b3cbe Author: Sam James gentoo org> AuthorDate: Fri Feb 17 05:23:25 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 17 05:23:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b4e922 media-gfx/blender: fix copyright Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-2.93.13.ebuild | 2 +- media-gfx/blender/blender-3.3.3.ebuild | 2 +- media-gfx/blender/blender-.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-gfx/blender/blender-2.93.13.ebuild b/media-gfx/blender/blender-2.93.13.ebuild index 60c8f2eacc38..f3da165815e3 100644 --- a/media-gfx/blender/blender-2.93.13.ebuild +++ b/media-gfx/blender/blender-2.93.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/media-gfx/blender/blender-3.3.3.ebuild b/media-gfx/blender/blender-3.3.3.ebuild index 6b3e2ff54d0a..5d2598c71d36 100644 --- a/media-gfx/blender/blender-3.3.3.ebuild +++ b/media-gfx/blender/blender-3.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/media-gfx/blender/blender-.ebuild b/media-gfx/blender/blender-.ebuild index 37dad9bcc0b8..d64ed1598da1 100644 --- a/media-gfx/blender/blender-.ebuild +++ b/media-gfx/blender/blender-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d8e60a6fdeb6a9f26fc6f46e35cc15b7446654f4
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Feb 8 11:10:23 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 17 05:20:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e60a6f
media-gfx/blender: Update live ebuild source URLs
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29404
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index ae07957ad7f7..37dad9bcc0b8 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://www.blender.org;
if [[ ${PV} = ** ]] ; then
# Subversion is needed for downloading unit test files
inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
+ EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+
SRC_URI="https://projects.blender.org/blender/blender/archive/v${PV}.tar.gz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7b211ad43654e4f67c3a3e9554dfde77eed0917b
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Feb 3 12:07:55 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 17 05:20:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b211ad4
media-gfx/blender: Bump to 2.93.14, 3.3.3
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 2 +
media-gfx/blender/blender-2.93.14.ebuild | 402 +
media-gfx/blender/blender-3.3.3.ebuild | 417 +++
3 files changed, 821 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 3e1c1e5b3255..35bf4c6d6a6c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,7 @@
DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
DIST blender-2.93.13.tar.xz 43029716 BLAKE2B
ca222af581c4cddbc3e0607054ee3fd117b672550466d61bbcb608e85627ae78c816d7fb5f49134e17560fc1357de1505c3c17fc96fde1218239289c2d325055
SHA512
c94ff7f7b6521cc1521a1f0a22a5cb135114485dac78556764e25fc25bece168d96f6074959bf1521910191818785c6eac8c17164094415bd6bd7e23e307e56b
+DIST blender-2.93.14.tar.xz 43035804 BLAKE2B
72ca99143da393bb23e15a26e197c5ac45cd0bfb487b5dda617cb42f107dda0518c787294ad799c34712ee5948da81a573880cd642fc26bd1ae437b516ec41b6
SHA512
2b395a6acad808c3d2eb80355320d237fff7c0a188d1455fecd65189d7672927087ab7dcf7d07c3d541279c142846763be8dc495a2aa625c08f17ef543ba8bc5
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
+DIST blender-3.3.3.tar.xz 41918008 BLAKE2B
6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b
SHA512
1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
diff --git a/media-gfx/blender/blender-2.93.14.ebuild
b/media-gfx/blender/blender-2.93.14.ebuild
new file mode 100644
index ..60c8f2eacc38
--- /dev/null
+++ b/media-gfx/blender/blender-2.93.14.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+
+ TEST_TARBALL_VERSION=2.93.0
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ KEYWORDS="amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ opencl? ( cycles )
+ openvdb? ( tbb )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 6474a286a7dae36effc5efddc306ed8dea5c784d
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Feb 3 11:11:19 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 17 05:20:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6474a286
media-gfx/blender: Bump openimageio min version for live ebuild
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index a0ba0b748930..ae07957ad7f7 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -80,7 +80,7 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-1.4.1 )
- openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+ openimageio? ( >=media-libs/openimageio-2.4.6.0:= )
openexr? (
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d8b1c02343f62cdff5e1aed8ede6d1630f4526ea
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Feb 3 11:03:58 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 17 05:20:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b1c023
media-gfx/blender: Cleanup old ebuilds
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 2 -
media-gfx/blender/blender-2.93.10-r1.ebuild | 400 --
media-gfx/blender/blender-3.3.0-r1.ebuild | 417
3 files changed, 819 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9d23d9175542..3e1c1e5b3255 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,5 @@
DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
-DIST blender-2.93.10.tar.xz 43036752 BLAKE2B
c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b
SHA512
ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7
DIST blender-2.93.13.tar.xz 43029716 BLAKE2B
ca222af581c4cddbc3e0607054ee3fd117b672550466d61bbcb608e85627ae78c816d7fb5f49134e17560fc1357de1505c3c17fc96fde1218239289c2d325055
SHA512
c94ff7f7b6521cc1521a1f0a22a5cb135114485dac78556764e25fc25bece168d96f6074959bf1521910191818785c6eac8c17164094415bd6bd7e23e307e56b
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
-DIST blender-3.3.0.tar.xz 41887484 BLAKE2B
ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d
SHA512
5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243
DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
diff --git a/media-gfx/blender/blender-2.93.10-r1.ebuild
b/media-gfx/blender/blender-2.93.10-r1.ebuild
deleted file mode 100644
index 1a1846ad3c83..
--- a/media-gfx/blender/blender-2.93.10-r1.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 python3_10 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
-
- TEST_TARBALL_VERSION=2.93.0
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
- KEYWORDS="amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
- man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- fluid? ( tbb )
- opencl? ( cycles )
- openvdb? ( tbb )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 7562e9f2283e9125d82f04632d1042c5bb5fb313
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Feb 4 11:33:19 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Feb 4 11:33:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7562e9f2
media-gfx/blender: Stabilize 3.3.2 amd64, #893128
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-3.3.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.2.ebuild
b/media-gfx/blender/blender-3.3.2.ebuild
index 6b3e2ff54d0a..a1af04bc8c5c 100644
--- a/media-gfx/blender/blender-3.3.2.ebuild
+++ b/media-gfx/blender/blender-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ else
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
#SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/
commit: 33af4c3909c6892809d97ad0a165e00a116717df Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jan 8 15:16:12 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Jan 8 22:09:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33af4c39 media-gfx/blender: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29018 Signed-off-by: Conrad Kostecki gentoo.org> .../files/blender-3.2.2-musl-glibc-prereq.patch| 27 -- 1 file changed, 27 deletions(-) diff --git a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch deleted file mode 100644 index a572f25788de.. --- a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix build error in libc_compat when using musl libc - -Checking for the existence of and using __GLIBC_PREREQ can't be done in the -same conditional. - -Please refer: https://github.com/blender/blender/commit/7be7280c5710f7831789cdde140d010722be9068 a/intern/libc_compat/libc_compat.c -+++ b/intern/libc_compat/libc_compat.c -@@ -13,7 +13,8 @@ - # include - # include - --# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) -+# if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 31) - - double __exp_finite(double x); - double __exp2_finite(double x); -@@ -112,5 +113,6 @@ float __powf_finite(float x, float y) - return powf(x, y); - } - --# endif /* __GLIBC_PREREQ */ --#endif /* __linux__ */ -+#endif /* __GLIBC_PREREQ(2, 31) */ -+# endif /* __GLIBC_PREREQ */ -+#endif /* __linux__ */
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 9409c9e629962d6cdd0afc5718b3bdd03eee562c
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 4 14:39:59 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 5 05:15:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9409c9e6
media-gfx/blender: Version bump
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 3 +
media-gfx/blender/blender-2.93.13.ebuild | 400 +
media-gfx/blender/blender-3.3.2.ebuild | 417 ++
media-gfx/blender/blender-3.4.1.ebuild | 426 +++
4 files changed, 1246 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 592f8c16fab6..1575b35edda2 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,8 +1,11 @@
DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
DIST blender-2.93.10.tar.xz 43036752 BLAKE2B
c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b
SHA512
ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7
+DIST blender-2.93.13.tar.xz 43029716 BLAKE2B
ca222af581c4cddbc3e0607054ee3fd117b672550466d61bbcb608e85627ae78c816d7fb5f49134e17560fc1357de1505c3c17fc96fde1218239289c2d325055
SHA512
c94ff7f7b6521cc1521a1f0a22a5cb135114485dac78556764e25fc25bece168d96f6074959bf1521910191818785c6eac8c17164094415bd6bd7e23e307e56b
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f
SHA512
4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
DIST blender-3.2.2.tar.xz 41510144 BLAKE2B
3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62
SHA512
963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
DIST blender-3.3.0.tar.xz 41887484 BLAKE2B
ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d
SHA512
5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243
+DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
+DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
diff --git a/media-gfx/blender/blender-2.93.13.ebuild
b/media-gfx/blender/blender-2.93.13.ebuild
new file mode 100644
index ..1a1846ad3c83
--- /dev/null
+++ b/media-gfx/blender/blender-2.93.13.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = **
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: ff2c5af64ef778fe980783c06470da0515ef3b9a
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 4 14:46:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 5 05:15:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2c5af6
media-gfx/blender: Remove old versions
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest| 4 -
media-gfx/blender/blender-3.1.2-r1.ebuild | 399
media-gfx/blender/blender-3.2.2-r1.ebuild | 417 --
3 files changed, 820 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1575b35edda2..9d23d9175542 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,10 +2,6 @@ DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d00
DIST blender-2.93.10.tar.xz 43036752 BLAKE2B
c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b
SHA512
ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7
DIST blender-2.93.13.tar.xz 43029716 BLAKE2B
ca222af581c4cddbc3e0607054ee3fd117b672550466d61bbcb608e85627ae78c816d7fb5f49134e17560fc1357de1505c3c17fc96fde1218239289c2d325055
SHA512
c94ff7f7b6521cc1521a1f0a22a5cb135114485dac78556764e25fc25bece168d96f6074959bf1521910191818785c6eac8c17164094415bd6bd7e23e307e56b
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
-DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
-DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
-DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f
SHA512
4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
-DIST blender-3.2.2.tar.xz 41510144 BLAKE2B
3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62
SHA512
963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
DIST blender-3.3.0.tar.xz 41887484 BLAKE2B
ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d
SHA512
5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243
DIST blender-3.3.2.tar.xz 41918064 BLAKE2B
76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783
SHA512
2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778
DIST blender-3.4.1.tar.xz 53666296 BLAKE2B
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
SHA512
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
diff --git a/media-gfx/blender/blender-3.1.2-r1.ebuild
b/media-gfx/blender/blender-3.1.2-r1.ebuild
deleted file mode 100644
index 836f68d04067..
--- a/media-gfx/blender/blender-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 980fae9603feb753eb8a01756930f4956cb55e2a
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 4 14:46:54 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 5 05:15:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980fae96
media-gfx/blender: Fix building with boost-1.81
Previous boost fix was only applied to 3.3
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28961
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.93.13.ebuild | 1 +
media-gfx/blender/blender-3.4.1.ebuild | 4
2 files changed, 5 insertions(+)
diff --git a/media-gfx/blender/blender-2.93.13.ebuild
b/media-gfx/blender/blender-2.93.13.ebuild
index 1a1846ad3c83..244f50a0e39f 100644
--- a/media-gfx/blender/blender-2.93.13.ebuild
+++ b/media-gfx/blender/blender-2.93.13.ebuild
@@ -130,6 +130,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.1-openexr.patch
"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
"${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+ "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.4.1.ebuild
b/media-gfx/blender/blender-3.4.1.ebuild
index bb11127296cc..6e2dbad1235d 100644
--- a/media-gfx/blender/blender-3.4.1.ebuild
+++ b/media-gfx/blender/blender-3.4.1.ebuild
@@ -136,6 +136,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: f87eaf2cbe922e513eb00ec0bb5669b0f3946f76
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 4 14:37:42 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 5 05:15:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87eaf2c
media-gfx/blender: Add correct wayland appid to live ebuild
Set the correct appid so that wayland compositors (like Plasma and Gnome
Shell) can correctly associate blender with its .desktop file.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 73895921428e..a0ba0b748930 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -215,6 +215,7 @@ src_prepare() {
src_configure() {
append-lfs-flags
+ blender_get_version
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
@@ -238,6 +239,7 @@ src_configure() {
-DWITH_DOC_MANPAGE=$(usex man)
-DWITH_FFTW3=$(usex fftw)
-DWITH_GHOST_WAYLAND=$(usex wayland)
+ -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV}
-DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
-DWITH_GHOST_WAYLAND_DYNLOAD=OFF
-DWITH_GHOST_WAYLAND_LIBDECOR=OFF
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: c6f63d6d4100e9bdc95f4e9c6804335e124ac6bd
Author: Christophe Lermytte lermytte be>
AuthorDate: Mon Dec 19 13:57:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 20 10:53:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f63d6d
media-gfx/blender: fix build with boost-1.81
Patch as suggested by the compiler:
"intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined
in header ‘’; did you forget to ‘#include ’?"
Signed-off-by: Christophe Lermytte lermytte.be>
Closes: https://bugs.gentoo.org/887059
Closes: https://github.com/gentoo/gentoo/pull/28713
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.0-r1.ebuild | 1 +
.../files/blender-3.3.0-fix-build-with-boost-1.81.patch | 17 +
2 files changed, 18 insertions(+)
diff --git a/media-gfx/blender/blender-3.3.0-r1.ebuild
b/media-gfx/blender/blender-3.3.0-r1.ebuild
index f6a12a88c2fc..6b3e2ff54d0a 100644
--- a/media-gfx/blender/blender-3.3.0-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.0-r1.ebuild
@@ -130,6 +130,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
+ "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
)
blender_check_requirements() {
diff --git
a/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch
b/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch
new file mode 100644
index ..3a544811e484
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/887059
+
+Adding include as suggested by the compiler:
+
+"intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined
+in header ‘’; did you forget to ‘#include ’?"
+
+--- a/intern/locale/boost_locale_wrapper.cpp
b/intern/locale/boost_locale_wrapper.cpp
+@@ -9,6 +9,7 @@
+ #include
+
+ #include "boost_locale_wrapper.h"
++#include
+
+ static std::string messages_path;
+ static std::string default_domain;
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 2bc3e3360d5936bda0318c9f8eb280d543aabeb8
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 08:27:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 08:30:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc3e336
media-gfx/blender: drop 3.2.0-r1, 3.2.1-r1
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest| 2 -
media-gfx/blender/blender-3.2.0-r1.ebuild | 399 --
media-gfx/blender/blender-3.2.1-r1.ebuild | 399 --
3 files changed, 800 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index abecd9334eed..592f8c16fab6 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,7 +4,5 @@ DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f
SHA512
4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
-DIST blender-3.2.0.tar.xz 4152 BLAKE2B
ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248
SHA512
2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
-DIST blender-3.2.1.tar.xz 41497540 BLAKE2B
bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8
SHA512
fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
DIST blender-3.2.2.tar.xz 41510144 BLAKE2B
3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62
SHA512
963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
DIST blender-3.3.0.tar.xz 41887484 BLAKE2B
ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d
SHA512
5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243
diff --git a/media-gfx/blender/blender-3.2.0-r1.ebuild
b/media-gfx/blender/blender-3.2.0-r1.ebuild
deleted file mode 100644
index cecf90876108..
--- a/media-gfx/blender/blender-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- # Update these between major releases.
- TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
- KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
- man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- fluid? ( tbb )
- openvdb? ( tbb )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-#
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: de2cbc87491697c518b67774f5bd20d9d8d2f5ba
Author: Sam James gentoo org>
AuthorDate: Sun Dec 18 08:26:52 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 18 08:30:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2cbc87
media-gfx/blender: drop 2.93.9-r1
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-2.93.9-r1.ebuild | 400 -
2 files changed, 401 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 92cb67f8c203..abecd9334eed 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,5 @@
DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
DIST blender-2.93.10.tar.xz 43036752 BLAKE2B
c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b
SHA512
ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7
-DIST blender-2.93.9.tar.xz 43035004 BLAKE2B
3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7
SHA512
605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
diff --git a/media-gfx/blender/blender-2.93.9-r1.ebuild
b/media-gfx/blender/blender-2.93.9-r1.ebuild
deleted file mode 100644
index 1a1846ad3c83..
--- a/media-gfx/blender/blender-2.93.9-r1.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 python3_10 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
- # Subversion is needed for downloading unit test files
- inherit git-r3 subversion
- EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
- SRC_URI="https://download.blender.org/source/${P}.tar.xz;
- SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
-
- TEST_TARBALL_VERSION=2.93.0
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
- KEYWORDS="amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
- alembic collada +color-management cuda +cycles \
- debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
- man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- alembic? ( openexr )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- fluid? ( tbb )
- opencl? ( cycles )
- openvdb? ( tbb )
- osl? ( cycles )
- test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source
directory in:
-# build_files/build_environment/install_deps.sh
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=[nls?]
- dev-libs/lzo:2=
- $(python_gen_cond_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- media-libs/freetype:=
- media-libs/glew:*
- media-libs/libjpeg-turbo:=
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 166ebf0cbca8f28cef398c732f5cb3a6906144ca
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 17 19:28:22 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 17 19:28:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166ebf0c
media-gfx/blender: Stabilize 2.93.10-r1 amd64, #886193
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/blender/blender-2.93.10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-2.93.10-r1.ebuild
b/media-gfx/blender/blender-2.93.10-r1.ebuild
index 149f11b00954..1a1846ad3c83 100644
--- a/media-gfx/blender/blender-2.93.10-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.10-r1.ebuild
@@ -20,7 +20,7 @@ else
TEST_TARBALL_VERSION=2.93.0
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: b056c327e06870594b0d00c48bd10b3a928a258b
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 04:26:42 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 04:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b056c327
media-gfx/blender: unrevbump
Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/{blender--r1.ebuild => blender-.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-gfx/blender/blender--r1.ebuild
b/media-gfx/blender/blender-.ebuild
similarity index 100%
rename from media-gfx/blender/blender--r1.ebuild
rename to media-gfx/blender/blender-.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: abefed9cb68e25e5f293ae2bba7106368cc179ea
Author: Sebastian Parborg gmail com>
AuthorDate: Thu Sep 29 15:14:06 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 29 23:52:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abefed9c
media-gfx/blender: Update live ebuild
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27529
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 0426748b3a70..f903ad6cd28b 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/zstandard[${PYTHON_USEDEP}]
')
media-libs/freetype:=[brotli]
- media-libs/glew:*
+ media-libs/libepoxy:=
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
@@ -198,7 +198,7 @@ src_prepare() {
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
- sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g"
-i tests/CMakeLists.txt || die
+ sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR
${ED}/usr/)|g" -i tests/CMakeLists.txt || die
sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g"
-i build_files/cmake/Modules/GTestTesting.cmake || die
fi
}
@@ -261,7 +261,6 @@ src_configure() {
-DWITH_STATIC_LIBS=OFF
-DWITH_SYSTEM_EIGEN3=ON
-DWITH_SYSTEM_FREETYPE=ON
- -DWITH_SYSTEM_GLEW=ON
-DWITH_SYSTEM_LZO=ON
-DWITH_TBB=$(usex tbb)
-DWITH_USD=OFF
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 565f433814df4712da679f7da2ad4f94c7d643b4
Author: Sebastian Parborg gmail com>
AuthorDate: Thu Sep 29 13:12:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 29 23:52:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565f4338
media-gfx/blender: Version bumps to 3.3.0
Closes: https://bugs.gentoo.org/869713
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.3.0.ebuild | 416 +
2 files changed, 417 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1ce457d54060..92cb67f8c203 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -8,3 +8,4 @@ DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a5
DIST blender-3.2.0.tar.xz 4152 BLAKE2B
ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248
SHA512
2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
DIST blender-3.2.1.tar.xz 41497540 BLAKE2B
bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8
SHA512
fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
DIST blender-3.2.2.tar.xz 41510144 BLAKE2B
3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62
SHA512
963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
+DIST blender-3.3.0.tar.xz 41887484 BLAKE2B
ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d
SHA512
5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243
diff --git a/media-gfx/blender/blender-3.3.0.ebuild
b/media-gfx/blender/blender-3.3.0.ebuild
new file mode 100644
index ..36150d4272cd
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.0.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ optix? ( cuda )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=[brotli]
+ media-libs/glew:*
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ embree? ( >=media-libs/embree-3.10.0[raymask] )
+ ffmpeg? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: e35e05310354095a176c6b17c8e5814a1e02d54b
Author: Sam James gentoo org>
AuthorDate: Thu Sep 29 23:53:16 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 29 23:53:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35e0531
media-gfx/blender: restrict tests for now
Until I have a chance to reupload the latest test data.
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-3.3.0.ebuild
b/media-gfx/blender/blender-3.3.0.ebuild
index 36150d4272cd..a27d961ccf8a 100644
--- a/media-gfx/blender/blender-3.3.0.ebuild
+++ b/media-gfx/blender/blender-3.3.0.ebuild
@@ -30,7 +30,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
test +tiff valgrind"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: a5711585ca1e99533578410e543a2b3ad30ffb69
Author: Bernd Waibel posteo net>
AuthorDate: Sat Sep 17 09:10:14 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Sep 25 12:22:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5711585
media-gfx/blender: add optix support to live ebuild
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27303
Signed-off-by: Ionen Wolkens gentoo.org>
media-gfx/blender/blender-.ebuild | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 48a7c50cf696..0426748b3a70 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -28,7 +28,8 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -37,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
cycles? ( openexr tiff openimageio )
fluid? ( tbb )
openvdb? ( tbb )
+ optix? ( cuda )
osl? ( cycles )
test? ( color-management )"
@@ -93,6 +95,7 @@ RDEPEND="${PYTHON_DEPS}
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
)
+ optix? ( =media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
@@ -217,6 +220,7 @@ src_configure() {
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+ -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
-DWITH_CYCLES_STANDALONE=OFF
@@ -264,6 +268,13 @@ src_configure() {
-DWITH_XR_OPENXR=OFF
)
+ if use optix; then
+ mycmakeargs+=(
+ -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+ -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+ )
+ fi
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
@@ -286,8 +297,8 @@ src_test() {
blender_get_version
# Define custom blender data/script file paths not be able to find them
otherwise during testing.
# (Because the data is in the image directory and it will default to
look in /usr/share)
- export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
- export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+ export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
+ export
BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
# Sanity check that the script and datafile path is valid.
# If they are not vaild, blender will fallback to the default path
which is not what we want.
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: 240b8b5737d5451ad70466ccc16e49630c295863
Author: Bernd Waibel posteo net>
AuthorDate: Sat Sep 17 09:06:21 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Sep 25 12:22:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240b8b57
media-gfx/blender: add optix support
Add compile and runtime support for the NVIDIA OptiX library.
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://bugs.gentoo.org/741564
Signed-off-by: Ionen Wolkens gentoo.org>
media-gfx/blender/blender-3.2.2.ebuild | 15 ++-
...option-to-specify-OptiX-runtime-root-dire.patch | 108 +
...-wrong-Cycles-OptiX-runtime-compilation-i.patch | 23 +
media-gfx/blender/metadata.xml | 3 +
4 files changed, 148 insertions(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-3.2.2.ebuild
b/media-gfx/blender/blender-3.2.2.ebuild
index b8269d9b77fb..4442e89a027e 100644
--- a/media-gfx/blender/blender-3.2.2.ebuild
+++ b/media-gfx/blender/blender-3.2.2.ebuild
@@ -28,7 +28,8 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
+ +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+ test +tiff valgrind"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -37,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
cycles? ( openexr tiff openimageio )
fluid? ( tbb )
openvdb? ( tbb )
+ optix? ( cuda )
osl? ( cycles )
test? ( color-management )"
@@ -93,6 +95,7 @@ RDEPEND="${PYTHON_DEPS}
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
)
+ optix? ( =media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
@@ -126,6 +129,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
"${FILESDIR}"/${PN}-3.2.2-musl-glibc-prereq.patch
+
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
+
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
)
blender_check_requirements() {
@@ -222,6 +227,7 @@ src_configure() {
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+ -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
-DWITH_CYCLES_STANDALONE=OFF
@@ -269,6 +275,13 @@ src_configure() {
-DWITH_XR_OPENXR=OFF
)
+ if use optix; then
+ mycmakeargs+=(
+ -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+ -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+ )
+ fi
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
if tc-is-gcc ; then
diff --git
a/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
b/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
new file mode 100644
index ..2a7b33cf8ac4
--- /dev/null
+++
b/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
@@ -0,0 +1,108 @@
+From https://developer.blender.org/rB74caf773619bbf6a0f95c598b66261a6bef392ee
+From: Brecht Van Lommel
+Date: Mon, 29 Aug 2022 19:12:15 +0200
+Subject: [PATCH 001/539] Cycles: add option to specify OptiX runtime root
+ directory
+
+This allows individual users or Linux distributions to specify a directory
+Cycles will automatically look for the OptiX include folder, to compile kernels
+at runtime.
+
+It is still possible to override this with the OPTIX_ROOT_DIR environment
+variable at runtime.
+
+Based on patch by Sebastian Parborg.
+
+Ref D15792
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -435,10 +435,16 @@ if(NOT APPLE)
+ option(WITH_CYCLES_CUBIN_COMPILER"Build cubins with nvrtc based
compiler instead of nvcc" OFF)
+ option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another
(useful on machines with limited RAM)" OFF)
+ option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at
runtime (for developers, makes cuda-gdb work)" ON)
++
++ set(OPTIX_ROOT_DIR "" CACHE PATH "Path to the OptiX SDK
root directory, for building Cycles OptiX kernels.")
++ set(CYCLES_RUNTIME_OPTIX_ROOT_DIR"" CACHE PATH "Path to the OptiX SDK
root directory. When set, this path will be used at runtime to compile OptiX
kernels.")
++
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 07f1954e0dd0fb941be3396f15257793f791b23a
Author: brahmajit das protonmail com>
AuthorDate: Tue Aug 23 15:39:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 1 02:01:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f1954e
media-gfx/blender: Upstream musl libc fixes backport
These are some of the patch that I submitted upstream and have been
accepted. They will be a part of next blender release. However, this PR
is a backport of those fixes for blender 3.2.2.
Please refer:
https://github.com/blender/blender/commit/f197b1a1f1bbc0334310fb1c911327246767a1a3,
and
https://github.com/blender/blender/commit/7be7280c5710f7831789cdde140d010722be9068
Closes: https://bugs.gentoo.org/739474
Signed-off-by: brahmajit das protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26860
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.2.2.ebuild | 5 +
.../files/blender-3.2.2-musl-glibc-prereq.patch| 27
...der-3.2.2-support-building-with-musl-libc.patch | 177 +
3 files changed, 209 insertions(+)
diff --git a/media-gfx/blender/blender-3.2.2.ebuild
b/media-gfx/blender/blender-3.2.2.ebuild
index 8c82138b1e5a..70024e231bf6 100644
--- a/media-gfx/blender/blender-3.2.2.ebuild
+++ b/media-gfx/blender/blender-3.2.2.ebuild
@@ -123,6 +123,11 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
+ "${FILESDIR}"/${PN}-3.2.2-musl-glibc-prereq.patch
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch
b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch
new file mode 100644
index ..a572f25788de
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch
@@ -0,0 +1,27 @@
+Fix build error in libc_compat when using musl libc
+
+Checking for the existence of and using __GLIBC_PREREQ can't be done in the
+same conditional.
+
+Please refer:
https://github.com/blender/blender/commit/7be7280c5710f7831789cdde140d010722be9068
+--- a/intern/libc_compat/libc_compat.c
b/intern/libc_compat/libc_compat.c
+@@ -13,7 +13,8 @@
+ # include
+ # include
+
+-# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31)
++# if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 31)
+
+ double __exp_finite(double x);
+ double __exp2_finite(double x);
+@@ -112,5 +113,6 @@ float __powf_finite(float x, float y)
+ return powf(x, y);
+ }
+
+-# endif /* __GLIBC_PREREQ */
+-#endif /* __linux__ */
++#endif /* __GLIBC_PREREQ(2, 31) */
++# endif /* __GLIBC_PREREQ */
++#endif /* __linux__ */
diff --git
a/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch
b/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch
new file mode 100644
index ..fb3f2584f0fe
--- /dev/null
+++
b/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch
@@ -0,0 +1,177 @@
+CMake: support building with musl libc
+
+Instead of using macros like GLIBC we can use the CMake build
+systems internal functions to check if some header or functions are
+present on the running system's libc.
+
+Add ./build_files/cmake/have_features.cmake to add checks for
+platform features which can be used to set defines for source
+files that require them.
+
+Please refer:
https://github.com/blender/blender/commit/f197b1a1f1bbc0334310fb1c911327246767a1a3
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -112,6 +112,11 @@ blender_project_hack_post()
+
+ enable_testing()
+
++#-
++# Test compiler/library features.
++
++include(build_files/cmake/have_features.cmake)
++
+ #-
+ # Redirect output files
+
+--- /dev/null
b/build_files/cmake/have_features.cmake
+@@ -0,0 +1,33 @@
++# SPDX-License-Identifier: GPL-2.0-or-later
++# Copyright 2022 Blender Foundation. All rights reserved.
++
++# This file is used to test the system for headers & symbols.
++# Variables should use the `HAVE_` prefix.
++# Defines should use the same name as the CMAKE variable.
++
++include(CheckSymbolExists)
++
++# Used for: `intern/guardedalloc/intern/mallocn_intern.h`.
++# Function `malloc_stats` is only available on GLIBC,
++# so check that before defining `HAVE_MALLOC_STATS`.
++check_symbol_exists(malloc_stats "malloc.h" HAVE_MALLOC_STATS_H)
++
++# Used for: `source/creator/creator_signals.c`.
++# The function `feenableexcept` is not present non-GLIBC systems,
++# hence we need to check if it's available in the `fenv.h` file.
++set(HAVE_FEENABLEEXCEPT OFF)
++if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++ check_symbol_exists(feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
++endif()
++
++# Used for:
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d496e9cb3055a517e90dcf16feea59caeb34788d
Author: Sam James gentoo org>
AuthorDate: Thu Aug 11 10:51:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 11 10:54:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d496e9cb
media-gfx/blender: fix UnquotedVariable
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.2.0.ebuild | 2 +-
media-gfx/blender/blender-3.2.1.ebuild | 6 +++---
media-gfx/blender/blender-3.2.2.ebuild | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/media-gfx/blender/blender-3.2.0.ebuild
b/media-gfx/blender/blender-3.2.0.ebuild
index 784b5a34ff55..779c65dfd679 100644
--- a/media-gfx/blender/blender-3.2.0.ebuild
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -297,7 +297,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.2.1.ebuild
b/media-gfx/blender/blender-3.2.1.ebuild
index 784b5a34ff55..8c82138b1e5a 100644
--- a/media-gfx/blender/blender-3.2.1.ebuild
+++ b/media-gfx/blender/blender-3.2.1.ebuild
@@ -286,8 +286,8 @@ src_test() {
blender_get_version
# Define custom blender data/script file paths not be able to find them
otherwise during testing.
# (Because the data is in the image directory and it will default to
look in /usr/share)
- export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
- export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+ export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
+ export
BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
# Sanity check that the script and datafile path is valid.
# If they are not vaild, blender will fallback to the default path
which is not what we want.
@@ -297,7 +297,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.2.2.ebuild
b/media-gfx/blender/blender-3.2.2.ebuild
index 784b5a34ff55..8c82138b1e5a 100644
--- a/media-gfx/blender/blender-3.2.2.ebuild
+++ b/media-gfx/blender/blender-3.2.2.ebuild
@@ -286,8 +286,8 @@ src_test() {
blender_get_version
# Define custom blender data/script file paths not be able to find them
otherwise during testing.
# (Because the data is in the image directory and it will default to
look in /usr/share)
- export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
- export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+ export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
+ export
BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
# Sanity check that the script and datafile path is valid.
# If they are not vaild, blender will fallback to the default path
which is not what we want.
@@ -297,7 +297,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 9c7ceb88becefabb09dc872084052ba590c88238
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jul 20 13:13:13 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Aug 11 07:33:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7ceb88
media-gfx/blender: Remove redudant cuda and opencl use flags from opensubdiv dep
Blender never used any of these backends, so there is no reason to
depend on them.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-2.93.9.ebuild | 2 +-
media-gfx/blender/blender-3.1.2.ebuild | 2 +-
media-gfx/blender/blender-3.2.0.ebuild | 2 +-
media-gfx/blender/blender-3.2.1.ebuild | 2 +-
media-gfx/blender/blender-.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-gfx/blender/blender-2.93.9.ebuild
b/media-gfx/blender/blender-2.93.9.ebuild
index 1587ab1f1a50..7beda8bcbee3 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -90,7 +90,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-8.2.0-r2:=
dev-libs/c-blosc:=
diff --git a/media-gfx/blender/blender-3.1.2.ebuild
b/media-gfx/blender/blender-3.1.2.ebuild
index ea2bbb13c8a5..b5d76235c5fe 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
diff --git a/media-gfx/blender/blender-3.2.0.ebuild
b/media-gfx/blender/blender-3.2.0.ebuild
index 9fcc16b94ddf..784b5a34ff55 100644
--- a/media-gfx/blender/blender-3.2.0.ebuild
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
diff --git a/media-gfx/blender/blender-3.2.1.ebuild
b/media-gfx/blender/blender-3.2.1.ebuild
index 9fcc16b94ddf..784b5a34ff55 100644
--- a/media-gfx/blender/blender-3.2.1.ebuild
+++ b/media-gfx/blender/blender-3.2.1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index bbdce08e2010..779c65dfd679 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/imath-3.1.4-r2:=
>=media-libs/openexr-3:0=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d5edb8babbe4c2a9a241e4ffb0fb558246632235
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Aug 5 09:52:35 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Aug 11 07:33:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5edb8ba
media-gfx/blender: Update freetype dependecy flags
Blender now requires Brotli support in freetype
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26498
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 779c65dfd679..80452e025729 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -51,7 +51,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/requests[${PYTHON_USEDEP}]
dev-python/zstandard[${PYTHON_USEDEP}]
')
- media-libs/freetype:=
+ media-libs/freetype:=[brotli]
media-libs/glew:*
media-libs/libjpeg-turbo:=
media-libs/libpng:=
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: b47ba2b7c0f41ae2785d89b6e24d0f382cdbb2b5
Author: Sebastian Parborg gmail com>
AuthorDate: Fri Aug 5 09:46:38 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Aug 11 07:33:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47ba2b7
media-gfx/blender: Version bumps 3.2.2 & 2.93.10
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/Manifest | 2 +
media-gfx/blender/blender-2.93.10.ebuild | 400 +++
media-gfx/blender/blender-3.2.2.ebuild | 399 ++
3 files changed, 801 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 01f96f5b4ac5..1ce457d54060 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,4 +1,5 @@
DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
+DIST blender-2.93.10.tar.xz 43036752 BLAKE2B
c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b
SHA512
ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7
DIST blender-2.93.9.tar.xz 43035004 BLAKE2B
3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7
SHA512
605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
@@ -6,3 +7,4 @@ DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf97
DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f
SHA512
4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
DIST blender-3.2.0.tar.xz 4152 BLAKE2B
ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248
SHA512
2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
DIST blender-3.2.1.tar.xz 41497540 BLAKE2B
bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8
SHA512
fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
+DIST blender-3.2.2.tar.xz 41510144 BLAKE2B
3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62
SHA512
963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
diff --git a/media-gfx/blender/blender-2.93.10.ebuild
b/media-gfx/blender/blender-2.93.10.ebuild
new file mode 100644
index ..cc7b5600cb7f
--- /dev/null
+++ b/media-gfx/blender/blender-2.93.10.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+
+ TEST_TARBALL_VERSION=2.93.0
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 6d9be908095cd7eebee49eac9cc3441c6ae977b7
Author: Sam James gentoo org>
AuthorDate: Sat Jul 9 05:57:34 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 9 05:57:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9be908
media-gfx/blender: add 3.2.1
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.2.1.ebuild | 399 +
2 files changed, 400 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1b1f10296236..01f96f5b4ac5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -5,3 +5,4 @@ DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b0
DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f
SHA512
4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
DIST blender-3.2.0.tar.xz 4152 BLAKE2B
ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248
SHA512
2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
+DIST blender-3.2.1.tar.xz 41497540 BLAKE2B
bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8
SHA512
fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
diff --git a/media-gfx/blender/blender-3.2.1.ebuild
b/media-gfx/blender/blender-3.2.1.ebuild
new file mode 100644
index ..9fcc16b94ddf
--- /dev/null
+++ b/media-gfx/blender/blender-3.2.1.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ embree? ( >=media-libs/embree-3.10.0[raymask] )
+ ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ fftw? ( sci-libs/fftw:3.0= )
+ gmp? ( dev-libs/gmp )
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 88e49ad9b40227d5d5d9c656dfd054873d704933 Author: Federico Denkena posteo de> AuthorDate: Fri Jun 17 16:22:52 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jun 20 03:05:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e49ad9 media-gfx/blender: Remove old versions Bug: https://bugs.gentoo.org/834011 Signed-off-by: Federico Denkena posteo.de> Closes: https://github.com/gentoo/gentoo/pull/25914 Signed-off-by: Sam James gentoo.org> media-gfx/blender/Manifest | 8 - media-gfx/blender/blender-2.93.0-r1.ebuild | 390 --- media-gfx/blender/blender-2.93.6.ebuild| 386 --- media-gfx/blender/blender-2.93.8-r4.ebuild | 402 media-gfx/blender/blender-2.93.8-r5.ebuild | 405 media-gfx/blender/blender-3.0.0-r1.ebuild | 407 media-gfx/blender/blender-3.0.1-r4.ebuild | 410 - media-gfx/blender/blender-3.0.1-r5.ebuild | 408 media-gfx/blender/blender-3.1.0.ebuild | 404 media-gfx/blender/blender-3.1.1.ebuild | 404 media-gfx/blender/metadata.xml | 9 - 11 files changed, 3633 deletions(-) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 9941eb55474c..1b1f10296236 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,15 +1,7 @@ DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe -DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d -DIST blender-2.93.6.tar.xz 43031980 BLAKE2B 235b9a08d9eb4ba83c30a4de333cc5b56eefe16209a96e2aeadbfb4d99b0add0031bbf3c4e0059833433475f07c03711ca773e19d57849ae83beb52a750fac48 SHA512 0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea -DIST blender-2.93.8.tar.xz 43024356 BLAKE2B f69edf2bff0e97897d03b123516a66037fc690f518801dbb5f6851aa743c768bb1a56df2cc3e036d8fbae4ca3cfca295f34c7ae33dd37f0e16513c56f5d46572 SHA512 75213907ef7969f30468ce959a1da9287334b6f8b6edbf4b65e02d57a8b306fad6f86646d088eee8fd6f53f3e7511554b9a963f7a15527b17c3353db24f58249 DIST blender-2.93.9.tar.xz 43035004 BLAKE2B 3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7 SHA512 605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e -DIST blender-3.0.0-tests.tar.bz2 302064577 BLAKE2B c86a47231bb704124fe5ed59963176ca45ccc7e92bf8b00ce31d432cf6e35b9593ddb0d71f56aab0af6d1922f08eb158f9b7e355b5323d715b2b075ceafe9294 SHA512 e343f5da88aa7d2bc2a0758c01d3849b61c6ff3a0d65ac4d967aa02b701a5a02bfc8e7ed92b8f67af37e08f138987de8a27b8c7faa3cd8cfc3535adb8c624506 -DIST blender-3.0.0.tar.xz 40169212 BLAKE2B 0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2 SHA512 727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21 DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B 2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9 SHA512 c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809 -DIST blender-3.0.1.tar.xz 40155604 BLAKE2B b611f08617f1be217604e87cfafe88f6cc9904ed6321a74bea4ee5ad14f3cf4002b12d82fa3b3c6111a681fd7e1c530f66be28c506973ff7722175a9036a19da SHA512 b9af6d49201eb26ec77a3cecdb9c0945ffc915d4eecaaa36091365340244bfd1565a7679c8b7a81d3335383f158dc01339ea8edc108730835d81db1de84049bf DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655 SHA512 9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782 -DIST blender-3.1.0.tar.xz 41017620 BLAKE2B f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203 SHA512
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 6266e2a3e597d830c9294147306024144b1d37b5
Author: Thomas Bracht Laumann Jespersen laumann xyz>
AuthorDate: Wed Jun 8 19:59:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 16 16:30:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6266e2a3
media-gfx/blender: fix unquoted variable ED
Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz>
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.93.0-r1.ebuild | 4 ++--
media-gfx/blender/blender-2.93.6.ebuild| 2 +-
media-gfx/blender/blender-2.93.8-r4.ebuild | 2 +-
media-gfx/blender/blender-2.93.8-r5.ebuild | 2 +-
media-gfx/blender/blender-2.93.9.ebuild| 2 +-
media-gfx/blender/blender-3.0.0-r1.ebuild | 2 +-
media-gfx/blender/blender-3.0.1-r4.ebuild | 2 +-
media-gfx/blender/blender-3.0.1-r5.ebuild | 2 +-
media-gfx/blender/blender-3.1.0.ebuild | 2 +-
media-gfx/blender/blender-3.1.1.ebuild | 2 +-
media-gfx/blender/blender-3.1.2.ebuild | 2 +-
media-gfx/blender/blender-.ebuild | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/media-gfx/blender/blender-2.93.0-r1.ebuild
b/media-gfx/blender/blender-2.93.0-r1.ebuild
index 5759d72da06c..a2c3cd347215 100644
--- a/media-gfx/blender/blender-2.93.0-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -306,7 +306,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-2.93.6.ebuild
b/media-gfx/blender/blender-2.93.6.ebuild
index 712f73eaf47a..8012e6736954 100644
--- a/media-gfx/blender/blender-2.93.6.ebuild
+++ b/media-gfx/blender/blender-2.93.6.ebuild
@@ -280,7 +280,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-2.93.8-r4.ebuild
b/media-gfx/blender/blender-2.93.8-r4.ebuild
index 3e09ff2028a8..5a028d74bdda 100644
--- a/media-gfx/blender/blender-2.93.8-r4.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r4.ebuild
@@ -296,7 +296,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-2.93.8-r5.ebuild
b/media-gfx/blender/blender-2.93.8-r5.ebuild
index 7112d2413a97..94dd0db42cc6 100644
--- a/media-gfx/blender/blender-2.93.8-r5.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r5.ebuild
@@ -299,7 +299,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-2.93.9.ebuild
b/media-gfx/blender/blender-2.93.9.ebuild
index d46d6b301f28..1587ab1f1a50 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -298,7 +298,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.0.0-r1.ebuild
b/media-gfx/blender/blender-3.0.0-r1.ebuild
index f5bf0d9e9916..a6a4b23c68d6 100644
--- a/media-gfx/blender/blender-3.0.0-r1.ebuild
+++ b/media-gfx/blender/blender-3.0.0-r1.ebuild
@@ -301,7 +301,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.0.1-r4.ebuild
b/media-gfx/blender/blender-3.0.1-r4.ebuild
index c053c88dd0f4..91fcea55c1b4 100644
--- a/media-gfx/blender/blender-3.0.1-r4.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r4.ebuild
@@ -304,7 +304,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 9ed2565bb8b7..b5491d774983 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -306,7 +306,7 @@ src_test() {
cmake_src_test
# Clean up the image directory for src_install
- rm -fr ${ED}/* || die
+ rm -fr "${ED}"/* || die
}
src_install() {
diff --git a/media-gfx/blender/blender-3.1.0.ebuild
b/media-gfx/blender/blender-3.1.0.ebuild
index 50be45a07af8..40188686d779 100644
--- a/media-gfx/blender/blender-3.1.0.ebuild
+++ b/media-gfx/blender/blender-3.1.0.ebuild
@@ -298,7
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: fc0ca0c23aad1ea281c576d84019b9c1da5e4c1a
Author: Sam James gentoo org>
AuthorDate: Thu Jun 16 00:39:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 16 00:39:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0ca0c2
media-gfx/blender: add test tarball for 3.2.0
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 2 +-
media-gfx/blender/blender-3.2.0.ebuild | 4 ++--
media-gfx/blender/blender-.ebuild | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index ae54023bc3f0..9941eb55474c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -11,5 +11,5 @@ DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b0
DIST blender-3.1.0.tar.xz 41017620 BLAKE2B
f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203
SHA512
354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
DIST blender-3.1.1.tar.xz 41029004 BLAKE2B
ca133349bfae52b36123da489ef7e50b30666b91d7961e9938932f5375a4d1129f3b15de59170ccf55723a08cbd0089bb7d73792c15221d91f2f83c40a2ebdb4
SHA512
88c339540a7b621b1771e1f17ecf7d4c21d86e05b83e395e15cd90b1347a50dda74ebaedd5ca178cabe6981b45244a64110ab855efdf74fe42f5bf45ffe811b1
DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
-DIST blender-3.2.0-tests.tar.bz2 311784237 BLAKE2B
5152bd52689ebc3179f4dd10001105615b13c2509da773390281da55f7b74547c3d37f7414f82eac3575bab8fe039f037f9ceaacc9492acbefe6e5dfeaeb25e1
SHA512
8c54c9cc03e2b51bc71876fd47421c78764f9b77d29c56963cddc5748b134c59fafff0f842f0d72913b6df09621431358cbf621f3d46550c00cc8ab0b99a9921
+DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B
7a4713a3c1bb9f6bfe80b154b913a525b620bb389c2e6b4cf2d1d9bfc74d0c3703b439d77186d18b43766d1db219eb64d22ac84a08fdc859dac074025afdd49f
SHA512
4d6e9ed3b646e77737f625ca1beae9b531a528c32d81c9d06749aa8f87126ef4a2a0893d0ecf2a2cce7b7dbe508dbc9568e353b7213842cfa85ea27ebcc0a2d8
DIST blender-3.2.0.tar.xz 4152 BLAKE2B
ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248
SHA512
2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
diff --git a/media-gfx/blender/blender-3.2.0.ebuild
b/media-gfx/blender/blender-3.2.0.ebuild
index 163c6edd5700..9fcc16b94ddf 100644
--- a/media-gfx/blender/blender-3.2.0.ebuild
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -17,8 +17,8 @@ if [[ ${PV} = ** ]] ; then
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
- TEST_TARBALL_VERSION="3.2.0"
- SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 88c413e69eca..9fcc16b94ddf 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -17,8 +17,8 @@ if [[ ${PV} = ** ]] ; then
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
- #TEST_TARBALL_VERSION="3.0.0"
- #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 9e3206ecdd8c105b7564c1ea47636e538c5e109f
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jun 8 17:50:46 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 15 12:29:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3206ec
media-gfx/blender: Add new 3.2 version
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25815
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 2 +
media-gfx/blender/blender-3.2.0.ebuild | 399 +
2 files changed, 401 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b76c95959615..ae54023bc3f0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -11,3 +11,5 @@ DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b0
DIST blender-3.1.0.tar.xz 41017620 BLAKE2B
f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203
SHA512
354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
DIST blender-3.1.1.tar.xz 41029004 BLAKE2B
ca133349bfae52b36123da489ef7e50b30666b91d7961e9938932f5375a4d1129f3b15de59170ccf55723a08cbd0089bb7d73792c15221d91f2f83c40a2ebdb4
SHA512
88c339540a7b621b1771e1f17ecf7d4c21d86e05b83e395e15cd90b1347a50dda74ebaedd5ca178cabe6981b45244a64110ab855efdf74fe42f5bf45ffe811b1
DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
+DIST blender-3.2.0-tests.tar.bz2 311784237 BLAKE2B
5152bd52689ebc3179f4dd10001105615b13c2509da773390281da55f7b74547c3d37f7414f82eac3575bab8fe039f037f9ceaacc9492acbefe6e5dfeaeb25e1
SHA512
8c54c9cc03e2b51bc71876fd47421c78764f9b77d29c56963cddc5748b134c59fafff0f842f0d72913b6df09621431358cbf621f3d46550c00cc8ab0b99a9921
+DIST blender-3.2.0.tar.xz 4152 BLAKE2B
ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248
SHA512
2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
diff --git a/media-gfx/blender/blender-3.2.0.ebuild
b/media-gfx/blender/blender-3.2.0.ebuild
new file mode 100644
index ..163c6edd5700
--- /dev/null
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -0,0 +1,399 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="3.2.0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ osl? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/libintl
+ virtual/opengl
+ alembic? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 5414fa52975027297096f114ff269323e7d8d1c7
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jun 7 10:22:49 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jun 7 10:27:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5414fa52
media-gfx/blender: Stabilize 2.93.9 amd64, #850256
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-2.93.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-2.93.9.ebuild
b/media-gfx/blender/blender-2.93.9.ebuild
index 3edcc6cd0ab1..d46d6b301f28 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -20,7 +20,7 @@ else
TEST_TARBALL_VERSION=2.93.0
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
fi
SLOT="${PV%.*}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 0fbab484e8796340022f84f736a98fc45a79c116
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 2 15:10:55 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri May 20 11:25:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fbab484
media-gfx/blender: LTS version bump to 2.93.9
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-2.93.9.ebuild | 405
2 files changed, 406 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index c7f739efe810..b76c95959615 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,6 +2,7 @@ DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d00
DIST blender-2.93.0.tar.xz 42967016 BLAKE2B
1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3
SHA512
660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
DIST blender-2.93.6.tar.xz 43031980 BLAKE2B
235b9a08d9eb4ba83c30a4de333cc5b56eefe16209a96e2aeadbfb4d99b0add0031bbf3c4e0059833433475f07c03711ca773e19d57849ae83beb52a750fac48
SHA512
0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea
DIST blender-2.93.8.tar.xz 43024356 BLAKE2B
f69edf2bff0e97897d03b123516a66037fc690f518801dbb5f6851aa743c768bb1a56df2cc3e036d8fbae4ca3cfca295f34c7ae33dd37f0e16513c56f5d46572
SHA512
75213907ef7969f30468ce959a1da9287334b6f8b6edbf4b65e02d57a8b306fad6f86646d088eee8fd6f53f3e7511554b9a963f7a15527b17c3353db24f58249
+DIST blender-2.93.9.tar.xz 43035004 BLAKE2B
3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7
SHA512
605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e
DIST blender-3.0.0-tests.tar.bz2 302064577 BLAKE2B
c86a47231bb704124fe5ed59963176ca45ccc7e92bf8b00ce31d432cf6e35b9593ddb0d71f56aab0af6d1922f08eb158f9b7e355b5323d715b2b075ceafe9294
SHA512
e343f5da88aa7d2bc2a0758c01d3849b61c6ff3a0d65ac4d967aa02b701a5a02bfc8e7ed92b8f67af37e08f138987de8a27b8c7faa3cd8cfc3535adb8c624506
DIST blender-3.0.0.tar.xz 40169212 BLAKE2B
0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2
SHA512
727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21
DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
diff --git a/media-gfx/blender/blender-2.93.9.ebuild
b/media-gfx/blender/blender-2.93.9.ebuild
new file mode 100644
index ..1fbf5df0e427
--- /dev/null
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+
+ TEST_TARBALL_VERSION=2.93.0
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ opencl? ( cycles )
+ openvdb? ( tbb )
+ osl? ( cycles )
+ standalone? ( cycles )
+ test? ( color-management )"
+
+# Library versions for
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: f9c55a242ac6e8da55f8788d4470c0f30c918a0a
Author: Sebastian Parborg gmail com>
AuthorDate: Thu May 19 12:42:08 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri May 20 11:25:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c55a24
media-gfx/blender: Remove option to build standalone cycles binary
After talking to upstream, it seems like this option is not meant to be
use to ship any binaries. It is simply there as an example cycles
project that developers can easily modify if they want to quickly code
in new features and test them in cycles (without having to go through
blender).
Closes: https://bugs.gentoo.org/828880
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25288
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-2.93.9.ebuild | 11 +++
media-gfx/blender/blender-3.0.1-r5.ebuild | 11 +++
media-gfx/blender/blender-3.1.2.ebuild| 11 +++
media-gfx/blender/blender-.ebuild | 11 +++
4 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/media-gfx/blender/blender-2.93.9.ebuild
b/media-gfx/blender/blender-2.93.9.ebuild
index 09756af2d9f6..3edcc6cd0ab1 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -29,7 +29,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -40,7 +40,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
opencl? ( cycles )
openvdb? ( tbb )
osl? ( cycles )
- standalone? ( cycles )
test? ( color-management )"
# Library versions for official builds can be found in the blender source
directory in:
@@ -227,8 +226,8 @@ src_configure() {
-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
- -DWITH_CYCLES_STANDALONE=$(usex standalone)
- -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+ -DWITH_CYCLES_STANDALONE=OFF
+ -DWITH_CYCLES_STANDALONE_GUI=OFF
-DWITH_DOC_MANPAGE=$(usex man)
-DWITH_FFTW3=$(usex fftw)
-DWITH_GMP=$(usex gmp)
@@ -308,10 +307,6 @@ src_install() {
# Pax mark blender for hardened support.
pax-mark m "${BUILD_DIR}"/bin/blender
- if use standalone; then
- dobin "${BUILD_DIR}"/bin/cycles
- fi
-
cmake_src_install
if use man; then
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 38945f3726a3..9ed2565bb8b7 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -30,7 +30,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff
valgrind"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -40,7 +40,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
fluid? ( tbb )
openvdb? ( tbb )
osl? ( cycles )
- standalone? ( cycles )
test? ( color-management )"
# Library versions for official builds can be found in the blender source
directory in:
@@ -229,8 +228,8 @@ src_configure() {
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
- -DWITH_CYCLES_STANDALONE=$(usex standalone)
- -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+ -DWITH_CYCLES_STANDALONE=OFF
+ -DWITH_CYCLES_STANDALONE_GUI=OFF
-DWITH_DOC_MANPAGE=$(usex man)
-DWITH_FFTW3=$(usex fftw)
-DWITH_GMP=$(usex gmp)
@@ -316,10 +315,6 @@ src_install() {
# Pax mark blender for hardened support.
pax-mark m "${BUILD_DIR}"/bin/blender
- if use standalone; then
- dobin "${BUILD_DIR}"/bin/cycles
- fi
-
cmake_src_install
if use man; then
diff --git a/media-gfx/blender/blender-3.1.2.ebuild
b/media-gfx/blender/blender-3.1.2.ebuild
index
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d14799108bc129bbb8914201068adf2667238e72
Author: Sebastian Parborg gmail com>
AuthorDate: Tue May 3 09:47:31 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri May 20 11:25:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1479910
media-gfx/blender: Update jpeg dep
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-2.93.9.ebuild | 2 +-
media-gfx/blender/blender-3.0.1-r5.ebuild | 2 +-
media-gfx/blender/blender-3.1.2.ebuild| 2 +-
media-gfx/blender/blender-.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/blender/blender-2.93.9.ebuild
b/media-gfx/blender/blender-2.93.9.ebuild
index 1fbf5df0e427..09756af2d9f6 100644
--- a/media-gfx/blender/blender-2.93.9.ebuild
+++ b/media-gfx/blender/blender-2.93.9.ebuild
@@ -55,11 +55,11 @@ RDEPEND="${PYTHON_DEPS}
')
media-libs/freetype:=
media-libs/glew:*
+ media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
sys-libs/zlib:=
virtual/glu
- virtual/jpeg
virtual/libintl
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index ef4995c93aa0..38945f3726a3 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -56,11 +56,11 @@ RDEPEND="${PYTHON_DEPS}
')
media-libs/freetype:=
media-libs/glew:*
+ media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
sys-libs/zlib:=
virtual/glu
- virtual/jpeg
virtual/libintl
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
diff --git a/media-gfx/blender/blender-3.1.2.ebuild
b/media-gfx/blender/blender-3.1.2.ebuild
index cd1eca85cae5..2d10adc94e81 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -54,11 +54,11 @@ RDEPEND="${PYTHON_DEPS}
')
media-libs/freetype:=
media-libs/glew:*
+ media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
sys-libs/zlib:=
virtual/glu
- virtual/jpeg
virtual/libintl
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 02cb64f9cc13..edfe76bbcf82 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -54,11 +54,11 @@ RDEPEND="${PYTHON_DEPS}
')
media-libs/freetype:=
media-libs/glew:*
+ media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsamplerate
sys-libs/zlib:=
virtual/glu
- virtual/jpeg
virtual/libintl
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: b3bbe52b38011538957c9ad1244427fecc4f9203
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 2 14:58:01 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri May 20 11:25:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bbe52b
media-gfx/blender: Update python useflags and deps
Blender expects Cython to be installed even during runtime for use in
python addons.
In addition to this, it doesn't make too much sense for the Gentoo
ebulid to expose the "WITH_SYSTEM_PYTHON" and the related switches.
Those options are used to build easily distributed Blender packages that
bundle python and the python dependecies. This can be used deploy
Blender on systems were there is no way to easily easily pull in the
required python version and libraries.
However on Gentoo, we have a very good system for doing this ourselves
with portage.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-3.0.1-r5.ebuild | 6 +++---
media-gfx/blender/blender-3.1.2.ebuild| 7 +++
media-gfx/blender/blender-.ebuild | 6 +++---
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index f9c141963446..ef4995c93aa0 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -26,7 +26,7 @@ fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
@@ -49,6 +49,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?,threads(+)]
dev-libs/lzo:2=
$(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/zstandard[${PYTHON_USEDEP}]
@@ -262,8 +263,7 @@ src_configure() {
-DWITH_POTRACE=$(usex potrace)
-DWITH_PUGIXML=$(usex pugixml)
-DWITH_PULSEAUDIO=$(usex pulseaudio)
- -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
- -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+ -DWITH_PYTHON_INSTALL=OFF
-DWITH_SDL=$(usex sdl)
-DWITH_STATIC_LIBS=OFF
-DWITH_SYSTEM_EIGEN3=ON
diff --git a/media-gfx/blender/blender-3.1.2.ebuild
b/media-gfx/blender/blender-3.1.2.ebuild
index 402d1ca0b796..cd1eca85cae5 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -24,7 +24,7 @@ fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
@@ -47,6 +47,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?,threads(+)]
dev-libs/lzo:2=
$(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/zstandard[${PYTHON_USEDEP}]
@@ -121,7 +122,6 @@ BDEPEND="
dev-texlive/texlive-latexextra
)
nls? ( sys-devel/gettext )
- system-numpy? ( system-python? ( dev-python/cython ) )
"
blender_check_requirements() {
@@ -253,8 +253,7 @@ src_configure() {
-DWITH_POTRACE=$(usex potrace)
-DWITH_PUGIXML=$(usex pugixml)
-DWITH_PULSEAUDIO=$(usex pulseaudio)
- -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
- -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+ -DWITH_PYTHON_INSTALL=OFF
-DWITH_SDL=$(usex sdl)
-DWITH_STATIC_LIBS=OFF
-DWITH_SYSTEM_EIGEN3=ON
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index f79dd995b76e..02cb64f9cc13 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -24,7 +24,7 @@ fi
SLOT="${PV%.*}"
LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
@@ -47,6 +47,7 @@
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d1cf75e6e3ddbe9bd7361a6be35dc681dd48e611
Author: Sebastian Parborg gmail com>
AuthorDate: Thu Apr 7 16:17:52 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Apr 17 14:56:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cf75e6
media-gfx/blender: add 3.1.2
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.1.2.ebuild | 404 +
2 files changed, 405 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 57c5ad01433c..c7f739efe810 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -9,3 +9,4 @@ DIST blender-3.0.1.tar.xz 40155604 BLAKE2B
b611f08617f1be217604e87cfafe88f6cc990
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
DIST blender-3.1.0.tar.xz 41017620 BLAKE2B
f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203
SHA512
354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
DIST blender-3.1.1.tar.xz 41029004 BLAKE2B
ca133349bfae52b36123da489ef7e50b30666b91d7961e9938932f5375a4d1129f3b15de59170ccf55723a08cbd0089bb7d73792c15221d91f2f83c40a2ebdb4
SHA512
88c339540a7b621b1771e1f17ecf7d4c21d86e05b83e395e15cd90b1347a50dda74ebaedd5ca178cabe6981b45244a64110ab855efdf74fe42f5bf45ffe811b1
+DIST blender-3.1.2.tar.xz 41014760 BLAKE2B
1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604
SHA512
e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
diff --git a/media-gfx/blender/blender-3.1.2.ebuild
b/media-gfx/blender/blender-3.1.2.ebuild
new file mode 100644
index ..50be45a07af8
--- /dev/null
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ osl? ( cycles )
+ standalone? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ embree? ( >=media-libs/embree-3.10.0[raymask] )
+ ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: f253ee0122a5bdc78e81f27a9448b2e55f9e2536
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Apr 17 14:48:09 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Apr 17 14:56:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f253ee01
media-gfx/blender: add cython dep for 3.1.2
Signed-off-by: Joonas Niilola gentoo.org>
media-gfx/blender/blender-3.1.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/blender/blender-3.1.2.ebuild
b/media-gfx/blender/blender-3.1.2.ebuild
index 50be45a07af8..402d1ca0b796 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -121,6 +121,7 @@ BDEPEND="
dev-texlive/texlive-latexextra
)
nls? ( sys-devel/gettext )
+ system-numpy? ( system-python? ( dev-python/cython ) )
"
blender_check_requirements() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: fee908e0a22d1bf0747e75d6a9ec1e701bc999b4
Author: Sam James gentoo org>
AuthorDate: Fri Apr 1 00:08:46 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 1 00:09:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee908e0
media-gfx/blender: add 3.1.1
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-3.1.1.ebuild | 404 +
2 files changed, 405 insertions(+)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1101bc01e18b..57c5ad01433c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -8,3 +8,4 @@ DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358
DIST blender-3.0.1.tar.xz 40155604 BLAKE2B
b611f08617f1be217604e87cfafe88f6cc9904ed6321a74bea4ee5ad14f3cf4002b12d82fa3b3c6111a681fd7e1c530f66be28c506973ff7722175a9036a19da
SHA512
b9af6d49201eb26ec77a3cecdb9c0945ffc915d4eecaaa36091365340244bfd1565a7679c8b7a81d3335383f158dc01339ea8edc108730835d81db1de84049bf
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
DIST blender-3.1.0.tar.xz 41017620 BLAKE2B
f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203
SHA512
354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
+DIST blender-3.1.1.tar.xz 41029004 BLAKE2B
ca133349bfae52b36123da489ef7e50b30666b91d7961e9938932f5375a4d1129f3b15de59170ccf55723a08cbd0089bb7d73792c15221d91f2f83c40a2ebdb4
SHA512
88c339540a7b621b1771e1f17ecf7d4c21d86e05b83e395e15cd90b1347a50dda74ebaedd5ca178cabe6981b45244a64110ab855efdf74fe42f5bf45ffe811b1
diff --git a/media-gfx/blender/blender-3.1.1.ebuild
b/media-gfx/blender/blender-3.1.1.ebuild
new file mode 100644
index ..50be45a07af8
--- /dev/null
+++ b/media-gfx/blender/blender-3.1.1.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+if [[ ${PV} = ** ]] ; then
+ # Subversion is needed for downloading unit test files
+ inherit git-r3 subversion
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ # Update these between major releases.
+ TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+ alembic collada +color-management cuda +cycles \
+ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ fluid? ( tbb )
+ openvdb? ( tbb )
+ osl? ( cycles )
+ standalone? ( cycles )
+ test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source
directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=[nls?,threads(+)]
+ dev-libs/lzo:2=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/zstandard[${PYTHON_USEDEP}]
+ ')
+ media-libs/freetype:=
+ media-libs/glew:*
+ media-libs/libpng:=
+ media-libs/libsamplerate
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ embree? ( >=media-libs/embree-3.10.0[raymask] )
+ ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ fftw? ( sci-libs/fftw:3.0= )
+ gmp? ( dev-libs/gmp )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: b03f30e16bf9ad41c6c835a89c7ccc3f1ff81e04
Author: Sam James gentoo org>
AuthorDate: Mon Mar 14 18:51:51 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 14 18:52:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03f30e1
media-gfx/blender: fix SizeViolation
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-3.0.1-r5.ebuild |2 +-
.../blender/files/blender-3.0.1-ffmpeg-5.0.patch | 1045
2 files changed, 1 insertion(+), 1046 deletions(-)
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 5f9da3900d6d..f9c141963446 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git;
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
-SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+ SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
# Update these between major releases.
TEST_TARBALL_VERSION="3.0.0"
diff --git a/media-gfx/blender/files/blender-3.0.1-ffmpeg-5.0.patch
b/media-gfx/blender/files/blender-3.0.1-ffmpeg-5.0.patch
deleted file mode 100644
index 5cd23b9e4b21..
--- a/media-gfx/blender/files/blender-3.0.1-ffmpeg-5.0.patch
+++ /dev/null
@@ -1,1045 +0,0 @@
-commit af6a1b08e3f0d0070ac9423868d2d3f81057717a
-Author: Sebastian Parborg
-Date: Fri Feb 18 18:20:06 2022 +0100
-
-VSE: Refactor our code to be compatible with ffmpeg 5.0
-
-In ffmpeg 5.0, several variables were made const to try to prevent bad API
usage.
-Removed some dead code that wasn't used anymore as well.
-
-Reviewed By: Richard Antalik
-
-Differential Revision: http://developer.blender.org/D14063
-
-diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
-index de3ca099696..69bb45119a6 100644
a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
-+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
-@@ -177,7 +177,7 @@ void FFMPEGReader::init(int stream)
-
- // get a decoder and open it
- #ifndef FFMPEG_OLD_CODE
-- AVCodec* aCodec =
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
-+ const AVCodec* aCodec =
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
-
- if(!aCodec)
- AUD_THROW(FileException, "File couldn't be read, no decoder
found with ffmpeg.");
-diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
-index 10517d1d596..32eb2330594 100644
a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
-+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
-@@ -23,6 +23,7 @@
- extern "C" {
- #include
- #include
-+#include
- }
-
- AUD_NAMESPACE_BEGIN
-@@ -171,66 +172,66 @@ FFMPEGWriter::FFMPEGWriter(std::string filename,
DeviceSpecs specs, Container fo
- if(avformat_alloc_output_context2(_formatCtx, nullptr,
formats[format], filename.c_str()) < 0)
- AUD_THROW(FileException, "File couldn't be written, format
couldn't be found with ffmpeg.");
-
-- AVOutputFormat* outputFmt = m_formatCtx->oformat;
-+ const AVOutputFormat* outputFmt = m_formatCtx->oformat;
-
- if(!outputFmt) {
- avformat_free_context(m_formatCtx);
- AUD_THROW(FileException, "File couldn't be written, output
format couldn't be found with ffmpeg.");
- }
-
-- outputFmt->audio_codec = AV_CODEC_ID_NONE;
-+ AVCodecID audio_codec = AV_CODEC_ID_NONE;
-
- switch(codec)
- {
- case CODEC_AAC:
-- outputFmt->audio_codec = AV_CODEC_ID_AAC;
-+ audio_codec = AV_CODEC_ID_AAC;
- break;
- case CODEC_AC3:
-- outputFmt->audio_codec = AV_CODEC_ID_AC3;
-+ audio_codec = AV_CODEC_ID_AC3;
- break;
- case CODEC_FLAC:
-- outputFmt->audio_codec = AV_CODEC_ID_FLAC;
-+ audio_codec = AV_CODEC_ID_FLAC;
- break;
- case CODEC_MP2:
-- outputFmt->audio_codec = AV_CODEC_ID_MP2;
-+ audio_codec = AV_CODEC_ID_MP2;
- break;
- case CODEC_MP3:
-- outputFmt->audio_codec = AV_CODEC_ID_MP3;
-+ audio_codec = AV_CODEC_ID_MP3;
- break;
- case CODEC_OPUS:
-- outputFmt->audio_codec = AV_CODEC_ID_OPUS;
-+ audio_codec = AV_CODEC_ID_OPUS;
- break;
- case CODEC_PCM:
- switch(specs.format)
- {
- case FORMAT_U8:
-- outputFmt->audio_codec = AV_CODEC_ID_PCM_U8;
-+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 682acf3bd5806be9c459e74d4d1dbe9d56a3b9e7
Author: Sam James gentoo org>
AuthorDate: Mon Mar 14 18:51:11 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 14 18:51:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682acf3b
media-gfx/blender: use devspace for patch
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-2.93.8-r5.ebuild | 4 +++-
media-gfx/blender/blender-3.0.1-r5.ebuild | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 01cbb2cd7716..1101bc01e18b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,6 +4,7 @@ DIST blender-2.93.6.tar.xz 43031980 BLAKE2B
235b9a08d9eb4ba83c30a4de333cc5b56eef
DIST blender-2.93.8.tar.xz 43024356 BLAKE2B
f69edf2bff0e97897d03b123516a66037fc690f518801dbb5f6851aa743c768bb1a56df2cc3e036d8fbae4ca3cfca295f34c7ae33dd37f0e16513c56f5d46572
SHA512
75213907ef7969f30468ce959a1da9287334b6f8b6edbf4b65e02d57a8b306fad6f86646d088eee8fd6f53f3e7511554b9a963f7a15527b17c3353db24f58249
DIST blender-3.0.0-tests.tar.bz2 302064577 BLAKE2B
c86a47231bb704124fe5ed59963176ca45ccc7e92bf8b00ce31d432cf6e35b9593ddb0d71f56aab0af6d1922f08eb158f9b7e355b5323d715b2b075ceafe9294
SHA512
e343f5da88aa7d2bc2a0758c01d3849b61c6ff3a0d65ac4d967aa02b701a5a02bfc8e7ed92b8f67af37e08f138987de8a27b8c7faa3cd8cfc3535adb8c624506
DIST blender-3.0.0.tar.xz 40169212 BLAKE2B
0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2
SHA512
727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21
+DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
SHA512
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e76458352ca6d653da809
DIST blender-3.0.1.tar.xz 40155604 BLAKE2B
b611f08617f1be217604e87cfafe88f6cc9904ed6321a74bea4ee5ad14f3cf4002b12d82fa3b3c6111a681fd7e1c530f66be28c506973ff7722175a9036a19da
SHA512
b9af6d49201eb26ec77a3cecdb9c0945ffc915d4eecaaa36091365340244bfd1565a7679c8b7a81d3335383f158dc01339ea8edc108730835d81db1de84049bf
DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
SHA512
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
DIST blender-3.1.0.tar.xz 41017620 BLAKE2B
f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203
SHA512
354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
diff --git a/media-gfx/blender/blender-2.93.8-r5.ebuild
b/media-gfx/blender/blender-2.93.8-r5.ebuild
index 0c4998e2e4c2..7112d2413a97 100644
--- a/media-gfx/blender/blender-2.93.8-r5.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r5.ebuild
@@ -16,6 +16,8 @@ if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git;
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+
TEST_TARBALL_VERSION=2.93.0
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
KEYWORDS="amd64 ~arm ~arm64"
@@ -127,7 +129,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
"${FILESDIR}"/${PN}-3.0.1-openexr.patch
"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
- "${FILESDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+ "${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
)
blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 4e86970281c1..5f9da3900d6d 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -16,6 +16,8 @@ if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git;
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+
# Update these between major releases.
TEST_TARBALL_VERSION="3.0.0"
SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
@@ -127,7 +129,7 @@ PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/
commit: 0538d70bf6187eba8bb550253eb9cf436b6ad9bf
Author: Sebastian Parborg gmail com>
AuthorDate: Mon Mar 14 15:32:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 14 18:43:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0538d70b
media-gfx/blender: Fix building with ffmpeg 5.0
Closes: https://bugs.gentoo.org/834380
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24558
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.93.0-r1.ebuild |2 +-
media-gfx/blender/blender-2.93.6.ebuild|2 +-
media-gfx/blender/blender-2.93.8-r4.ebuild |2 +-
...r-2.93.8-r4.ebuild => blender-2.93.8-r5.ebuild} |1 +
media-gfx/blender/blender-3.0.0-r1.ebuild |2 +-
media-gfx/blender/blender-3.0.1-r4.ebuild |2 +-
...der-3.0.1-r4.ebuild => blender-3.0.1-r5.ebuild} |1 +
.../blender/files/blender-3.0.1-ffmpeg-5.0.patch | 1045
8 files changed, 1052 insertions(+), 5 deletions(-)
diff --git a/media-gfx/blender/blender-2.93.0-r1.ebuild
b/media-gfx/blender/blender-2.93.0-r1.ebuild
index 3ebf8b183f5f..5759d72da06c 100644
--- a/media-gfx/blender/blender-2.93.0-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.0-r1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${PYTHON_DEPS}
color-management? ( >=media-libs/opencolorio-2.0.0 )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
- ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ ffmpeg? (
=media-libs/opencolorio-2.1.1-r7:= )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
- ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ ffmpeg? (
=media-libs/opencolorio-2.1.1-r7:= )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
- ffmpeg? (
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+ ffmpeg? (
+Date: Fri Feb 18 18:20:06 2022 +0100
+
+VSE: Refactor our code to be compatible with ffmpeg 5.0
+
+In ffmpeg 5.0, several variables were made const to try to prevent bad API
usage.
+Removed some dead code that wasn't used anymore as well.
+
+Reviewed By: Richard Antalik
+
+Differential Revision: http://developer.blender.org/D14063
+
+diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+index de3ca099696..69bb45119a6 100644
+--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+@@ -177,7 +177,7 @@ void FFMPEGReader::init(int stream)
+
+ // get a decoder and open it
+ #ifndef FFMPEG_OLD_CODE
+- AVCodec* aCodec =
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
++ const AVCodec* aCodec =
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
+
+ if(!aCodec)
+ AUD_THROW(FileException, "File couldn't be read, no decoder
found with ffmpeg.");
+diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
+index 10517d1d596..32eb2330594 100644
+--- a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
+@@ -23,6 +23,7 @@
+ extern "C" {
+ #include
+ #include
++#include
+ }
+
+ AUD_NAMESPACE_BEGIN
+@@ -171,66 +172,66 @@ FFMPEGWriter::FFMPEGWriter(std::string filename,
DeviceSpecs specs, Container fo
+ if(avformat_alloc_output_context2(_formatCtx, nullptr,
formats[format], filename.c_str()) < 0)
+ AUD_THROW(FileException, "File couldn't be written, format
couldn't be found with ffmpeg.");
+
+- AVOutputFormat* outputFmt = m_formatCtx->oformat;
++ const AVOutputFormat* outputFmt = m_formatCtx->oformat;
+
+ if(!outputFmt) {
+ avformat_free_context(m_formatCtx);
+ AUD_THROW(FileException, "File couldn't be written, output
format couldn't be found with ffmpeg.");
+ }
+
+- outputFmt->audio_codec = AV_CODEC_ID_NONE;
++ AVCodecID audio_codec = AV_CODEC_ID_NONE;
+
+ switch(codec)
+ {
+ case CODEC_AAC:
+- outputFmt->audio_codec = AV_CODEC_ID_AAC;
++ audio_codec = AV_CODEC_ID_AAC;
+ break;
+ case CODEC_AC3:
+- outputFmt->audio_codec = AV_CODEC_ID_AC3;
++ audio_codec = AV_CODEC_ID_AC3;
+ break;
+ case CODEC_FLAC:
+- outputFmt->audio_codec = AV_CODEC_ID_FLAC;
++ audio_codec = AV_CODEC_ID_FLAC;
+ break;
+ case CODEC_MP2:
+- outputFmt->audio_codec = AV_CODEC_ID_MP2;
++ audio_codec = AV_CODEC_ID_MP2;
+
