From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37970158090 for ; Fri, 20 May 2022 11:25:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97A7AE0920; Fri, 20 May 2022 11:25:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8170BE0920 for ; Fri, 20 May 2022 11:25:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81B35341237 for ; Fri, 20 May 2022 11:25:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5E90477 for ; Fri, 20 May 2022 11:25:15 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1653045912.b3bbe52b38011538957c9ad1244427fecc4f9203.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-3.0.1-r5.ebuild media-gfx/blender/blender-3.1.2.ebuild media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: b3bbe52b38011538957c9ad1244427fecc4f9203 X-VCS-Branch: master Date: Fri, 20 May 2022 11:25:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 168b19f5-a877-4a53-919b-241f9fab1134 X-Archives-Hash: 8f70d7a1d79db1fcc8258a16b1076d50 commit: b3bbe52b38011538957c9ad1244427fecc4f9203 Author: Sebastian Parborg gmail com> AuthorDate: Mon May 2 14:58:01 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri May 20 11:25:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bbe52b media-gfx/blender: Update python useflags and deps Blender expects Cython to be installed even during runtime for use in python addons. In addition to this, it doesn't make too much sense for the Gentoo ebulid to expose the "WITH_SYSTEM_PYTHON" and the related switches. Those options are used to build easily distributed Blender packages that bundle python and the python dependecies. This can be used deploy Blender on systems were there is no way to easily easily pull in the required python version and libraries. However on Gentoo, we have a very good system for doing this ourselves with portage. Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Joonas Niilola gentoo.org> media-gfx/blender/blender-3.0.1-r5.ebuild | 6 +++--- media-gfx/blender/blender-3.1.2.ebuild | 7 +++---- media-gfx/blender/blender-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild b/media-gfx/blender/blender-3.0.1-r5.ebuild index f9c141963446..ef4995c93aa0 100644 --- a/media-gfx/blender/blender-3.0.1-r5.ebuild +++ b/media-gfx/blender/blender-3.0.1-r5.ebuild @@ -26,7 +26,7 @@ fi SLOT="${PV%.*}" LICENSE="|| ( GPL-3 BL )" -IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ +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 +oidn +openimageio +openmp +opensubdiv \ @@ -49,6 +49,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] @@ -262,8 +263,7 @@ src_configure() { -DWITH_POTRACE=$(usex potrace) -DWITH_PUGIXML=$(usex pugixml) -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_PYTHON_INSTALL=OFF -DWITH_SDL=$(usex sdl) -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild index 402d1ca0b796..cd1eca85cae5 100644 --- a/media-gfx/blender/blender-3.1.2.ebuild +++ b/media-gfx/blender/blender-3.1.2.ebuild @@ -24,7 +24,7 @@ fi SLOT="${PV%.*}" LICENSE="|| ( GPL-3 BL )" -IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ +IUSE="+bullet +dds +fluid +openexr +tbb \ alembic collada +color-management cuda +cycles \ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ @@ -47,6 +47,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] @@ -121,7 +122,6 @@ BDEPEND=" dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) - system-numpy? ( system-python? ( dev-python/cython ) ) " blender_check_requirements() { @@ -253,8 +253,7 @@ src_configure() { -DWITH_POTRACE=$(usex potrace) -DWITH_PUGIXML=$(usex pugixml) -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_PYTHON_INSTALL=OFF -DWITH_SDL=$(usex sdl) -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index f79dd995b76e..02cb64f9cc13 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -24,7 +24,7 @@ fi SLOT="${PV%.*}" LICENSE="|| ( GPL-3 BL )" -IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ +IUSE="+bullet +dds +fluid +openexr +tbb \ alembic collada +color-management cuda +cycles \ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ @@ -47,6 +47,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] @@ -252,8 +253,7 @@ src_configure() { -DWITH_POTRACE=$(usex potrace) -DWITH_PUGIXML=$(usex pugixml) -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) - -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_PYTHON_INSTALL=OFF -DWITH_SDL=$(usex sdl) -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON