From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1686796-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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8EEB158042 for <garchives@archives.gentoo.org>; Tue, 5 Nov 2024 02:03:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FC03E07EF; Tue, 5 Nov 2024 02:03:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 341FCE07EF for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:26 +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 8177D342FDD for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAABD1F41 for <gentoo-commits@lists.gentoo.org>; Tue, 5 Nov 2024 02:03:22 +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: <1730772160.d74914ed1f33f9ea681337fcf80e828a5c46f374.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-4.10.0.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d74914ed1f33f9ea681337fcf80e828a5c46f374 X-VCS-Branch: master Date: Tue, 5 Nov 2024 02:03:22 +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: 4898ffba-2782-4f82-8daf-8031b0bb6b3e X-Archives-Hash: 6977400316892290c6f0b47052a181fb commit: d74914ed1f33f9ea681337fcf80e828a5c46f374 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Oct 21 11:29:36 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 5 02:02:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74914ed media-libs/opencv: make openmp tbb non-exclusive Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/opencv/opencv-4.10.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index 6948cca7dacf..43b9b4b762a8 100644 --- a/media-libs/opencv/opencv-4.10.0.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -573,7 +573,7 @@ multilib_src_configure() { # -DWITH_QUICKTIME="no" # -DWITH_QTKIT="no" -DWITH_TBB="$(usex tbb)" - -DWITH_OPENMP="$(usex !tbb "$(usex openmp)")" + -DWITH_OPENMP="$(usex openmp)" -DWITH_PTHREADS_PF="yes" -DWITH_TIFF="$(usex tiff)" -DWITH_UNICAP="no" # Not packaged @@ -838,7 +838,7 @@ multilib_src_configure() { if use mkl; then mycmakeargs+=( -DLAPACK_IMPL="MKL" - -DMKL_WITH_OPENMP="$(usex !tbb "$(usex openmp)")" + -DMKL_WITH_OPENMP="$(usex openmp)" -DMKL_WITH_TBB="$(usex tbb)" ) fi