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 0B90B13835A for ; Mon, 25 May 2020 05:11:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00F68E08E8; Mon, 25 May 2020 05:11:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DCCF0E08E8 for ; Mon, 25 May 2020 05:11:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 432A334EF2A for ; Mon, 25 May 2020 05:11:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD61123E for ; Mon, 25 May 2020 05:11:31 +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: <1590383398.fe5c3453d9b642af66fbbc09c9b0e844034bc21f.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: fe5c3453d9b642af66fbbc09c9b0e844034bc21f X-VCS-Branch: master Date: Mon, 25 May 2020 05:11:31 +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: 424d382d-a72b-47e6-b512-4fbc9b715e87 X-Archives-Hash: 7e5470ff4378610467d7c294c0e2c104 commit: fe5c3453d9b642af66fbbc09c9b0e844034bc21f Author: Georgy Yakovlev gentoo org> AuthorDate: Mon May 25 05:02:39 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 25 05:09:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5c3453 media-libs/x265: sync live ebuild Bug: https://bugs.gentoo.org/725134 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> media-libs/x265/x265-9999.ebuild | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index 96fa1f5e454..736bea15bb8 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -88,6 +88,8 @@ x265_variant_src_configure() { -DENABLE_CLI=OFF -DMAIN12=ON ) + # disable altivec for 12bit build #607802#c5 + [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) ;; "main10") mycmakeargs+=( @@ -96,6 +98,8 @@ x265_variant_src_configure() { -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ) + # disable altivec for 10bit build #607802#c5 + [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then @@ -112,6 +116,14 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + # we have to handle ppc here and not in multilib_src_configure + # because we want those flags apply ONLY to "main" variant + if [[ ${ABI} = ppc* ]] ; then + myabicmakeargs+=( + -DCPU_POWER8=$(usex power8 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) + ) + fi fi ;; *) @@ -152,10 +164,10 @@ multilib_src_configure() { supports_asm=no fi elif [[ ${ABI} = ppc* ]] ; then - myabicmakeargs+=( - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) - ) + if use asm ; then + ewarn "ppc64 uses altivec instead of asm, disabling it." + supports_asm=no + fi fi if [[ "${supports_asm}" = yes ]] && use asm ; then