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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4BB2158042 for ; Tue, 5 Nov 2024 02:03:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA3C1E0819; 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 9CECEE080E for ; 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 A48E5342FEE for ; Tue, 5 Nov 2024 02:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1079E1F64 for ; Tue, 5 Nov 2024 02:03:23 +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: <1730772162.c3b9b68da652c7b6f79b3a692067454e6454336d.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: c3b9b68da652c7b6f79b3a692067454e6454336d X-VCS-Branch: master Date: Tue, 5 Nov 2024 02:03:23 +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: 4fb4df3d-c8b9-43cc-a383-c2918592788a X-Archives-Hash: e870dd6719ccec8c288cdd3bff21b6ee commit: c3b9b68da652c7b6f79b3a692067454e6454336d Author: Paul Zander gmail com> AuthorDate: Thu Oct 31 16:03:12 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 5 02:02:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b9b68d media-libs/opencv: use multilib_native_use Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/opencv/opencv-4.10.0.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild index b2aad4b16b18..e0fb1354215a 100644 --- a/media-libs/opencv/opencv-4.10.0.ebuild +++ b/media-libs/opencv/opencv-4.10.0.ebuild @@ -783,7 +783,7 @@ multilib_src_configure() { -DBUILD_opencv_xfeatures2d="$(usex contribxfeatures2d)" ) - if multilib_is_native_abi && use !tesseract; then + if ! multilib_native_use tesseract; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract="yes" ) @@ -793,7 +793,7 @@ multilib_src_configure() { # workaround for bug 413429 tc-export CC CXX - if multilib_is_native_abi && use cuda; then + if multilib_native_use cuda; then cuda_add_sandbox -w addwrite "/proc/self/task" @@ -870,6 +870,8 @@ multilib_src_configure() { ) fi + # NOTE due to multilib we can't do + # if multilib_native_use test; then if use test; then # opencv tests assume to be build in Release mode CMAKE_BUILD_TYPE="Release" @@ -890,7 +892,7 @@ multilib_src_configure() { ) fi - if multilib_is_native_abi && use python; then + if multilib_native_use python; then python_configure() { # Set all python variables to load the correct Gentoo paths local mycmakeargs=( @@ -920,7 +922,7 @@ multilib_src_configure() { } multilib_src_compile() { - if multilib_is_native_abi && use python; then + if multilib_native_use python; then python_foreach_impl cmake_src_compile else cmake_src_compile @@ -947,7 +949,7 @@ multilib_src_test() { ) fi - if multilib_is_native_abi && use cuda; then + if multilib_native_use cuda; then CMAKE_SKIP_TESTS+=( 'CUDA_OptFlow/BroxOpticalFlow.Regression/0' 'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0' @@ -973,7 +975,7 @@ multilib_src_test() { --test-timeout 180 ) - if multilib_is_native_abi && use cuda; then + if multilib_native_use cuda; then cuda_add_sandbox -w export OPENCV_PARALLEL_BACKEND="threads" export DNN_BACKEND_OPENCV="cuda" @@ -1005,7 +1007,7 @@ multilib_src_test() { echo -e "${results[*]}" } - if multilib_is_native_abi && use python; then + if multilib_native_use python; then python_foreach_impl virtx opencv_test else virtx opencv_test @@ -1162,7 +1164,8 @@ multilib_src_install() { /usr/include/opencv4/opencv2/wechat_qrcode.hpp ) # }}} fi - if multilib_is_native_abi && use python; then + + if multilib_native_use python; then python_foreach_impl cmake_src_install python_foreach_impl python_optimize else