| 1 |
commit: b3bbe52b38011538957c9ad1244427fecc4f9203 |
| 2 |
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 2 14:58:01 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=b3bbe52b |
| 7 |
|
| 8 |
media-gfx/blender: Update python useflags and deps |
| 9 |
|
| 10 |
Blender expects Cython to be installed even during runtime for use in |
| 11 |
python addons. |
| 12 |
|
| 13 |
In addition to this, it doesn't make too much sense for the Gentoo |
| 14 |
ebulid to expose the "WITH_SYSTEM_PYTHON" and the related switches. |
| 15 |
Those options are used to build easily distributed Blender packages that |
| 16 |
bundle python and the python dependecies. This can be used deploy |
| 17 |
Blender on systems were there is no way to easily easily pull in the |
| 18 |
required python version and libraries. |
| 19 |
|
| 20 |
However on Gentoo, we have a very good system for doing this ourselves |
| 21 |
with portage. |
| 22 |
|
| 23 |
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> |
| 24 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 25 |
|
| 26 |
media-gfx/blender/blender-3.0.1-r5.ebuild | 6 +++--- |
| 27 |
media-gfx/blender/blender-3.1.2.ebuild | 7 +++---- |
| 28 |
media-gfx/blender/blender-9999.ebuild | 6 +++--- |
| 29 |
3 files changed, 9 insertions(+), 10 deletions(-) |
| 30 |
|
| 31 |
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild b/media-gfx/blender/blender-3.0.1-r5.ebuild |
| 32 |
index f9c141963446..ef4995c93aa0 100644 |
| 33 |
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild |
| 34 |
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild |
| 35 |
@@ -26,7 +26,7 @@ fi |
| 36 |
|
| 37 |
SLOT="${PV%.*}" |
| 38 |
LICENSE="|| ( GPL-3 BL )" |
| 39 |
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ |
| 40 |
+IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 41 |
alembic collada +color-management cuda +cycles \ |
| 42 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 43 |
man ndof nls openal +oidn +openimageio +openmp +opensubdiv \ |
| 44 |
@@ -49,6 +49,7 @@ RDEPEND="${PYTHON_DEPS} |
| 45 |
dev-libs/boost:=[nls?,threads(+)] |
| 46 |
dev-libs/lzo:2= |
| 47 |
$(python_gen_cond_dep ' |
| 48 |
+ dev-python/cython[${PYTHON_USEDEP}] |
| 49 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 50 |
dev-python/requests[${PYTHON_USEDEP}] |
| 51 |
dev-python/zstandard[${PYTHON_USEDEP}] |
| 52 |
@@ -262,8 +263,7 @@ src_configure() { |
| 53 |
-DWITH_POTRACE=$(usex potrace) |
| 54 |
-DWITH_PUGIXML=$(usex pugixml) |
| 55 |
-DWITH_PULSEAUDIO=$(usex pulseaudio) |
| 56 |
- -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) |
| 57 |
- -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) |
| 58 |
+ -DWITH_PYTHON_INSTALL=OFF |
| 59 |
-DWITH_SDL=$(usex sdl) |
| 60 |
-DWITH_STATIC_LIBS=OFF |
| 61 |
-DWITH_SYSTEM_EIGEN3=ON |
| 62 |
|
| 63 |
diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild |
| 64 |
index 402d1ca0b796..cd1eca85cae5 100644 |
| 65 |
--- a/media-gfx/blender/blender-3.1.2.ebuild |
| 66 |
+++ b/media-gfx/blender/blender-3.1.2.ebuild |
| 67 |
@@ -24,7 +24,7 @@ fi |
| 68 |
|
| 69 |
SLOT="${PV%.*}" |
| 70 |
LICENSE="|| ( GPL-3 BL )" |
| 71 |
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ |
| 72 |
+IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 73 |
alembic collada +color-management cuda +cycles \ |
| 74 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 75 |
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ |
| 76 |
@@ -47,6 +47,7 @@ RDEPEND="${PYTHON_DEPS} |
| 77 |
dev-libs/boost:=[nls?,threads(+)] |
| 78 |
dev-libs/lzo:2= |
| 79 |
$(python_gen_cond_dep ' |
| 80 |
+ dev-python/cython[${PYTHON_USEDEP}] |
| 81 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 82 |
dev-python/requests[${PYTHON_USEDEP}] |
| 83 |
dev-python/zstandard[${PYTHON_USEDEP}] |
| 84 |
@@ -121,7 +122,6 @@ BDEPEND=" |
| 85 |
dev-texlive/texlive-latexextra |
| 86 |
) |
| 87 |
nls? ( sys-devel/gettext ) |
| 88 |
- system-numpy? ( system-python? ( dev-python/cython ) ) |
| 89 |
" |
| 90 |
|
| 91 |
blender_check_requirements() { |
| 92 |
@@ -253,8 +253,7 @@ src_configure() { |
| 93 |
-DWITH_POTRACE=$(usex potrace) |
| 94 |
-DWITH_PUGIXML=$(usex pugixml) |
| 95 |
-DWITH_PULSEAUDIO=$(usex pulseaudio) |
| 96 |
- -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) |
| 97 |
- -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) |
| 98 |
+ -DWITH_PYTHON_INSTALL=OFF |
| 99 |
-DWITH_SDL=$(usex sdl) |
| 100 |
-DWITH_STATIC_LIBS=OFF |
| 101 |
-DWITH_SYSTEM_EIGEN3=ON |
| 102 |
|
| 103 |
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild |
| 104 |
index f79dd995b76e..02cb64f9cc13 100644 |
| 105 |
--- a/media-gfx/blender/blender-9999.ebuild |
| 106 |
+++ b/media-gfx/blender/blender-9999.ebuild |
| 107 |
@@ -24,7 +24,7 @@ fi |
| 108 |
|
| 109 |
SLOT="${PV%.*}" |
| 110 |
LICENSE="|| ( GPL-3 BL )" |
| 111 |
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ |
| 112 |
+IUSE="+bullet +dds +fluid +openexr +tbb \ |
| 113 |
alembic collada +color-management cuda +cycles \ |
| 114 |
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ |
| 115 |
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ |
| 116 |
@@ -47,6 +47,7 @@ RDEPEND="${PYTHON_DEPS} |
| 117 |
dev-libs/boost:=[nls?,threads(+)] |
| 118 |
dev-libs/lzo:2= |
| 119 |
$(python_gen_cond_dep ' |
| 120 |
+ dev-python/cython[${PYTHON_USEDEP}] |
| 121 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 122 |
dev-python/requests[${PYTHON_USEDEP}] |
| 123 |
dev-python/zstandard[${PYTHON_USEDEP}] |
| 124 |
@@ -252,8 +253,7 @@ src_configure() { |
| 125 |
-DWITH_POTRACE=$(usex potrace) |
| 126 |
-DWITH_PUGIXML=$(usex pugixml) |
| 127 |
-DWITH_PULSEAUDIO=$(usex pulseaudio) |
| 128 |
- -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) |
| 129 |
- -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) |
| 130 |
+ -DWITH_PYTHON_INSTALL=OFF |
| 131 |
-DWITH_SDL=$(usex sdl) |
| 132 |
-DWITH_STATIC_LIBS=OFF |
| 133 |
-DWITH_SYSTEM_EIGEN3=ON |
Archives