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 69E8115817D for ; Tue, 4 Jun 2024 01:49:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADC2BE2A2D; Tue, 4 Jun 2024 01:49:42 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 900F8E2A2D for ; Tue, 4 Jun 2024 01:49:42 +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 B4C48340806 for ; Tue, 4 Jun 2024 01:49:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 182291587 for ; Tue, 4 Jun 2024 01:49:40 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1717465704.006eca8fb26ff3329ee3ba3b676419d67a9c009f.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libaom/, media-libs/libaom/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch media-libs/libaom/libaom-3.9.0.ebuild X-VCS-Directories: media-libs/libaom/files/ media-libs/libaom/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 006eca8fb26ff3329ee3ba3b676419d67a9c009f X-VCS-Branch: master Date: Tue, 4 Jun 2024 01:49:40 +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: 6b1c080f-8ec1-45fd-90cd-e82d888450ed X-Archives-Hash: 2cd85d4c1d679cad94b3806f828f1ecf commit: 006eca8fb26ff3329ee3ba3b676419d67a9c009f Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 4 01:48:24 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jun 4 01:48:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006eca8f media-libs/libaom: backport build fix Closes: https://bugs.gentoo.org/933429 Signed-off-by: Mike Gilbert gentoo.org> .../libaom/files/libaom-3.9.0-guard-ssse3.patch | 67 ++++++++++++++++++++++ media-libs/libaom/libaom-3.9.0.ebuild | 1 + 2 files changed, 68 insertions(+) diff --git a/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch b/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch new file mode 100644 index 000000000000..40cb17f0a354 --- /dev/null +++ b/media-libs/libaom/files/libaom-3.9.0-guard-ssse3.patch @@ -0,0 +1,67 @@ +https://bugs.chromium.org/p/aomedia/issues/detail?id=3578#c6 +https://bugs.gentoo.org/933429 + +From 8670445106036383c1f55c08b1a3283bd0accf7a Mon Sep 17 00:00:00 2001 +From: Wan-Teh Chang +Date: Mon, 3 Jun 2024 11:13:53 -0700 +Subject: [PATCH] Guard DECLS(ssse3), FNS(ssse3) with #if HAVE_SSSE3 + +The aom_dsp/x86/variance_sse2.c file is compiled if the ENABLE_SSE2 +cmake option is enabled. The file also contains some SSSE3 code. That +code should only be compiled if the ENABLE_SSSE3 cmake option is +enabled. + +Bug: aomedia:3578 +Change-Id: I86685862e7da9506bd551b76228cdc9920c68ab1 +(cherry picked from commit afb5237d908bd04ce6ea15eae85db4a54cba289c) +--- + aom_dsp/x86/variance_sse2.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/aom_dsp/x86/variance_sse2.c b/aom_dsp/x86/variance_sse2.c +index 81b30072a5..e71244f1c7 100644 +--- a/aom_dsp/x86/variance_sse2.c ++++ b/aom_dsp/x86/variance_sse2.c +@@ -415,7 +415,9 @@ unsigned int aom_mse16x16_sse2(const uint8_t *src, int src_stride, + DECL(8, opt); \ + DECL(16, opt) + ++#if HAVE_SSSE3 + DECLS(ssse3); ++#endif + #undef DECLS + #undef DECL + +@@ -491,7 +493,9 @@ DECLS(ssse3); + FN(4, 4, 4, 2, 2, opt, (int32_t), (int32_t)) + #endif + ++#if HAVE_SSSE3 + FNS(ssse3) ++#endif + + #undef FNS + #undef FN +@@ -508,7 +512,9 @@ FNS(ssse3) + DECL(8, opt); \ + DECL(16, opt) + ++#if HAVE_SSSE3 + DECLS(ssse3); ++#endif + #undef DECL + #undef DECLS + +@@ -588,7 +594,9 @@ DECLS(ssse3); + FN(4, 4, 4, 2, 2, opt, (uint32_t), (int32_t)) + #endif + ++#if HAVE_SSSE3 + FNS(ssse3) ++#endif + + #undef FNS + #undef FN +-- +2.45.2 + diff --git a/media-libs/libaom/libaom-3.9.0.ebuild b/media-libs/libaom/libaom-3.9.0.ebuild index 8062dc97f9b4..d9cbbf1ee16a 100644 --- a/media-libs/libaom/libaom-3.9.0.ebuild +++ b/media-libs/libaom/libaom-3.9.0.ebuild @@ -50,6 +50,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch "${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch "${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch + "${FILESDIR}"/libaom-3.9.0-guard-ssse3.patch ) multilib_src_configure() {