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 C497C13835A for ; Fri, 28 May 2021 15:37:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04242E0A6E; Fri, 28 May 2021 15:37:36 +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 E1098E0A6E for ; Fri, 28 May 2021 15:37:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F1E34335D07 for ; Fri, 28 May 2021 15:37:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD334790 for ; Fri, 28 May 2021 15:37:33 +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: <1622216224.93253755df3984a0154319e605ef43c938124dfe.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opus/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opus/opus-1.3.1-r1.ebuild media-libs/opus/opus-1.3.1-r2.ebuild X-VCS-Directories: media-libs/opus/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 93253755df3984a0154319e605ef43c938124dfe X-VCS-Branch: master Date: Fri, 28 May 2021 15:37:33 +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: c8060243-af02-42ff-a0ae-2893922a8424 X-Archives-Hash: ee8f70ad26fe4d8a1239a88c5f5eebf7 commit: 93253755df3984a0154319e605ef43c938124dfe Author: Sam James gentoo org> AuthorDate: Fri May 28 15:37:04 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Fri May 28 15:37:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93253755 media-libs/opus: disable intrinsics automagic Thanks-to: David Michael gmail.com> Closes: https://bugs.gentoo.org/752069 Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> media-libs/opus/opus-1.3.1-r1.ebuild | 4 +++- .../opus/{opus-1.3.1-r1.ebuild => opus-1.3.1-r2.ebuild} | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild index 257b3a7fb6f..4386d0bab3a 100644 --- a/media-libs/opus/opus-1.3.1-r1.ebuild +++ b/media-libs/opus/opus-1.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,9 +26,11 @@ multilib_src_configure() { $(use_enable doc) $(use_enable static-libs static) ) + for i in ${INTRINSIC_FLAGS} ; do use ${i} && myeconfargs+=( --enable-intrinsics ) done + if is-flagq -ffast-math || is-flagq -Ofast; then myeconfargs+=( "--enable-float-approx" ) fi diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild similarity index 68% copy from media-libs/opus/opus-1.3.1-r1.ebuild copy to media-libs/opus/opus-1.3.1-r2.ebuild index 257b3a7fb6f..08cffd6f0a3 100644 --- a/media-libs/opus/opus-1.3.1-r1.ebuild +++ b/media-libs/opus/opus-1.3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon" IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}" @@ -26,9 +26,15 @@ multilib_src_configure() { $(use_enable doc) $(use_enable static-libs static) ) - for i in ${INTRINSIC_FLAGS} ; do - use ${i} && myeconfargs+=( --enable-intrinsics ) - done + + local i + # We want to disable intrinsics if no flags are enabled + # (This is a fun Bash construct to do that!) + # bug #752069 + for i in "${INTRINSIC_FLAGS}" ; do + use ${i} && myeconfargs+=( --enable-intrinsics ) && break + done || myeconfargs+=( --disable-intrinsics ) + if is-flagq -ffast-math || is-flagq -Ofast; then myeconfargs+=( "--enable-float-approx" ) fi