| 1 |
commit: 614da1945ab67eeca2fe180ab70514c14c4dec29 |
| 2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 27 18:01:47 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 28 13:47:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614da194 |
| 7 |
|
| 8 |
media-gfx/blender: Fix install phase when using ninja |
| 9 |
|
| 10 |
Fixed the install phase when using ninja by calling |
| 11 |
cmake-utils_src_install instead of emake directly |
| 12 |
|
| 13 |
Removed OpenCL support since it was only supported by the binary |
| 14 |
ATI/AMD drivers which are masked for removal. |
| 15 |
|
| 16 |
Also cleaned up addpredict calls |
| 17 |
|
| 18 |
Signed-off by: Jonathan Scruggs (j.scruggs <AT> gmail.com) |
| 19 |
Closes: https://github.com/gentoo/gentoo/pull/3683 |
| 20 |
|
| 21 |
media-gfx/blender/blender-2.78-r1.ebuild | 19 ++++++++----------- |
| 22 |
media-gfx/blender/blender-2.78a-r1.ebuild | 19 ++++++++----------- |
| 23 |
2 files changed, 16 insertions(+), 22 deletions(-) |
| 24 |
|
| 25 |
diff --git a/media-gfx/blender/blender-2.78-r1.ebuild b/media-gfx/blender/blender-2.78-r1.ebuild |
| 26 |
index 6ee5c38..2517910 100644 |
| 27 |
--- a/media-gfx/blender/blender-2.78-r1.ebuild |
| 28 |
+++ b/media-gfx/blender/blender-2.78-r1.ebuild |
| 29 |
@@ -22,21 +22,20 @@ LICENSE="|| ( GPL-2 BL )" |
| 30 |
KEYWORDS="~amd64 ~x86" |
| 31 |
IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \ |
| 32 |
cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ |
| 33 |
- llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ |
| 34 |
+ llvm man ndof nls openal openimageio openmp opensubdiv openvdb \ |
| 35 |
player sdl sndfile test tiff valgrind" |
| 36 |
|
| 37 |
# OpenCL and nVidia performance is rubbish with Blender |
| 38 |
# If you have nVidia, use CUDA. |
| 39 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 40 |
player? ( game-engine !headless ) |
| 41 |
- cuda? ( cycles !opencl ) |
| 42 |
+ cuda? ( cycles ) |
| 43 |
cycles? ( boost openexr tiff openimageio ) |
| 44 |
colorio? ( boost ) |
| 45 |
openvdb? ( boost ) |
| 46 |
opensubdiv? ( cuda ) |
| 47 |
nls? ( boost ) |
| 48 |
openal? ( boost ) |
| 49 |
- opencl? ( cycles ) |
| 50 |
game-engine? ( boost ) |
| 51 |
?? ( ffmpeg libav )" |
| 52 |
|
| 53 |
@@ -79,12 +78,11 @@ RDEPEND="${PYTHON_DEPS} |
| 54 |
nls? ( virtual/libiconv ) |
| 55 |
openal? ( media-libs/openal ) |
| 56 |
openimageio? ( >=media-libs/openimageio-1.6.9 ) |
| 57 |
- opencl? ( x11-drivers/ati-drivers:* ) |
| 58 |
openexr? ( |
| 59 |
>=media-libs/ilmbase-2.2.0:= |
| 60 |
>=media-libs/openexr-2.2.0:= |
| 61 |
) |
| 62 |
- opensubdiv? ( media-libs/opensubdiv[cuda=,opencl=] ) |
| 63 |
+ opensubdiv? ( media-libs/opensubdiv[cuda=] ) |
| 64 |
openvdb? ( |
| 65 |
media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] |
| 66 |
dev-cpp/tbb |
| 67 |
@@ -185,8 +183,8 @@ src_configure() { |
| 68 |
-DWITH_MOD_FLUID=$(usex elbeem) |
| 69 |
-DWITH_MOD_OCEANSIM=$(usex fftw) |
| 70 |
-DWITH_OPENAL=$(usex openal) |
| 71 |
- -DWITH_OPENCL=$(usex opencl) |
| 72 |
- -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl TRUE FALSE) |
| 73 |
+ -DWITH_OPENCL=OFF |
| 74 |
+ -DWITH_CYCLES_DEVICE_OPENCL=OFF |
| 75 |
-DWITH_OPENCOLORIO=$(usex colorio) |
| 76 |
-DWITH_OPENCOLLADA=$(usex collada) |
| 77 |
-DWITH_OPENIMAGEIO=$(usex openimageio) |
| 78 |
@@ -211,9 +209,8 @@ src_compile() { |
| 79 |
|
| 80 |
if use doc; then |
| 81 |
# Workaround for binary drivers. |
| 82 |
- local card |
| 83 |
- local cards=( /dev/ati/card* /dev/nvidia* ) |
| 84 |
- for card in "${cards[@]}"; do addpredict "${card}"; done |
| 85 |
+ addpredict /dev/ati |
| 86 |
+ addpredict /dev/nvidiactl |
| 87 |
|
| 88 |
einfo "Generating Blender C/C++ API docs ..." |
| 89 |
cd "${CMAKE_USE_DIR}"/doc/doxygen || die |
| 90 |
@@ -252,7 +249,7 @@ src_install() { |
| 91 |
dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. |
| 92 |
fi |
| 93 |
|
| 94 |
- emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast |
| 95 |
+ cmake-utils_src_install |
| 96 |
|
| 97 |
# fix doc installdir |
| 98 |
docinto "html" |
| 99 |
|
| 100 |
diff --git a/media-gfx/blender/blender-2.78a-r1.ebuild b/media-gfx/blender/blender-2.78a-r1.ebuild |
| 101 |
index f0395fe..9d7afab 100644 |
| 102 |
--- a/media-gfx/blender/blender-2.78a-r1.ebuild |
| 103 |
+++ b/media-gfx/blender/blender-2.78a-r1.ebuild |
| 104 |
@@ -22,21 +22,20 @@ LICENSE="|| ( GPL-2 BL )" |
| 105 |
KEYWORDS="~amd64 ~x86" |
| 106 |
IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \ |
| 107 |
cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ |
| 108 |
- llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ |
| 109 |
+ llvm man ndof nls openal openimageio openmp opensubdiv openvdb \ |
| 110 |
player sdl sndfile test tiff valgrind" |
| 111 |
|
| 112 |
# OpenCL and nVidia performance is rubbish with Blender |
| 113 |
# If you have nVidia, use CUDA. |
| 114 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 115 |
player? ( game-engine !headless ) |
| 116 |
- cuda? ( cycles !opencl ) |
| 117 |
+ cuda? ( cycles ) |
| 118 |
cycles? ( boost openexr tiff openimageio ) |
| 119 |
colorio? ( boost ) |
| 120 |
openvdb? ( boost ) |
| 121 |
opensubdiv? ( cuda ) |
| 122 |
nls? ( boost ) |
| 123 |
openal? ( boost ) |
| 124 |
- opencl? ( cycles ) |
| 125 |
game-engine? ( boost ) |
| 126 |
?? ( ffmpeg libav )" |
| 127 |
|
| 128 |
@@ -79,12 +78,11 @@ RDEPEND="${PYTHON_DEPS} |
| 129 |
nls? ( virtual/libiconv ) |
| 130 |
openal? ( media-libs/openal ) |
| 131 |
openimageio? ( >=media-libs/openimageio-1.6.9 ) |
| 132 |
- opencl? ( x11-drivers/ati-drivers:* ) |
| 133 |
openexr? ( |
| 134 |
>=media-libs/ilmbase-2.2.0:= |
| 135 |
>=media-libs/openexr-2.2.0:= |
| 136 |
) |
| 137 |
- opensubdiv? ( media-libs/opensubdiv[cuda=,opencl=] ) |
| 138 |
+ opensubdiv? ( media-libs/opensubdiv[cuda=] ) |
| 139 |
openvdb? ( |
| 140 |
media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] |
| 141 |
dev-cpp/tbb |
| 142 |
@@ -184,8 +182,8 @@ src_configure() { |
| 143 |
-DWITH_MOD_FLUID=$(usex elbeem) |
| 144 |
-DWITH_MOD_OCEANSIM=$(usex fftw) |
| 145 |
-DWITH_OPENAL=$(usex openal) |
| 146 |
- -DWITH_OPENCL=$(usex opencl) |
| 147 |
- -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl TRUE FALSE) |
| 148 |
+ -DWITH_OPENCL=OFF |
| 149 |
+ -DWITH_CYCLES_DEVICE_OPENCL=OFF |
| 150 |
-DWITH_OPENCOLORIO=$(usex colorio) |
| 151 |
-DWITH_OPENCOLLADA=$(usex collada) |
| 152 |
-DWITH_OPENIMAGEIO=$(usex openimageio) |
| 153 |
@@ -210,9 +208,8 @@ src_compile() { |
| 154 |
|
| 155 |
if use doc; then |
| 156 |
# Workaround for binary drivers. |
| 157 |
- local card |
| 158 |
- local cards=( /dev/ati/card* /dev/nvidia* ) |
| 159 |
- for card in "${cards[@]}"; do addpredict "${card}"; done |
| 160 |
+ addpredict /dev/ati |
| 161 |
+ addpredict /dev/nvidiactl |
| 162 |
|
| 163 |
einfo "Generating Blender C/C++ API docs ..." |
| 164 |
cd "${CMAKE_USE_DIR}"/doc/doxygen || die |
| 165 |
@@ -251,7 +248,7 @@ src_install() { |
| 166 |
dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. |
| 167 |
fi |
| 168 |
|
| 169 |
- emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast |
| 170 |
+ cmake-utils_src_install |
| 171 |
|
| 172 |
# fix doc installdir |
| 173 |
docinto "html" |
Archives