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 559D61382C5 for ; Sun, 7 Jun 2020 12:42:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AB7DE0919; Sun, 7 Jun 2020 12:42:26 +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 43466E0919 for ; Sun, 7 Jun 2020 12:42:26 +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 DC54F34EDF6 for ; Sun, 7 Jun 2020 12:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 596CD1F9 for ; Sun, 7 Jun 2020 12:42:23 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1591533738.c0e7ffe1a6e34be0172d32d11f92b69cfe5a1efc.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x265/x265-3.4.ebuild media-libs/x265/x265-9999.ebuild X-VCS-Directories: media-libs/x265/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: c0e7ffe1a6e34be0172d32d11f92b69cfe5a1efc X-VCS-Branch: master Date: Sun, 7 Jun 2020 12:42:23 +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: f2c566aa-8d21-4225-a98b-26142a67b77b X-Archives-Hash: 091d719d65c7ea04322bb45d3b898fee commit: c0e7ffe1a6e34be0172d32d11f92b69cfe5a1efc Author: Alexis Ballier gentoo org> AuthorDate: Sun Jun 7 12:42:11 2020 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sun Jun 7 12:42:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e7ffe1 media-libs/x265: Fix typo for ppc asm on main variant This was causing cmakeargs to be ignored Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Alexis Ballier gentoo.org> media-libs/x265/x265-3.4.ebuild | 18 +++++++++++++++--- media-libs/x265/x265-9999.ebuild | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild index a3ce2faae8c..8d6664cdef2 100644 --- a/media-libs/x265/x265-3.4.ebuild +++ b/media-libs/x265/x265-3.4.ebuild @@ -73,6 +73,8 @@ x265_variant_src_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die + einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" + local mycmakeargs=( "${myabicmakeargs[@]}" ) case "${MULTIBUILD_VARIANT}" in "main12") @@ -91,7 +93,12 @@ x265_variant_src_configure() { mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi # disable altivec for 12bit build #607802#c5 - [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex power8 ON OFF) + ) + fi ;; "main10") mycmakeargs+=( @@ -108,7 +115,12 @@ x265_variant_src_configure() { mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi # disable altivec for 10bit build #607802#c5 - [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex power8 ON OFF) + ) + fi ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then @@ -126,7 +138,7 @@ x265_variant_src_configure() { -DLINKED_12BIT=$(usex 12bit) ) if [[ ${ABI} = ppc* ]] ; then - myabicmakeargs+=( + mycmakeargs+=( -DCPU_POWER8=$(usex power8 ON OFF) -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) ) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index a3ce2faae8c..8d6664cdef2 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -73,6 +73,8 @@ x265_variant_src_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die + einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" + local mycmakeargs=( "${myabicmakeargs[@]}" ) case "${MULTIBUILD_VARIANT}" in "main12") @@ -91,7 +93,12 @@ x265_variant_src_configure() { mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi # disable altivec for 12bit build #607802#c5 - [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex power8 ON OFF) + ) + fi ;; "main10") mycmakeargs+=( @@ -108,7 +115,12 @@ x265_variant_src_configure() { mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi # disable altivec for 10bit build #607802#c5 - [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex power8 ON OFF) + ) + fi ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then @@ -126,7 +138,7 @@ x265_variant_src_configure() { -DLINKED_12BIT=$(usex 12bit) ) if [[ ${ABI} = ppc* ]] ; then - myabicmakeargs+=( + mycmakeargs+=( -DCPU_POWER8=$(usex power8 ON OFF) -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) )