From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 193701382C5 for ; Sun, 7 Jun 2020 23:24:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F67EE0894; Sun, 7 Jun 2020 23:24:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28F28E08A5 for ; Sun, 7 Jun 2020 23:24:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A43534F3B5 for ; Sun, 7 Jun 2020 23:24:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2E951F9 for ; Sun, 7 Jun 2020 23:24:06 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1591572240.7954a8ed241574852dad7e932afd4276d58370b7.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x265/x265-9999.ebuild X-VCS-Directories: media-libs/x265/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 7954a8ed241574852dad7e932afd4276d58370b7 X-VCS-Branch: master Date: Sun, 7 Jun 2020 23:24:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66b8da87-f003-4281-bfb7-5c0d03b28d43 X-Archives-Hash: 21a4cbd259daa554f2f9f1500294ed0e commit: 7954a8ed241574852dad7e932afd4276d58370b7 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Jun 7 23:22:37 2020 +0000 Commit: Georgy Yakovlev gentoo 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 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