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 2A98915808F for ; Thu, 17 Mar 2022 02:10:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD514E0895; Thu, 17 Mar 2022 02:10:06 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8ACDEE0895 for ; Thu, 17 Mar 2022 02:10:06 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 197E034368D for ; Thu, 17 Mar 2022 02:09:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E6092EA for ; Thu, 17 Mar 2022 02:09:53 +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: <1647482919.1f96696e0926a6e2ff71c7455755e6a5563f0570.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libaom/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libaom/libaom-3.3.0.ebuild X-VCS-Directories: media-libs/libaom/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1f96696e0926a6e2ff71c7455755e6a5563f0570 X-VCS-Branch: master Date: Thu, 17 Mar 2022 02:09:53 +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: 1ba37a1b-c386-4846-8652-9a7fa621db12 X-Archives-Hash: c3df63ac3f054a07f32021d4b6e82793 commit: 1f96696e0926a6e2ff71c7455755e6a5563f0570 Author: Sam James gentoo org> AuthorDate: Thu Mar 17 02:07:19 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Mar 17 02:08:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f96696e media-libs/libaom: workaround bugs in intrinsic-enabled/disabled builds - For 32-bit multilib builds on amd64, force on SSE3 & SSSE3. It seems to check at runtime anyway (for some targets, inc. this one). - For arm32-on-arm64 builds, go generic, because it gets confused by ARM64 when NEON is disabled (I think?). Could try forcing arm at some point. Closes: https://bugs.gentoo.org/816027 Closes: https://bugs.gentoo.org/835456 Signed-off-by: Sam James gentoo.org> media-libs/libaom/libaom-3.3.0.ebuild | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/media-libs/libaom/libaom-3.3.0.ebuild b/media-libs/libaom/libaom-3.3.0.ebuild index 4629f7dd2077..8f587c6b1c32 100644 --- a/media-libs/libaom/libaom-3.3.0.ebuild +++ b/media-libs/libaom/libaom-3.3.0.ebuild @@ -66,6 +66,26 @@ multilib_src_configure() { -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) ) + # For 32-bit multilib builds, force some intrinsics on to work around + # bug #816027. libaom seems to do runtime detection for some targets + # at least, so this isn't an issue. + if ! multilib_is_native_abi && use amd64 ; then + mycmakeargs+=( + -DENABLE_SSE3=ON + -DENABLE_SSSE3=ON + ) + fi + + # On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456 + # Just force generic, given it's a niche situation. + # TODO: could try forcing armv7 or similar? + if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then + ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)" + mycmakeargs+=( + -DAOM_TARGET_CPU=generic + ) + fi + cmake_src_configure }