From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1620465-garchives=archives.gentoo.org@lists.gentoo.org>
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 3163E158041
for <garchives@archives.gentoo.org>; Sat, 13 Apr 2024 17:36:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 73EF22BC013;
Sat, 13 Apr 2024 17:36:56 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 5A8E82BC015
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Apr 2024 17:36:56 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5C44A3433B2
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Apr 2024 17:36:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E846716D0
for <gentoo-commits@lists.gentoo.org>; Sat, 13 Apr 2024 17:36:53 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1713029737.2983664d141cbf6ccd9f6e54d83aacbe5eccacb8.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/openvdb/openvdb-11.0.0.ebuild
X-VCS-Directories: media-gfx/openvdb/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2983664d141cbf6ccd9f6e54d83aacbe5eccacb8
X-VCS-Branch: master
Date: Sat, 13 Apr 2024 17:36:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e92cc7ff-6551-4524-b5c2-319da1a1032d
X-Archives-Hash: 7fae22e2646974d069daafc4bad5f537
commit: 2983664d141cbf6ccd9f6e54d83aacbe5eccacb8
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Apr 13 16:14:04 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 17:35:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2983664d
media-gfx/openvdb: 11.0.0 fix abi-compat USE
The values for `-DOPENVDB_USE_*_ABI` are derived from the initial value of `version`.
By changing the value of `version` depending on the abi*-compat USE-flag they are instead derived from the modified value for any USE="!abi11-compat".
That results in `usex abi*-compat`-queries on values outside of the supported +1/-2 range.
Closes: https://bugs.gentoo.org/929926
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36239
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/openvdb/openvdb-11.0.0.ebuild | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/media-gfx/openvdb/openvdb-11.0.0.ebuild b/media-gfx/openvdb/openvdb-11.0.0.ebuild
index 35a71fe06c64..ff01eb449a31 100644
--- a/media-gfx/openvdb/openvdb-11.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-11.0.0.ebuild
@@ -175,21 +175,22 @@ src_prepare() {
}
my_src_configure() {
- local version
+ local version abi_version
version=$(ver_cut 1)
+ abi_version="${version}"
if use "abi$(( version + 1 ))-compat"; then
- version=$(( version + 1 ))
+ abi_version=$(( version + 1 ))
elif use "abi$(( version - 1 ))-compat"; then
- version=$(( version - 1 ))
+ abi_version=$(( version - 1 ))
elif use "abi$(( version - 2 ))-compat"; then
- version=$(( version - 2 ))
+ abi_version=$(( version - 2 ))
fi
local mycmakeargs=(
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG="yes"
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
+ -DOPENVDB_ABI_VERSION_NUMBER="${abi_version}"
-DOPENVDB_BUILD_DOCS="$(usex doc)"
-DOPENVDB_BUILD_UNITTESTS="$(usex test)"
-DOPENVDB_BUILD_VDB_LOD="$(usex utils)"