| 1 |
commit: 5ffd98d291730cc22e4cbbc6e4ae717fbb17f282 |
| 2 |
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au> |
| 3 |
AuthorDate: Thu Aug 20 07:29:03 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 24 13:41:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffd98d2 |
| 7 |
|
| 8 |
media-gfx/blender: Blender with openvdb requires openvdb-7.0.0 only |
| 9 |
|
| 10 |
Compiling blender with openvdb fails using openvdb-7.1.0, as |
| 11 |
std::make_unique is not available in c++11. Upgrading to newer c++ was |
| 12 |
discussed upstream and it was decided to remain with c++11 now, in |
| 13 |
keeping with the VFX reference platform, and update to c++17 in 2021. |
| 14 |
|
| 15 |
See https://developer.blender.org/T76783 |
| 16 |
|
| 17 |
Openvdb 7.0.0 uses c++11, whereas 7.1.0 uses c++14. So it will not |
| 18 |
be possible to use versions 7.1.0 and above until blender updates to |
| 19 |
c++14 or higher next year. |
| 20 |
|
| 21 |
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au> |
| 22 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 23 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 24 |
|
| 25 |
media-gfx/blender/blender-2.79b-r2.ebuild | 4 ++-- |
| 26 |
media-gfx/blender/blender-2.83.4.ebuild | 2 +- |
| 27 |
media-gfx/blender/files/blender-fix-install-rules.patch | 16 ++++++++++++++++ |
| 28 |
3 files changed, 19 insertions(+), 3 deletions(-) |
| 29 |
|
| 30 |
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild |
| 31 |
index 1b08a01395b..977f12110a6 100644 |
| 32 |
--- a/media-gfx/blender/blender-2.79b-r2.ebuild |
| 33 |
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild |
| 34 |
@@ -5,7 +5,7 @@ EAPI=6 |
| 35 |
|
| 36 |
PYTHON_COMPAT=( python3_6 ) |
| 37 |
|
| 38 |
-inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \ |
| 39 |
+inherit check-reqs cmake-utils flag-o-matic xdg-utils \ |
| 40 |
pax-utils python-single-r1 toolchain-funcs eapi7-ver |
| 41 |
|
| 42 |
DESCRIPTION="3D Creation/Animation/Publishing System" |
| 43 |
@@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS} |
| 44 |
) |
| 45 |
opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) |
| 46 |
openvdb? ( |
| 47 |
- media-gfx/openvdb[abi4-compat] |
| 48 |
+ <media-gfx/openvdb-7[abi4-compat] |
| 49 |
dev-cpp/tbb |
| 50 |
>=dev-libs/c-blosc-1.5.2 |
| 51 |
) |
| 52 |
|
| 53 |
diff --git a/media-gfx/blender/blender-2.83.4.ebuild b/media-gfx/blender/blender-2.83.4.ebuild |
| 54 |
index de3ba5896dc..b6e7cb00c60 100644 |
| 55 |
--- a/media-gfx/blender/blender-2.83.4.ebuild |
| 56 |
+++ b/media-gfx/blender/blender-2.83.4.ebuild |
| 57 |
@@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS} |
| 58 |
) |
| 59 |
opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) |
| 60 |
openvdb? ( |
| 61 |
- >=media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] |
| 62 |
+ ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] |
| 63 |
dev-cpp/tbb |
| 64 |
dev-libs/c-blosc:= |
| 65 |
) |
| 66 |
|
| 67 |
diff --git a/media-gfx/blender/files/blender-fix-install-rules.patch b/media-gfx/blender/files/blender-fix-install-rules.patch |
| 68 |
new file mode 100644 |
| 69 |
index 00000000000..e62aba814b9 |
| 70 |
--- /dev/null |
| 71 |
+++ b/media-gfx/blender/files/blender-fix-install-rules.patch |
| 72 |
@@ -0,0 +1,16 @@ |
| 73 |
+diff -purN a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt |
| 74 |
+--- a/source/creator/CMakeLists.txt 2016-09-28 10:26:55.000000000 +0100 |
| 75 |
++++ b/source/creator/CMakeLists.txt 2016-10-03 12:17:08.938928486 +0100 |
| 76 |
+@@ -328,12 +328,6 @@ endif() |
| 77 |
+ # Install Targets (Generic, All Platforms) |
| 78 |
+ |
| 79 |
+ |
| 80 |
+-# important to make a clean install each time, else old scripts get loaded. |
| 81 |
+-install( |
| 82 |
+- CODE |
| 83 |
+- "file(REMOVE_RECURSE ${TARGETDIR_VER})" |
| 84 |
+-) |
| 85 |
+- |
| 86 |
+ if(WITH_PYTHON) |
| 87 |
+ # install(CODE "message(\"copying blender scripts...\")") |
| 88 |
+ |
Archives