[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     7954a8ed241574852dad7e932afd4276d58370b7
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 23:22:37 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 23:24:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7954a8ed

media-libs/x265: use cpu_flags_ppc_vsx2 in ver 9999

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 media-libs/x265/x265-9999.ebuild | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 8d6664cdef2..65ee36367ee 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
 LICENSE="GPL-2"
 # subslot = libx265 soname
 SLOT="0/192"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
@@ -96,7 +96,7 @@ x265_variant_src_configure() {
 			if [[ ${ABI} = ppc* ]] ; then
 				mycmakeargs+=(
 					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex power8 ON OFF)
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
 				)
 			fi
 			;;
@@ -118,7 +118,7 @@ x265_variant_src_configure() {
 			if [[ ${ABI} = ppc* ]] ; then
 				mycmakeargs+=(
 					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex power8 ON OFF)
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
 				)
 			fi
 			;;
@@ -138,9 +138,13 @@ x265_variant_src_configure() {
 					-DLINKED_12BIT=$(usex 12bit)
 				)
 				if [[ ${ABI} = ppc* ]] ; then
+					# upstream uses mix of altivec + power8 vectors
+					# it's impossible to enable altivec without CPU_POWER8
+					# and it does not work on ppc32
+					# so we toggle both variables together
 					mycmakeargs+=(
-						-DCPU_POWER8=$(usex power8 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF)
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
 					)
 				fi
 			fi