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 762CF158090 for ; Mon, 16 May 2022 08:12:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E775E08A2; Mon, 16 May 2022 08:12:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 77BA6E08A2 for ; Mon, 16 May 2022 08:12:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 88D723415C1 for ; Mon, 16 May 2022 08:12:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5619A475 for ; Mon, 16 May 2022 08:12:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1652688732.8c3e019d3764d6f231f63af05738b7a4bd26771b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vidstab/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vidstab/vidstab-1.1.0-r2.ebuild media-libs/vidstab/vidstab-9999.ebuild X-VCS-Directories: media-libs/vidstab/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8c3e019d3764d6f231f63af05738b7a4bd26771b X-VCS-Branch: master Date: Mon, 16 May 2022 08:12:35 +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: 53b8d1b1-33b6-40d1-b952-b337133dcdb7 X-Archives-Hash: cfd3ab25520e3e0f40a7eacc6cfac1c3 commit: 8c3e019d3764d6f231f63af05738b7a4bd26771b Author: David Seifert gentoo org> AuthorDate: Mon May 16 08:12:12 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Mon May 16 08:12:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3e019d media-libs/vidstab: [QA] use tc-check-openmp correctly Signed-off-by: David Seifert gentoo.org> media-libs/vidstab/vidstab-1.1.0-r2.ebuild | 12 ++++++++++-- media-libs/vidstab/vidstab-9999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild index c4c32a5b0db5..10d1d124b60d 100644 --- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild +++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,6 +26,15 @@ PATCHES=( "${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch" "${FILESDIR}/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch" ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { # USE=cpu_flags_x86_sse2 instead sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die @@ -39,7 +48,6 @@ src_prepare() { } src_configure() { - use openmp && tc-check-openmp local mycmakeargs=( -DUSE_OMP="$(usex openmp)" -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)" diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild index 780a2a4598a4..09028637d1da 100644 --- a/media-libs/vidstab/vidstab-9999.ebuild +++ b/media-libs/vidstab/vidstab-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018-2020 Gentoo Authors +# Copyright 2018-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,6 +21,15 @@ fi LICENSE="GPL-2+" SLOT="0" IUSE="openmp cpu_flags_x86_sse2" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + src_prepare() { # USE=cpu_flags_x86_sse2 instead sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die @@ -34,7 +43,6 @@ src_prepare() { } src_configure() { - use openmp && tc-check-openmp local mycmakeargs=( -DUSE_OMP="$(usex openmp)" -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"