[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/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/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/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/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/files/, media-gfx/blender/
commit: a05e2477ce750c3bf71836b8b8de9e00862cb929
Author: Sam James gentoo org>
AuthorDate: Tue Feb 8 08:12:57 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 12 03:55:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05e2477
media-gfx/blender: add 3.0.1
... and flip over to OpenEXR 3, because things keep breaking with
the mix-and-match between 2/3 and things are starting to prefer 3
in their build systems.
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
.../{blender-.ebuild => blender-3.0.1.ebuild} | 15 +-
media-gfx/blender/blender-.ebuild | 12 +-
.../blender/files/blender-3.0.1-openexr.patch | 211 +
.../files/blender-3.0.1-openimageio-2.3.patch | 29 +++
5 files changed, 261 insertions(+), 7 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 812505b74991..1582fad2110a 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -5,3 +5,4 @@ DIST blender-2.93.2.tar.xz 43028440 BLAKE2B
02ffc5be190445c97e3cb14e4635969df7a7
DIST blender-2.93.6.tar.xz 43031980 BLAKE2B
235b9a08d9eb4ba83c30a4de333cc5b56eefe16209a96e2aeadbfb4d99b0add0031bbf3c4e0059833433475f07c03711ca773e19d57849ae83beb52a750fac48
SHA512
0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea
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.tar.xz 40155604 BLAKE2B
b611f08617f1be217604e87cfafe88f6cc9904ed6321a74bea4ee5ad14f3cf4002b12d82fa3b3c6111a681fd7e1c530f66be28c506973ff7722175a9036a19da
SHA512
b9af6d49201eb26ec77a3cecdb9c0945ffc915d4eecaaa36091365340244bfd1565a7679c8b7a81d3335383f158dc01339ea8edc108730835d81db1de84049bf
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-3.0.1.ebuild
similarity index 96%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-3.0.1.ebuild
index 515e813a2d1b..55af3199fd93 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-3.0.1.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=SLOT_NUMBER
- #SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
+ TEST_TARBALL_VERSION="3.0.0"
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
KEYWORDS="~amd64 ~arm ~arm64"
fi
@@ -85,8 +85,8 @@ RDEPEND="${PYTHON_DEPS}
oidn? ( >=media-libs/oidn-1.4.1 )
openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
openexr? (
- media-libs/ilmbase:=
- media-libs/openexr:=
+ dev-libs/imath:=
+ media-libs/openexr:3=
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
openvdb? (
@@ -123,6 +123,12 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
+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
+)
+
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -229,6 +235,7 @@ src_configure() {
-DWITH_HEADLESS=$(usex headless)
-DWITH_INSTALL_PORTABLE=OFF
-DWITH_IMAGE_DDS=$(usex dds)
+ -DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
-DWITH_IMAGE_OPENEXR=$(usex openexr)
-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-DWITH_IMAGE_TIFF=$(usex tiff)
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index 515e813a2d1b..2a0b9a5eef41 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = ** ]] ; then
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/files/, media-gfx/blender/
commit: 61c7536f66bd3a6a3347800226cd8dc969671116
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Apr 28 01:08:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c7536f
media-gfx/blender: Slot, bump to 2.93.0, and add live ebuild
Closes: https://bugs.gentoo.org/795003
Closes: https://bugs.gentoo.org/778008
Closes: https://bugs.gentoo.org/774372
Closes: https://bugs.gentoo.org/673422
Closes: https://bugs.gentoo.org/737388
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20565
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 4 +-
...ender-2.83.12.ebuild => blender-2.83.15.ebuild} | 192 +++---
...blender-2.91.2.ebuild => blender-2.93.0.ebuild} | 211
...{blender-2.83.12.ebuild => blender-.ebuild} | 203 ---
.../blender/files/blender-2.83.13-ffmpeg-4_4.patch | 27 +++
.../files/blender-2.83.6-constraints_test.patch| 13 ++
.../files/blender-2.83.6-fix_opevdb_abi.patch | 21 ++
.../blender-2.83.6-libmv_eigen_alignment.patch | 219 +
media-gfx/blender/metadata.xml | 23 +--
9 files changed, 675 insertions(+), 238 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 46f37a28858..a0063395f2e 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,2 @@
-DIST blender-2.83.12.tar.xz 39132904 BLAKE2B
175e8c5ab9324421f23357bc367b2e70ee8c391130d376d6d53eefbf90529d09921395cd11e7b1709aaa4d24ec6f8df64050869e41bbe211229126db08f22089
SHA512
f313c92e311e852742e74934504fcd3ccd296bcea2499f605cef568e3c615ececd9d70dec5025e4d4ff19f03803c148a8b03a4b68b7ca978554f5b1122c9890b
-DIST blender-2.91.2.tar.xz 42057100 BLAKE2B
f10f838ad6d56135fddf9e9171473e1e589f511a38112845d650436a1eb4da94ea0777571dffc6446f4217dce647b087cf5a18841d7dde2086d187bb8f7d3654
SHA512
9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
+DIST blender-2.83.15.tar.xz 39125740 BLAKE2B
687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa
SHA512
2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25
+DIST blender-2.93.0.tar.xz 42967016 BLAKE2B
1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3
SHA512
660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
diff --git a/media-gfx/blender/blender-2.83.12.ebuild
b/media-gfx/blender/blender-2.83.15.ebuild
similarity index 57%
copy from media-gfx/blender/blender-2.83.12.ebuild
copy to media-gfx/blender/blender-2.83.15.ebuild
index 44b4b4f8849..e9a3def3b11 100644
--- a/media-gfx/blender/blender-2.83.12.ebuild
+++ b/media-gfx/blender/blender-2.83.15.ebuild
@@ -3,25 +3,27 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 subversion \
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
-SRC_URI="https://download.blender.org/source/${P}.tar.xz;
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
- abi6-compat abi7-compat alembic collada color-management cuda cycles \
- debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+
+if [[ ${PV} = ** ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ KEYWORDS="~amd64 ~x86"
+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 ffmpeg fftw headless jack jemalloc jpeg2k \
man ndof nls openal opencl openimageio openmp opensubdiv \
openvdb osl sdl sndfile standalone test tiff valgrind"
RESTRICT="!test? ( test )"
@@ -30,15 +32,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
cycles? ( openexr tiff openimageio )
- elbeem? ( tbb )
+ fluid? ( tbb )
opencl? ( cycles )
- openvdb? (
- ^^ ( abi6-compat abi7-compat )
- tbb
- )
- osl? ( cycles llvm )
- standalone? ( cycles )"
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: f5e0466a72f3a02b8d8729f373f70b0067a3556c
Author: Sam James gentoo org>
AuthorDate: Sun Nov 8 10:40:14 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 8 10:42:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e0466a
media-gfx/blender: cleanup old
Closes: https://bugs.gentoo.org/735590
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-2.79b-r3.ebuild | 298 -
.../files/blender-2.79b-ffmpeg-4-compat.patch | 62 -
79b-fix-for-gcc9-new-openmp-data-sharing.patch | 31 ---
.../files/blender-2.79b-fix-opencollada.patch | 112
media-gfx/blender/files/blender-2.79b-gcc-8.patch | 22 --
.../blender/files/blender-fix-install-rules.patch | 16 --
media-gfx/blender/metadata.xml | 6 -
8 files changed, 548 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 6ac6b01289b..5f4b3e32e53 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,2 @@
-DIST blender-2.79b.tar.gz 50204270 BLAKE2B
78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0
SHA512
2db21ace446168dd683cdb5aad9dec001fae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
DIST blender-2.83.4.tar.xz 38528352 BLAKE2B
54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d
SHA512
061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
DIST blender-2.90.1.tar.xz 38836408 BLAKE2B
42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34
SHA512
e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
diff --git a/media-gfx/blender/blender-2.79b-r3.ebuild
b/media-gfx/blender/blender-2.79b-r3.ebuild
deleted file mode 100644
index 9d41808c300..000
--- a/media-gfx/blender/blender-2.79b-r3.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit check-reqs cmake-utils flag-o-matic xdg-utils \
- pax-utils python-single-r1 toolchain-funcs eapi7-ver
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-SRC_URI="https://download.blender.org/source/${P}.tar.gz;
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
- cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
- llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
- osl player sdl sndfile test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- opencl? ( cycles )
- osl? ( cycles llvm )
- player? ( game-engine !headless )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/boost-1.62:=[nls?,threads(+)]
- dev-libs/lzo:2
- $(python_gen_cond_dep '
- >=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- ')
- media-libs/freetype
- media-libs/glew:*
- media-libs/libpng:0=
- media-libs/libsamplerate
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0=
- virtual/libintl
- virtual/opengl
- collada? ( >=media-libs/opencollada-1.6.18:= )
- color-management? ( media-libs/opencolorio )
- cuda? ( dev-util/nvidia-cuda-toolkit:= )
- ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
- fftw? ( sci-libs/fftw:3.0= )
- !headless? (
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXxf86vm
- )
- jack? ( virtual/jack )
- jemalloc? ( dev-libs/jemalloc:= )
- jpeg2k? ( media-libs/openjpeg:0 )
- llvm? ( sys-devel/llvm:= )
- ndof? (
- app-misc/spacenavd
- dev-libs/libspnav
- )
- nls? ( virtual/libiconv )
- openal? ( media-libs/openal )
- opencl? ( virtual/opencl )
- openimageio? ( >=media-libs/openimageio-1.7.0:= )
- openexr? (
- >=media-libs/ilmbase-2.2.0:=
- >=media-libs/openexr-2.2.0:=
- )
- opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
- openvdb? (
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 5ffd98d291730cc22e4cbbc6e4ae717fbb17f282
Author: Adrian Grigo yahoo com au>
AuthorDate: Thu Aug 20 07:29:03 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 24 13:41:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffd98d2
media-gfx/blender: Blender with openvdb requires openvdb-7.0.0 only
Compiling blender with openvdb fails using openvdb-7.1.0, as
std::make_unique is not available in c++11. Upgrading to newer c++ was
discussed upstream and it was decided to remain with c++11 now, in
keeping with the VFX reference platform, and update to c++17 in 2021.
See https://developer.blender.org/T76783
Openvdb 7.0.0 uses c++11, whereas 7.1.0 uses c++14. So it will not
be possible to use versions 7.1.0 and above until blender updates to
c++14 or higher next year.
Signed-off-by: Adrian Grigo yahoo.com.au>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.79b-r2.ebuild | 4 ++--
media-gfx/blender/blender-2.83.4.ebuild | 2 +-
media-gfx/blender/files/blender-fix-install-rules.patch | 16
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild
b/media-gfx/blender/blender-2.79b-r2.ebuild
index 1b08a01395b..977f12110a6 100644
--- a/media-gfx/blender/blender-2.79b-r2.ebuild
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python3_6 )
-inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \
+inherit check-reqs cmake-utils flag-o-matic xdg-utils \
pax-utils python-single-r1 toolchain-funcs eapi7-ver
DESCRIPTION="3D Creation/Animation/Publishing System"
@@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
)
opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
openvdb? (
- media-gfx/openvdb[abi4-compat]
+ =dev-libs/c-blosc-1.5.2
)
diff --git a/media-gfx/blender/blender-2.83.4.ebuild
b/media-gfx/blender/blender-2.83.4.ebuild
index de3ba5896dc..b6e7cb00c60 100644
--- a/media-gfx/blender/blender-2.83.4.ebuild
+++ b/media-gfx/blender/blender-2.83.4.ebuild
@@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS}
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
openvdb? (
- >=media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+ ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
dev-cpp/tbb
dev-libs/c-blosc:=
)
diff --git a/media-gfx/blender/files/blender-fix-install-rules.patch
b/media-gfx/blender/files/blender-fix-install-rules.patch
new file mode 100644
index 000..e62aba814b9
--- /dev/null
+++ b/media-gfx/blender/files/blender-fix-install-rules.patch
@@ -0,0 +1,16 @@
+diff -purN a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+--- a/source/creator/CMakeLists.txt2016-09-28 10:26:55.0 +0100
b/source/creator/CMakeLists.txt2016-10-03 12:17:08.938928486 +0100
+@@ -328,12 +328,6 @@ endif()
+ # Install Targets (Generic, All Platforms)
+
+
+-# important to make a clean install each time, else old scripts get loaded.
+-install(
+- CODE
+- "file(REMOVE_RECURSE ${TARGETDIR_VER})"
+-)
+-
+ if(WITH_PYTHON)
+ # install(CODE "message(\"copying blender scripts...\")")
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: cca9b716491a91b496106a19df4e5f554b6a1717
Author: Adrian Grigo yahoo com au>
AuthorDate: Sat Aug 22 01:08:55 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 24 13:41:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca9b716
media-gfx/blender: Version bump to 2.83.4
Blender 2.83.4 works with python 3.7. It may compile with 3.8, but
blender only supports 3.7 officially as it follows the VFX Reference
Platform to ensure that user add ons are not broken in the process.
They plan to introduce 3.8 support in 2021.
New features include a new interface, the realtime eevee renderer,
and importing openvdb files created by other packages among others.
Game engine and Blender Player were removed in 2.80.
Bug fixes in this version are alembic support, upstream fixes for
opencollada, requiring openjpeg:2 to avoid security issues, and
mimeinfo cache is correctly updated. Where these issues remain in
blender 2.79b, the bug is linked but should be closed only when
blender 2.79b is removed.
On my system the docs do not currently compile,
and the polyfill2d test still fails like 2.79b.
Blender 2.83 support for draco, embree, oidn, usd and openxr is not yet
implemented pending development of ebuilds for these packages.
Signed-off-by: Adrian Grigo yahoo.com.au>
Bug: https://bugs.gentoo.org/667352
Bug: https://bugs.gentoo.org/735590
Bug: https://bugs.gentoo.org/718772
Closes: https://bugs.gentoo.org/737388
Closes: https://bugs.gentoo.org/689740
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-2.83.4.ebuild| 316 +
.../blender/files/blender-fix-install-rules.patch | 16 --
media-gfx/blender/metadata.xml | 22 ++
4 files changed, 339 insertions(+), 16 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 2a585f30d14..cbe57e4eec0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1 +1,2 @@
DIST blender-2.79b.tar.gz 50204270 BLAKE2B
78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0
SHA512
2db21ace446168dd683cdb5aad9dec001fae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
+DIST blender-2.83.4.tar.xz 38528352 BLAKE2B
54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d
SHA512
061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
diff --git a/media-gfx/blender/blender-2.83.4.ebuild
b/media-gfx/blender/blender-2.83.4.ebuild
new file mode 100644
index 000..de3ba5896dc
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.4.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+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;
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+ abi6-compat abi7-compat alembic collada color-management cuda cycles \
+ debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+ man ndof nls openal opencl openimageio openmp opensubdiv \
+ openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ alembic? ( openexr )
+ cuda? ( cycles )
+ cycles? ( openexr tiff openimageio )
+ elbeem? ( tbb )
+ opencl? ( cycles )
+ openvdb? (
+ ^^ ( abi6-compat abi7-compat )
+ tbb
+ )
+ osl? ( cycles llvm )
+ standalone? ( cycles )"
+
+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}]
+ ')
+ 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.7.12[boost(+),hdf(+)] )
+ collada? ( >=media-libs/opencollada-1.6.68 )
+ color-management? ( media-libs/opencolorio )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ ffmpeg? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: fce2bae92fc72196e82a236c2ae3d290910c23b6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 6 21:20:33 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 6 21:21:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce2bae9
media-gfx/blender: Drop 2.79 and 2.79-r1
No one explained why keep it, so drop it.
Closes: https://bugs.gentoo.org/606406
Closes: https://bugs.gentoo.org/659498
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-2.79-r1.ebuild | 290 -
media-gfx/blender/blender-2.79.ebuild | 287
.../blender-2.79-fix-build-with-OSL-1.9.x.patch| 26 --
4 files changed, 604 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1255e093b89..2a585f30d14 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1 @@
-DIST blender-2.79.tar.gz 50145270 BLAKE2B
5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338
SHA512
9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
DIST blender-2.79b.tar.gz 50204270 BLAKE2B
78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0
SHA512
2db21ace446168dd683cdb5aad9dec001fae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
diff --git a/media-gfx/blender/blender-2.79-r1.ebuild
b/media-gfx/blender/blender-2.79-r1.ebuild
deleted file mode 100644
index 2db487bd238..000
--- a/media-gfx/blender/blender-2.79-r1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
- pax-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-SRC_URI="https://download.blender.org/source/${P}.tar.gz;
-
-# Blender can have letters in the version string,
-# so strip of the letter if it exists.
-MY_PV="$(get_version_component_range 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
- cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
- llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
- osl player sdl sndfile test tiff valgrind"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- player? ( game-engine !headless )
- cuda? ( cycles )
- cycles? ( openexr tiff openimageio )
- opencl? ( cycles )
- osl? ( cycles llvm )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/boost-1.62:=[nls?,threads(+)]
- dev-libs/lzo:2
- >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- media-libs/freetype
- media-libs/glew:*
- media-libs/libpng:0=
- media-libs/libsamplerate
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0=
- virtual/libintl
- virtual/opengl
- collada? ( >=media-libs/opencollada-1.6.18:= )
- colorio? ( media-libs/opencolorio )
- cuda? ( dev-util/nvidia-cuda-toolkit:= )
- ffmpeg? ( =media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
- fftw? ( sci-libs/fftw:3.0= )
- !headless? (
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXxf86vm
- )
- jack? ( virtual/jack )
- jemalloc? ( dev-libs/jemalloc:= )
- jpeg2k? ( media-libs/openjpeg:0 )
- llvm? ( sys-devel/llvm:= )
- ndof? (
- app-misc/spacenavd
- dev-libs/libspnav
- )
- nls? ( virtual/libiconv )
- openal? ( media-libs/openal )
- opencl? ( virtual/opencl )
- openimageio? ( >=media-libs/openimageio-1.7.0 )
- openexr? (
- >=media-libs/ilmbase-2.2.0:=
- >=media-libs/openexr-2.2.0:=
- )
- opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
- openvdb? (
- =dev-libs/c-blosc-1.5.2
- )
- osl? ( media-libs/osl:= )
- sdl? ( media-libs/libsdl2[sound,joystick] )
- sndfile? ( media-libs/libsndfile )
- tiff? ( media-libs/tiff:0 )
- valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-cpp/eigen-3.2.8:3
- nls? ( sys-devel/gettext )
- doc? (
- app-doc/doxygen[-nodot(-),dot(+),latex]
- dev-python/sphinx[latex]
- )"
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 40d74c39f382e84086c763a23e1b63ef3427714e
Author: Michał Górny gentoo org>
AuthorDate: Thu Mar 21 15:21:43 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Mar 21 18:01:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d74c39
media-gfx/blender: Drop 2.72b-r4, due to py3.4 removal
Signed-off-by: Michał Górny gentoo.org>
media-gfx/blender/Manifest | 1 -
media-gfx/blender/blender-2.72b-r4.ebuild | 290 -
.../blender/files/blender-2.68-doxyfile.patch | 19 --
.../files/blender-2.68-fix-install-rules.patch | 26 --
media-gfx/blender/files/blender-2.70-sse2.patch| 35 ---
media-gfx/blender/files/blender-2.72-T42797.diff | 13 -
.../files/blender-2.72b-fix-util_simd.patch| 10 -
.../blender/files/blender-2.72b-gcc6-fixes.patch | 126 -
media-gfx/blender/metadata.xml | 34 +--
9 files changed, 12 insertions(+), 542 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 42826ca0c67..1255e093b89 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,2 @@
-DIST blender-2.72b.tar.gz 52018242 BLAKE2B
fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9
SHA512
9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
DIST blender-2.79.tar.gz 50145270 BLAKE2B
5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338
SHA512
9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
DIST blender-2.79b.tar.gz 50204270 BLAKE2B
78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0
SHA512
2db21ace446168dd683cdb5aad9dec001fae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild
b/media-gfx/blender/blender-2.72b-r4.ebuild
deleted file mode 100644
index 9d68984d4e3..000
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## BUNDLED-DEPS:
-# extern/cuew
-# extern/Eigen3
-# extern/xdnd
-# extern/carve
-# extern/glew
-# extern/libmv
-# extern/clew
-# extern/colamd
-# extern/lzma
-# extern/gtest
-# extern/rangetree
-# extern/libredcode
-# extern/wcwidth
-# extern/binreloc
-# extern/recastnavigation
-# extern/bullet2
-# extern/lzo
-# extern/libopenjpeg
-# extern/libmv/third_party/msinttypes
-# extern/libmv/third_party/ceres
-# extern/libmv/third_party/gflags
-# extern/libmv/third_party/glog
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-#PATCHSET="1"
-
-inherit multilib gnome2-utils cmake-utils eutils python-single-r1 versionator
flag-o-matic toolchain-funcs pax-utils check-reqs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-case ${PV} in
- *_p*)
- SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz; ;;
- *)
- SRC_URI="https://download.blender.org/source/${P}.tar.gz; ;;
-esac
-
-if [[ -n ${PATCHSET} ]]; then
- SRC_URI+="
https://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz;
-fi
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 x86"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw
+game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp
+openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- player? ( game-engine )
- redcode? ( jpeg2k ffmpeg )
- cycles? ( boost openexr tiff )
- nls? ( boost )
- colorio? ( boost )
- openal? ( boost )
- game-engine? ( boost )
- ?? ( ffmpeg libav )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=media-libs/freetype-2.0:2
- media-libs/glew:0=
- media-libs/libpng:0
- media-libs/libsamplerate
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/libintl
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXxf86vm
- boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
- collada? ( >=media-libs/opencollada-1.6.18 )
- colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
- cycles? (
- media-libs/openimageio
- )
- ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] )
- libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] )
- fftw? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: b58e0ed989f4fcc06d535692214584bf79247ec2
Author: Jonathan Scruggs gentoo org>
AuthorDate: Thu Aug 16 14:15:07 2018 +
Commit: Jonathan Scruggs gentoo org>
CommitDate: Thu Aug 16 14:15:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58e0ed9
media-gfx/blender: add ffmpeg 4 compatibility patch
Package-Manager: Portage-2.3.44, Repoman-2.3.10
media-gfx/blender/blender-2.79b.ebuild | 1 +
.../files/blender-2.79b-ffmpeg-4-compat.patch | 62 ++
2 files changed, 63 insertions(+)
diff --git a/media-gfx/blender/blender-2.79b.ebuild
b/media-gfx/blender/blender-2.79b.ebuild
index 4dc6dd61ee6..be1c95be0e8 100644
--- a/media-gfx/blender/blender-2.79b.ebuild
+++ b/media-gfx/blender/blender-2.79b.ebuild
@@ -97,6 +97,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-fix-install-rules.patch"
"${FILESDIR}/${P}-gcc-8.patch"
+ "${FILESDIR}/${P}-ffmpeg-4-compat.patch"
)
blender_check_requirements() {
diff --git a/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
new file mode 100644
index 000..4ad05aafb15
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
@@ -0,0 +1,62 @@
+diff -urN a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
+--- a/intern/ffmpeg/ffmpeg_compat.h2018-03-23 15:22:25.0 +
b/intern/ffmpeg/ffmpeg_compat.h2018-08-16 14:39:23.484489828 +0100
+@@ -109,6 +109,45 @@
+
+ #endif
+
++/* XXX TODO Probably fix to correct modern flags in code? Not sure how old
FFMPEG we want to support though,
++ * so for now this will do. */
++
++#ifndef FF_MIN_BUFFER_SIZE
++# ifdef AV_INPUT_BUFFER_MIN_SIZE
++#define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
++# endif
++#endif
++
++#ifndef FF_INPUT_BUFFER_PADDING_SIZE
++# ifdef AV_INPUT_BUFFER_PADDING_SIZE
++#define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
++# endif
++#endif
++
++#ifndef CODEC_FLAG_GLOBAL_HEADER
++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER
++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
++# endif
++#endif
++
++#ifndef CODEC_FLAG_GLOBAL_HEADER
++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER
++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
++# endif
++#endif
++
++#ifndef CODEC_FLAG_INTERLACED_DCT
++# ifdef AV_CODEC_FLAG_INTERLACED_DCT
++#define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT
++# endif
++#endif
++
++#ifndef CODEC_FLAG_INTERLACED_ME
++# ifdef AV_CODEC_FLAG_INTERLACED_ME
++#define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME
++# endif
++#endif
++
+ /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */
+ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100)
+ # define AV_CODEC_ID_NONE CODEC_ID_NONE
+diff -urN a/source/blender/blenkernel/intern/writeffmpeg.c
b/source/blender/blenkernel/intern/writeffmpeg.c
+--- a/source/blender/blenkernel/intern/writeffmpeg.c 2018-03-23
15:22:25.0 +
b/source/blender/blenkernel/intern/writeffmpeg.c 2018-08-16
14:39:21.702484751 +0100
+@@ -605,7 +605,8 @@
+ c->rc_buffer_aggressivity = 1.0;
+ #endif
+
+- c->me_method = ME_EPZS;
++ /* Deprecated and not doing anything since July 2015, deleted in recent
ffmpeg */
++ //c->me_method = ME_EPZS;
+
+ codec = avcodec_find_encoder(c->codec_id);
+ if (!codec)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: cb021f3026afbe8c0acf42de427b209b72e69dc3
Author: Jonathan Scruggs gmail com>
AuthorDate: Sat Oct 22 17:24:28 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Oct 22 23:25:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb021f30
media-gfx/blender: version bump to 2.78
- Switch to EAPI 6
- Added OpenSubDiv support
- Added OpenVDB support
- Fix doc building with binary drivers
- Add warning about directories not tracked by portage
Gentoo-Bug: 536078
Signed off by: Jonathan Scruggs (j.scruggs gmail.com, irc: Dracwyrm)
Signed off by: Adrian Grigo (agrigo2001 yahoo.com.au)
Closes: https://github.com/gentoo/gentoo/pull/2531
Signed-off-by: David Seifert gentoo.org>
media-gfx/blender/Manifest | 1 +
media-gfx/blender/blender-2.78.ebuild | 302 +
.../files/blender-2.78-C++11-build-fix.patch | 11 +
.../blender/files/blender-fix-install-rules.patch | 16 ++
media-gfx/blender/metadata.xml | 85 --
5 files changed, 391 insertions(+), 24 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 17ebd48..666ec08 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1 +1,2 @@
DIST blender-2.72b.tar.gz 52018242 SHA256
4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47 SHA512
9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
WHIRLPOOL
3687255bc9f4195b25b66a75630676ee15e67cf10a058dca11b3472617b54aae2bebb1810cc16e19c58ca1c09b1ea8b70f72e30c05632ab0bae8910925a37a54
+DIST blender-2.78.tar.gz 44489809 SHA256
17863e1ccb3bfdcc932d37cf9e525318130064c756cfb92a9ab479780d3ed441 SHA512
9144ce28377271dafe973b59721da41b6e3954736c705e1540be8dba3124e4c32e5cce5fb3ef7158505d45401478d257720350b38fa8e8649cc35cbd28a2f978
WHIRLPOOL
a1a70cb723a111d1ae5a33b274a0e23bbd9c1b0777f96c917da1b4854171a88b6abe64c0636613008de68e68200a1d387e940ee592ff87c225745c668508d896
diff --git a/media-gfx/blender/blender-2.78.ebuild
b/media-gfx/blender/blender-2.78.ebuild
new file mode 100644
index ..568dadc
--- /dev/null
+++ b/media-gfx/blender/blender-2.78.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_5 )
+
+inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \
+ pax-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org;
+
+SRC_URI="http://download.blender.org/source/${P}.tar.gz;
+
+# Blender can have letters in the version string,
+# so strip of the letter if it exists.
+MY_PV="$(get_version_component_range 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \
+ cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+ llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+ openvdb-compression player sdl sndfile test tiff valgrind"
+
+# OpenCL and nVidia performance is rubbish with Blender
+# If you have nVidia, use CUDA.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ player? ( game-engine !headless )
+ cuda? ( cycles !opencl )
+ cycles? ( boost openexr tiff openimageio )
+ colorio? ( boost )
+ openvdb? ( boost )
+ opensubdiv? ( cuda )
+ nls? ( boost )
+ openal? ( boost )
+ opencl? ( cycles )
+ game-engine? ( boost )
+ ?? ( ffmpeg libav )"
+
+# Since not using OpenCL with nVidia, depend on ATI binary
+# blobs as Cycles with OpenCL does not work with any open
+# source drivers.
+COMMON_DEPEND="
+ boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] )
+ collada? ( >=media-libs/opencollada-1.6.18:= )
+ colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
+ cuda? ( dev-util/nvidia-cuda-toolkit:= )
+ ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+ libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+ fftw? ( sci-libs/fftw:3.0= )
+ !headless? (
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jemalloc? ( dev-libs/jemalloc:= )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ llvm? ( sys-devel/llvm )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( media-libs/openal )
+ openimageio? ( >=media-libs/openimageio-1.6.9 )
+ opencl? ( x11-drivers/ati-drivers:* )
+ openexr? (
+ >=media-libs/ilmbase-2.2.0:=
+ >=media-libs/openexr-2.2.0:=
+ )
+ opensubdiv? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 3259951943dda77ac2072c4079668c948537f82a
Author: Jonathan Scruggs gmail com>
AuthorDate: Thu Sep 22 17:26:26 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 29 15:12:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32599519
media-gfx/blender: add gcc-6 compile fix
Not doing a revision bump as this patch only affects compiling
with GCC 6.
- Remove one dependency as it's not even used at all
- Add patch that fixes compiling with GCC 6
Closes Gentoo-Bug: 594694
Signed off by Jonathan Scruggs (j.scruggs gmail.com, irc: Dracwyrm)
media-gfx/blender/blender-2.72b-r4.ebuild | 2 +-
.../blender/files/blender-2.72b-gcc6-fixes.patch | 126 +
2 files changed, 127 insertions(+), 1 deletion(-)
diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild
b/media-gfx/blender/blender-2.72b-r4.ebuild
index c0a7e4d..970b009 100644
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ b/media-gfx/blender/blender-2.72b-r4.ebuild
@@ -68,7 +68,6 @@ RDEPEND="
media-libs/glew
media-libs/libpng:0
media-libs/libsamplerate
- sci-libs/ldl
sys-libs/zlib
virtual/glu
virtual/jpeg:0
@@ -112,6 +111,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.70-sse2.patch
"${FILESDIR}"/${PN}-2.72-T42797.diff
"${FILESDIR}"/${P}-fix-util_simd.patch
+ "${FILESDIR}"/${P}-gcc6-fixes.patch
)
pkg_pretend() {
diff --git a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
new file mode 100644
index ..1c4ab09
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
@@ -0,0 +1,126 @@
+diff -purN a/source/blender/imbuf/intern/dds/ColorBlock.cpp
b/source/blender/imbuf/intern/dds/ColorBlock.cpp
+--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp 2014-10-20
08:58:23.0 +0100
b/source/blender/imbuf/intern/dds/ColorBlock.cpp 2016-09-22
15:50:25.359318967 +0100
+@@ -86,8 +86,8 @@ void ColorBlock::init(const Image *img,
+
+ void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y)
+ {
+- const uint bw = min(w - x, 4U);
+- const uint bh = min(h - y, 4U);
++ const uint bw = MIN(w - x, 4U);
++ const uint bh = MIN(h - y, 4U);
+
+ // Blocks that are smaller than 4x4 are handled by repeating the pixels.
+ // @@ Thats only correct when block size is 1, 2 or 4, but not with 3.
:(
+@@ -107,8 +107,8 @@ void ColorBlock::init(uint w, uint h, co
+
+ void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y)
+ {
+- const uint bw = min(w - x, 4U);
+- const uint bh = min(h - y, 4U);
++ const uint bw = MIN(w - x, 4U);
++ const uint bh = MIN(h - y, 4U);
+
+ // Blocks that are smaller than 4x4 are handled by repeating the pixels.
+ // @@ Thats only correct when block size is 1, 2 or 4, but not with 3.
:(
+@@ -124,10 +124,10 @@ void ColorBlock::init(uint w, uint h, co
+ const uint idx = ((y + by) * w + x + bx);
+
+ Color32 & c = color(e, i);
+- c.r = uint8(255 * clamp(data[idx + 0 * srcPlane], 0.0f,
1.0f)); // @@ Is this the right way to quantize floats to bytes?
+- c.g = uint8(255 * clamp(data[idx + 1 * srcPlane], 0.0f,
1.0f));
+- c.b = uint8(255 * clamp(data[idx + 2 * srcPlane], 0.0f,
1.0f));
+- c.a = uint8(255 * clamp(data[idx + 3 * srcPlane], 0.0f,
1.0f));
++ c.r = uint8(255 * CLAMP(data[idx + 0 * srcPlane], 0.0f,
1.0f)); // @@ Is this the right way to quantize floats to bytes?
++ c.g = uint8(255 * CLAMP(data[idx + 1 * srcPlane], 0.0f,
1.0f));
++ c.b = uint8(255 * CLAMP(data[idx + 2 * srcPlane], 0.0f,
1.0f));
++ c.a = uint8(255 * CLAMP(data[idx + 3 * srcPlane], 0.0f,
1.0f));
+ }
+ }
+ }
+diff -purN a/source/blender/imbuf/intern/dds/Common.h
b/source/blender/imbuf/intern/dds/Common.h
+--- a/source/blender/imbuf/intern/dds/Common.h 2014-10-20 08:58:23.0
+0100
b/source/blender/imbuf/intern/dds/Common.h 2016-09-22 15:47:31.327081239
+0100
+@@ -28,14 +28,14 @@
+ #ifndef __COMMON_H__
+ #define __COMMON_H__
+
+-#ifndef min
+-#define min(a,b) ((a) <= (b) ? (a) : (b))
++#ifndef MIN
++#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+ #endif
+-#ifndef max
+-#define max(a,b) ((a) >= (b) ? (a) : (b))
++#ifndef MAX
++#define MAX(a,b) ((a) >= (b) ? (a) : (b))
+ #endif
+-#ifndef clamp
+-#define clamp(x,a,b) min(max((x), (a)), (b))
++#ifndef CLAMP
++#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b))
+ #endif
+
+ template
+diff -purN a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp2014-10-20
08:58:23.0 +0100
