commit: 57f7070d2cb6fc5b55a06cde9fac48821128b90f Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Sep 7 02:54:30 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 7 02:55:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f7070d
media-libs/svt-av1: fix build on non-amd64 Closes: https://bugs.gentoo.org/785556 Signed-off-by: David Seifert <soap <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> .../svt-av1/files/svt-av1-0.8.6-no-force-avx.patch | 18 ++++++++++++++++++ media-libs/svt-av1/svt-av1-0.8.6.ebuild | 12 ++++++++++++ 2 files changed, 30 insertions(+) diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch new file mode 100644 index 00000000000..62f3b9b0c80 --- /dev/null +++ b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/785556 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,14 +170,6 @@ + endif() + endforeach() + +-if(CMAKE_C_FLAGS MATCHES ".*-march=native.*") +- string(APPEND CMAKE_C_FLAGS " -mno-avx") +-endif() +- +-if(CMAKE_CXX_FLAGS MATCHES ".*-march=native.*") +- string(APPEND CMAKE_CXX_FLAGS " -mno-avx") +-endif() +- + if(CMAKE_ASM_NASM_OBJECT_FORMAT MATCHES "win") + set(CMAKE_ASM_NASM_FLAGS_DEBUG "${CMAKE_ASM_NASM_FLAGS_DEBUG} -gcv8") + elseif(CMAKE_ASM_NASM_COMPILER MATCHES "nasm") diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild index d2eed504281..6857b80e363 100644 --- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild +++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild @@ -25,8 +25,20 @@ DEPEND="amd64? ( dev-lang/yasm )" PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch ) +src_prepare() { + if ! use amd64 ; then + # This _should_ be possible on amd64 too, but breaks with -O3 + # without AVX. + # bug #785556 + eapply "${FILESDIR}"/${PN}-0.8.6-no-force-avx.patch + fi + + cmake_src_prepare +} + src_configure() { append-ldflags -Wl,-z,noexecstack + local mycmakeargs=( # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? # undefined reference to `ifd_inspect'
