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 BFF1F1382C5 for ; Fri, 5 Jun 2020 15:21:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB84FE08BD; Fri, 5 Jun 2020 15:21:35 +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 C7896E08BD for ; Fri, 5 Jun 2020 15:21: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 58EBD34F238 for ; Fri, 5 Jun 2020 15:21:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25B13242 for ; Fri, 5 Jun 2020 15:21:29 +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: <1591370394.f4b9781a286d6d12811fc3dd8329492bba49b988.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: f4b9781a286d6d12811fc3dd8329492bba49b988 X-VCS-Branch: master Date: Fri, 5 Jun 2020 15:21:29 +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: 1fb45267-5e33-4570-8898-dcaefa3dd028 X-Archives-Hash: d80b77212279ebb6d1b87c34de22047e commit: f4b9781a286d6d12811fc3dd8329492bba49b988 Author: Alexis Ballier gentoo org> AuthorDate: Fri Jun 5 15:03:05 2020 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 5 15:19:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b9781a media-libs/x265: forward port ppc changes Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Alexis Ballier gentoo.org> media-libs/x265/x265-3.4.ebuild | 22 +++++++++++----------- media-libs/x265/x265-9999.ebuild | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild index f973a0196a7..e40ca0e0876 100644 --- a/media-libs/x265/x265-3.4.ebuild +++ b/media-libs/x265/x265-3.4.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 numa pic power8 test" +IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test" RESTRICT="!test? ( test )" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" @@ -90,10 +90,8 @@ x265_variant_src_configure() { # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi + # disable altivec for 12bit build #607802#c5 + [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) ;; "main10") mycmakeargs+=( @@ -109,10 +107,8 @@ x265_variant_src_configure() { # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi + # disable altivec for 10bit build #607802#c5 + [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then @@ -129,6 +125,12 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + if [[ ${ABI} = ppc* ]] ; then + myabicmakeargs+=( + -DCPU_POWER8=$(usex power8 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) + ) + fi fi ;; *) @@ -144,8 +146,6 @@ multilib_src_configure() { $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) -DLIB_INSTALL_DIR="$(get_libdir)" ) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index f973a0196a7..e40ca0e0876 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 numa pic power8 test" +IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test" RESTRICT="!test? ( test )" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" @@ -90,10 +90,8 @@ x265_variant_src_configure() { # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi + # disable altivec for 12bit build #607802#c5 + [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) ;; "main10") mycmakeargs+=( @@ -109,10 +107,8 @@ x265_variant_src_configure() { # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi + # disable altivec for 10bit build #607802#c5 + [[ ${ABI} = ppc* ]] && mycmakeargs+=( -DENABLE_ALTIVEC=OFF ) ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then @@ -129,6 +125,12 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + if [[ ${ABI} = ppc* ]] ; then + myabicmakeargs+=( + -DCPU_POWER8=$(usex power8 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_altivec ON OFF) + ) + fi fi ;; *) @@ -144,8 +146,6 @@ multilib_src_configure() { $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) -DLIB_INSTALL_DIR="$(get_libdir)" )