| 1 |
commit: f9c55a242ac6e8da55f8788d4470c0f30c918a0a |
| 2 |
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu May 19 12:42:08 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 20 11:25:12 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c55a24 |
| 7 |
|
| 8 |
media-gfx/blender: Remove option to build standalone cycles binary |
| 9 |
|
| 10 |
After talking to upstream, it seems like this option is not meant to be |
| 11 |
use to ship any binaries. It is simply there as an example cycles |
| 12 |
project that developers can easily modify if they want to quickly code |
| 13 |
in new features and test them in cycles (without having to go through |
| 14 |
blender). |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/828880 |
| 17 |
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/25288 |
| 19 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 20 |
|
| 21 |
media-gfx/blender/blender-2.93.9.ebuild | 11 +++-------- |
| 22 |
media-gfx/blender/blender-3.0.1-r5.ebuild | 11 +++-------- |
| 23 |
media-gfx/blender/blender-3.1.2.ebuild | 11 +++-------- |
| 24 |
media-gfx/blender/blender-9999.ebuild | 11 +++-------- |
| 25 |
4 files changed, 12 insertions(+), 32 deletions(-) |
| 26 |
|
| 27 |
diff --git a/media-gfx/blender/blender-2.93.9.ebuild b/media-gfx/blender/blender-2.93.9.ebuild |
| 28 |
index 09756af2d9f6..3edcc6cd0ab1 100644 |
| 29 |
--- a/media-gfx/blender/blender-2.93.9.ebuild |
| 30 |
+++ b/media-gfx/blender/blender-2.93.9.ebuild |
| 31 |
@@ -29,7 +29,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 32 |
alembic collada +color-management cuda +cycles \ |
| 33 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 34 |
man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \ |
| 35 |
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" |
| 36 |
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" |
| 37 |
RESTRICT="!test? ( test )" |
| 38 |
|
| 39 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 40 |
@@ -40,7 +40,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 41 |
opencl? ( cycles ) |
| 42 |
openvdb? ( tbb ) |
| 43 |
osl? ( cycles ) |
| 44 |
- standalone? ( cycles ) |
| 45 |
test? ( color-management )" |
| 46 |
|
| 47 |
# Library versions for official builds can be found in the blender source directory in: |
| 48 |
@@ -227,8 +226,8 @@ src_configure() { |
| 49 |
-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) |
| 50 |
-DWITH_CYCLES_EMBREE=$(usex embree) |
| 51 |
-DWITH_CYCLES_OSL=$(usex osl) |
| 52 |
- -DWITH_CYCLES_STANDALONE=$(usex standalone) |
| 53 |
- -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) |
| 54 |
+ -DWITH_CYCLES_STANDALONE=OFF |
| 55 |
+ -DWITH_CYCLES_STANDALONE_GUI=OFF |
| 56 |
-DWITH_DOC_MANPAGE=$(usex man) |
| 57 |
-DWITH_FFTW3=$(usex fftw) |
| 58 |
-DWITH_GMP=$(usex gmp) |
| 59 |
@@ -308,10 +307,6 @@ src_install() { |
| 60 |
# Pax mark blender for hardened support. |
| 61 |
pax-mark m "${BUILD_DIR}"/bin/blender |
| 62 |
|
| 63 |
- if use standalone; then |
| 64 |
- dobin "${BUILD_DIR}"/bin/cycles |
| 65 |
- fi |
| 66 |
- |
| 67 |
cmake_src_install |
| 68 |
|
| 69 |
if use man; then |
| 70 |
|
| 71 |
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild b/media-gfx/blender/blender-3.0.1-r5.ebuild |
| 72 |
index 38945f3726a3..9ed2565bb8b7 100644 |
| 73 |
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild |
| 74 |
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild |
| 75 |
@@ -30,7 +30,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 76 |
alembic collada +color-management cuda +cycles \ |
| 77 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 78 |
man ndof nls openal +oidn +openimageio +openmp +opensubdiv \ |
| 79 |
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" |
| 80 |
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" |
| 81 |
RESTRICT="!test? ( test )" |
| 82 |
|
| 83 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 84 |
@@ -40,7 +40,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 85 |
fluid? ( tbb ) |
| 86 |
openvdb? ( tbb ) |
| 87 |
osl? ( cycles ) |
| 88 |
- standalone? ( cycles ) |
| 89 |
test? ( color-management )" |
| 90 |
|
| 91 |
# Library versions for official builds can be found in the blender source directory in: |
| 92 |
@@ -229,8 +228,8 @@ src_configure() { |
| 93 |
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) |
| 94 |
-DWITH_CYCLES_EMBREE=$(usex embree) |
| 95 |
-DWITH_CYCLES_OSL=$(usex osl) |
| 96 |
- -DWITH_CYCLES_STANDALONE=$(usex standalone) |
| 97 |
- -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) |
| 98 |
+ -DWITH_CYCLES_STANDALONE=OFF |
| 99 |
+ -DWITH_CYCLES_STANDALONE_GUI=OFF |
| 100 |
-DWITH_DOC_MANPAGE=$(usex man) |
| 101 |
-DWITH_FFTW3=$(usex fftw) |
| 102 |
-DWITH_GMP=$(usex gmp) |
| 103 |
@@ -316,10 +315,6 @@ src_install() { |
| 104 |
# Pax mark blender for hardened support. |
| 105 |
pax-mark m "${BUILD_DIR}"/bin/blender |
| 106 |
|
| 107 |
- if use standalone; then |
| 108 |
- dobin "${BUILD_DIR}"/bin/cycles |
| 109 |
- fi |
| 110 |
- |
| 111 |
cmake_src_install |
| 112 |
|
| 113 |
if use man; then |
| 114 |
|
| 115 |
diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild |
| 116 |
index 2d10adc94e81..59c402ad800b 100644 |
| 117 |
--- a/media-gfx/blender/blender-3.1.2.ebuild |
| 118 |
+++ b/media-gfx/blender/blender-3.1.2.ebuild |
| 119 |
@@ -28,7 +28,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 120 |
alembic collada +color-management cuda +cycles \ |
| 121 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 122 |
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ |
| 123 |
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" |
| 124 |
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" |
| 125 |
RESTRICT="!test? ( test )" |
| 126 |
|
| 127 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 128 |
@@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 129 |
fluid? ( tbb ) |
| 130 |
openvdb? ( tbb ) |
| 131 |
osl? ( cycles ) |
| 132 |
- standalone? ( cycles ) |
| 133 |
test? ( color-management )" |
| 134 |
|
| 135 |
# Library versions for official builds can be found in the blender source directory in: |
| 136 |
@@ -220,8 +219,8 @@ src_configure() { |
| 137 |
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) |
| 138 |
-DWITH_CYCLES_EMBREE=$(usex embree) |
| 139 |
-DWITH_CYCLES_OSL=$(usex osl) |
| 140 |
- -DWITH_CYCLES_STANDALONE=$(usex standalone) |
| 141 |
- -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) |
| 142 |
+ -DWITH_CYCLES_STANDALONE=OFF |
| 143 |
+ -DWITH_CYCLES_STANDALONE_GUI=OFF |
| 144 |
-DWITH_DOC_MANPAGE=$(usex man) |
| 145 |
-DWITH_FFTW3=$(usex fftw) |
| 146 |
-DWITH_GMP=$(usex gmp) |
| 147 |
@@ -307,10 +306,6 @@ src_install() { |
| 148 |
# Pax mark blender for hardened support. |
| 149 |
pax-mark m "${BUILD_DIR}"/bin/blender |
| 150 |
|
| 151 |
- if use standalone; then |
| 152 |
- dobin "${BUILD_DIR}"/bin/cycles |
| 153 |
- fi |
| 154 |
- |
| 155 |
cmake_src_install |
| 156 |
|
| 157 |
if use man; then |
| 158 |
|
| 159 |
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild |
| 160 |
index edfe76bbcf82..88c413e69eca 100644 |
| 161 |
--- a/media-gfx/blender/blender-9999.ebuild |
| 162 |
+++ b/media-gfx/blender/blender-9999.ebuild |
| 163 |
@@ -28,7 +28,7 @@ IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 164 |
alembic collada +color-management cuda +cycles \ |
| 165 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 166 |
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ |
| 167 |
- +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" |
| 168 |
+ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff valgrind" |
| 169 |
RESTRICT="!test? ( test )" |
| 170 |
|
| 171 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 172 |
@@ -38,7 +38,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 173 |
fluid? ( tbb ) |
| 174 |
openvdb? ( tbb ) |
| 175 |
osl? ( cycles ) |
| 176 |
- standalone? ( cycles ) |
| 177 |
test? ( color-management )" |
| 178 |
|
| 179 |
# Library versions for official builds can be found in the blender source directory in: |
| 180 |
@@ -220,8 +219,8 @@ src_configure() { |
| 181 |
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) |
| 182 |
-DWITH_CYCLES_EMBREE=$(usex embree) |
| 183 |
-DWITH_CYCLES_OSL=$(usex osl) |
| 184 |
- -DWITH_CYCLES_STANDALONE=$(usex standalone) |
| 185 |
- -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) |
| 186 |
+ -DWITH_CYCLES_STANDALONE=OFF |
| 187 |
+ -DWITH_CYCLES_STANDALONE_GUI=OFF |
| 188 |
-DWITH_DOC_MANPAGE=$(usex man) |
| 189 |
-DWITH_FFTW3=$(usex fftw) |
| 190 |
-DWITH_GMP=$(usex gmp) |
| 191 |
@@ -307,10 +306,6 @@ src_install() { |
| 192 |
# Pax mark blender for hardened support. |
| 193 |
pax-mark m "${BUILD_DIR}"/bin/blender |
| 194 |
|
| 195 |
- if use standalone; then |
| 196 |
- dobin "${BUILD_DIR}"/bin/cycles |
| 197 |
- fi |
| 198 |
- |
| 199 |
cmake_src_install |
| 200 |
|
| 201 |
if use man; then |
Archives