commit: 006eca8fb26ff3329ee3ba3b676419d67a9c009f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jun 4 01:48:24 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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 <[email protected]> +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() {
