commit: 3ac6dbb44ac0ad1b60c17af84872a83103c6630b
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Fri Dec 3 13:58:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 22:40:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac6dbb4
media-gfx/blender: Bump to new the newest release versions
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/blender/Manifest | 2 ++
.../{blender-9999.ebuild => blender-2.93.6.ebuild} | 11 +++---
.../{blender-9999.ebuild => blender-3.0.0.ebuild} | 40 +++++++++++++---------
media-gfx/blender/blender-9999.ebuild | 40 +++++++++++++---------
4 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 24a6d396c78c..71d78b921eb2 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,3 +2,5 @@ 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.1.tar.xz 42960100 BLAKE2B
eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8
SHA512
b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
DIST blender-2.93.2.tar.xz 43028440 BLAKE2B
02ffc5be190445c97e3cb14e4635969df7a7aaf0100ee5ba50f2d283b077ffebf1f139aec86034ed2df03d94290d5a8bb369f88c734db5103869ffa1d3f588a6
SHA512
5dac627b0e5f38af1f861d4fddb01f4ba1e992c704337c56e2ebbfdcbd62e6de83195e3541342603a1ae966e89a06ff98764c817e282401edd792857d577b989
+DIST blender-2.93.6.tar.xz 43031980 BLAKE2B
235b9a08d9eb4ba83c30a4de333cc5b56eefe16209a96e2aeadbfb4d99b0add0031bbf3c4e0059833433475f07c03711ca773e19d57849ae83beb52a750fac48
SHA512
0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea
+DIST blender-3.0.0.tar.xz 40169212 BLAKE2B
0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2
SHA512
727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21
diff --git a/media-gfx/blender/blender-9999.ebuild
b/media-gfx/blender/blender-2.93.6.ebuild
similarity index 97%
copy from media-gfx/blender/blender-9999.ebuild
copy to media-gfx/blender/blender-2.93.6.ebuild
index 70d0ff3a695d..84199a7c6e54 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-2.93.6.ebuild
@@ -16,7 +16,9 @@ if [[ ${PV} = *9999* ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git";
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz";
- KEYWORDS="~amd64 ~x86"
+ 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%.*}"
@@ -80,7 +82,7 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
opencl? ( virtual/opencl )
- oidn? ( >=media-libs/oidn-1.4.1 )
+ oidn? ( >=media-libs/oidn-1.3.0 )
openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
openexr? (
media-libs/ilmbase:=
@@ -152,15 +154,14 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} = *9999* ]] ; then
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
git-r3_src_unpack
else
default
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
fi
if use test; then
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+ mkdir -p lib || die
+ mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib
|| die
fi
}
diff --git a/media-gfx/blender/blender-9999.ebuild
b/media-gfx/blender/blender-3.0.0.ebuild
similarity index 89%
copy from media-gfx/blender/blender-9999.ebuild
copy to media-gfx/blender/blender-3.0.0.ebuild
index 70d0ff3a695d..ea92df5eb024 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-3.0.0.ebuild
@@ -16,7 +16,10 @@ if [[ ${PV} = *9999* ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git";
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz";
- KEYWORDS="~amd64 ~x86"
+ # Update these between major releases.
+ #TEST_TARBALL_VERSION=SLOT_NUMBER
+ #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%.*}"
@@ -24,7 +27,7 @@ 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 ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
+ man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
RESTRICT="!test? ( test )"
@@ -33,7 +36,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
cuda? ( cycles )
cycles? ( openexr tiff openimageio )
fluid? ( tbb )
- opencl? ( cycles )
openvdb? ( tbb )
osl? ( cycles )
standalone? ( cycles )
@@ -47,6 +49,7 @@ RDEPEND="${PYTHON_DEPS}
$(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:*
@@ -79,14 +82,13 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- opencl? ( virtual/opencl )
oidn? ( >=media-libs/oidn-1.4.1 )
openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
openexr? (
media-libs/ilmbase:=
media-libs/openexr:=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
openvdb? (
>=media-gfx/openvdb-7.1.0
dev-libs/c-blosc:=
@@ -136,8 +138,8 @@ blender_get_version() {
# Add period (290 -> 2.90).
BV=${BV:0:1}.${BV:1}
else
- # Add period and strip last number (300 -> 3.0)
- BV=${BV:0:1}.${BV:1:1}
+ # Add period and skip the middle number (301 -> 3.1)
+ BV=${BV:0:1}.${BV:2}
fi
}
@@ -152,16 +154,20 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} = *9999* ]] ; then
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
git-r3_src_unpack
+ 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
else
default
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+ 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
+ fi
fi
- if use test; then
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- fi
}
src_prepare() {
@@ -178,7 +184,6 @@ src_prepare() {
sed -e "s|blender.svg|blender-${BV}.svg|" -i
source/creator/CMakeLists.txt || die
sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i
source/creator/CMakeLists.txt || die
sed -e "s|blender.desktop|blender-${BV}.desktop|" -i
source/creator/CMakeLists.txt || die
- sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i
source/creator/CMakeLists.txt || die
sed -e "s|Name=Blender|Name=Blender ${PV}|" -i
release/freedesktop/blender.desktop || die
sed -e "s|Exec=blender|Exec=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
@@ -187,7 +192,6 @@ src_prepare() {
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/bin/blender-thumbnailer.py
release/bin/blender-${BV}-thumbnailer.py || die
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
@@ -213,7 +217,6 @@ src_configure() {
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
- -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
-DWITH_CYCLES_STANDALONE=$(usex standalone)
@@ -299,6 +302,11 @@ src_test() {
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.
+ [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is
invalid, fix the ebuild!"
+ [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is
invalid, fix the ebuild!"
+
cmake_src_test
# Clean up the image directory for src_install
@@ -335,9 +343,9 @@ src_install() {
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
- python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+ mv "${ED}/usr/bin/blender-thumbnailer"
"${ED}/usr/bin/blender-${BV}-thumbnailer" || die
mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
diff --git a/media-gfx/blender/blender-9999.ebuild
b/media-gfx/blender/blender-9999.ebuild
index 70d0ff3a695d..ea92df5eb024 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -16,7 +16,10 @@ if [[ ${PV} = *9999* ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git";
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz";
- KEYWORDS="~amd64 ~x86"
+ # Update these between major releases.
+ #TEST_TARBALL_VERSION=SLOT_NUMBER
+ #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%.*}"
@@ -24,7 +27,7 @@ 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 ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
+ man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone
test +tiff valgrind"
RESTRICT="!test? ( test )"
@@ -33,7 +36,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
cuda? ( cycles )
cycles? ( openexr tiff openimageio )
fluid? ( tbb )
- opencl? ( cycles )
openvdb? ( tbb )
osl? ( cycles )
standalone? ( cycles )
@@ -47,6 +49,7 @@ RDEPEND="${PYTHON_DEPS}
$(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:*
@@ -79,14 +82,13 @@ RDEPEND="${PYTHON_DEPS}
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
- opencl? ( virtual/opencl )
oidn? ( >=media-libs/oidn-1.4.1 )
openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
openexr? (
media-libs/ilmbase:=
media-libs/openexr:=
)
- opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+ opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
openvdb? (
>=media-gfx/openvdb-7.1.0
dev-libs/c-blosc:=
@@ -136,8 +138,8 @@ blender_get_version() {
# Add period (290 -> 2.90).
BV=${BV:0:1}.${BV:1}
else
- # Add period and strip last number (300 -> 3.0)
- BV=${BV:0:1}.${BV:1:1}
+ # Add period and skip the middle number (301 -> 3.1)
+ BV=${BV:0:1}.${BV:2}
fi
}
@@ -152,16 +154,20 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} = *9999* ]] ; then
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
git-r3_src_unpack
+ 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
else
default
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+ 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
+ fi
fi
- if use test; then
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- fi
}
src_prepare() {
@@ -178,7 +184,6 @@ src_prepare() {
sed -e "s|blender.svg|blender-${BV}.svg|" -i
source/creator/CMakeLists.txt || die
sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i
source/creator/CMakeLists.txt || die
sed -e "s|blender.desktop|blender-${BV}.desktop|" -i
source/creator/CMakeLists.txt || die
- sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i
source/creator/CMakeLists.txt || die
sed -e "s|Name=Blender|Name=Blender ${PV}|" -i
release/freedesktop/blender.desktop || die
sed -e "s|Exec=blender|Exec=blender-${BV}|" -i
release/freedesktop/blender.desktop || die
@@ -187,7 +192,6 @@ src_prepare() {
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/bin/blender-thumbnailer.py
release/bin/blender-${BV}-thumbnailer.py || die
if use test; then
# Without this the tests will try to use /usr/bin/blender and
/usr/share/blender/ to run the tests.
@@ -213,7 +217,6 @@ src_configure() {
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
- -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
-DWITH_CYCLES_STANDALONE=$(usex standalone)
@@ -299,6 +302,11 @@ src_test() {
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.
+ [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is
invalid, fix the ebuild!"
+ [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is
invalid, fix the ebuild!"
+
cmake_src_test
# Clean up the image directory for src_install
@@ -335,9 +343,9 @@ src_install() {
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
- python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+ mv "${ED}/usr/bin/blender-thumbnailer"
"${ED}/usr/bin/blender-${BV}-thumbnailer" || die
mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
