commit: 5d564bfd43936f5374fe9a7c008a765e5df18225 Author: James Beddek <telans <AT> posteo <DOT> de> AuthorDate: Sun Nov 14 05:28:53 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Nov 14 05:37:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d564bfd
media-libs/svt-av1: enable amd64 multilib Signed-off-by: James Beddek <telans <AT> posteo.de> Closes: https://github.com/gentoo/gentoo/pull/22943 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/svt-av1/svt-av1-0.8.7.ebuild | 7 +++++-- media-libs/svt-av1/svt-av1-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/media-libs/svt-av1/svt-av1-0.8.7.ebuild b/media-libs/svt-av1/svt-av1-0.8.7.ebuild index 6a3a498cd40a..643a0d195303 100644 --- a/media-libs/svt-av1/svt-av1-0.8.7.ebuild +++ b/media-libs/svt-av1/svt-av1-0.8.7.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake-multilib flag-o-matic DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"; @@ -23,7 +23,7 @@ SLOT="0" BDEPEND="amd64? ( dev-lang/yasm )" -src_configure() { +multilib_src_configure() { append-ldflags -Wl,-z,noexecstack local mycmakeargs=( @@ -31,7 +31,10 @@ src_configure() { # undefined reference to `ifd_inspect' # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 -DBUILD_TESTING=OFF + -DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}" ) + [[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON ) + cmake_src_configure } diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild index 16b50d3407b7..5f5a2bb626bd 100644 --- a/media-libs/svt-av1/svt-av1-9999.ebuild +++ b/media-libs/svt-av1/svt-av1-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake-multilib flag-o-matic DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"; @@ -23,7 +23,7 @@ SLOT="0" BDEPEND="amd64? ( dev-lang/yasm )" -src_configure() { +multilib_src_configure() { append-ldflags -Wl,-z,noexecstack local mycmakeargs=( @@ -31,7 +31,10 @@ src_configure() { # undefined reference to `ifd_inspect' # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 -DBUILD_TESTING=OFF + -DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}" ) + [[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON ) + cmake_src_configure }
