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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C75CB138359 for ; Mon, 24 Aug 2020 13:42:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0191E087F; Mon, 24 Aug 2020 13:42:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86EF1E0882 for ; Mon, 24 Aug 2020 13:42:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4EAD340D49 for ; Mon, 24 Aug 2020 13:42:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C7C9348 for ; Mon, 24 Aug 2020 13:42:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1598276516.c06ea09b242febcc3da2d96bd9ef287ff5c8bb45.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-2.83.4.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c06ea09b242febcc3da2d96bd9ef287ff5c8bb45 X-VCS-Branch: master Date: Mon, 24 Aug 2020 13:42:37 +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: 584d1579-ab85-4b02-9d91-99cdbc35df6d X-Archives-Hash: 01a5b279a0bf34826d0a21b319a32a11 commit: c06ea09b242febcc3da2d96bd9ef287ff5c8bb45 Author: Adrian Grigo yahoo com au> AuthorDate: Sun Aug 23 14:36:35 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 24 13:41:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06ea09b media-gfx/blender: Only require abiX-compat when openvdb is enabled Blender only needs to check which abi version is set when openvdb is enabled. Wrap the version checks and die in an if statement. Signed-off-by: Adrian Grigo yahoo.com.au> Package-Manager: Portage-2.3.103, Repoman-2.3.23 Closes: https://github.com/gentoo/gentoo/pull/17154 Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-2.83.4.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/media-gfx/blender/blender-2.83.4.ebuild b/media-gfx/blender/blender-2.83.4.ebuild index b6e7cb00c60..190185272e9 100644 --- a/media-gfx/blender/blender-2.83.4.ebuild +++ b/media-gfx/blender/blender-2.83.4.ebuild @@ -86,12 +86,12 @@ RDEPEND="${PYTHON_DEPS} opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] - dev-cpp/tbb dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) " @@ -145,7 +145,7 @@ src_prepare() { # Disable MS Windows help generation. The variable doesn't do what it # it sounds like. sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die + -i doc/doxygen/Doxyfile || die } src_configure() { @@ -154,15 +154,17 @@ src_configure() { append-flags -funsigned-char append-lfs-flags - local version - if use abi6-compat; then - version=6; - elif use abi7-compat; then - version=7; - else - die "Openvdb abi version not compatible" + if use openvdb; then + local version + if use abi6-compat; then + version=6; + elif use abi7-compat; then + version=7; + else + die "Openvdb abi version not compatible" + fi + append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} fi - append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -284,7 +286,7 @@ src_install() { pkg_postinst() { elog elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripts." + elog "inherent risks with running unknown python scripts." elog elog "It is recommended to change your blender temp directory" elog "from /tmp to /home/user/tmp or another tmp file under your"