commit: 4b7ffaeaa89f7cc50efc5e6b947f2853a0956aae Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Sep 20 22:56:26 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 22 11:07:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7ffaea
media-libs/x265: build cli for native_abi only, fix bug 939909 Old logic was $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF"), so we need ! here. Closes: https://bugs.gentoo.org/939909 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38717 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/x265/{x265-3.5-r5.ebuild => x265-3.5-r6.ebuild} | 4 ++-- media-libs/x265/{x265-3.6.ebuild => x265-3.6-r1.ebuild} | 4 ++-- media-libs/x265/x265-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-libs/x265/x265-3.5-r5.ebuild b/media-libs/x265/x265-3.5-r6.ebuild similarity index 97% rename from media-libs/x265/x265-3.5-r5.ebuild rename to media-libs/x265/x265-3.5-r6.ebuild index c9db10613904..f38a58ad7981 100644 --- a/media-libs/x265/x265-3.5-r5.ebuild +++ b/media-libs/x265/x265-3.5-r6.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit cmake flag-o-matic multilib-minimal multibuild DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"; +HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"; if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -108,7 +108,7 @@ multilib_src_configure() { -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) - if multilib_is_native_abi; then + if ! multilib_is_native_abi; then mycmakeargs+=( -DENABLE_CLI="no" ) diff --git a/media-libs/x265/x265-3.6.ebuild b/media-libs/x265/x265-3.6-r1.ebuild similarity index 97% rename from media-libs/x265/x265-3.6.ebuild rename to media-libs/x265/x265-3.6-r1.ebuild index ba013c73d378..7fe46d01d35a 100644 --- a/media-libs/x265/x265-3.6.ebuild +++ b/media-libs/x265/x265-3.6-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit cmake flag-o-matic multilib-minimal multibuild DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"; +HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"; if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -108,7 +108,7 @@ multilib_src_configure() { -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) - if multilib_is_native_abi; then + if ! multilib_is_native_abi; then mycmakeargs+=( -DENABLE_CLI="no" ) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index bf2855a23f64..472c0eb7e4fd 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit cmake flag-o-matic multilib-minimal multibuild DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"; +HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"; if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -108,7 +108,7 @@ multilib_src_configure() { -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) - if multilib_is_native_abi; then + if ! multilib_is_native_abi; then mycmakeargs+=( -DENABLE_CLI="no" )
