From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F139613888F for ; Thu, 15 Oct 2015 14:13:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A728521C00B; Thu, 15 Oct 2015 14:13:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29C6921C00B for ; Thu, 15 Oct 2015 14:13:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CE763406F0 for ; Thu, 15 Oct 2015 14:13:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D7F510AA for ; Thu, 15 Oct 2015 14:13:27 +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: <1444918397.710c78a3b906aef5f9e3f8312436434c49b15c21.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x265/metadata.xml media-libs/x265/x265-1.8.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: 710c78a3b906aef5f9e3f8312436434c49b15c21 X-VCS-Branch: master Date: Thu, 15 Oct 2015 14:13:27 +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-Archives-Salt: 7e910522-fb81-4224-8f1d-cc589ec534ef X-Archives-Hash: 86cde90650042d0df91bac0a028eec63 commit: 710c78a3b906aef5f9e3f8312436434c49b15c21 Author: Alexis Ballier gentoo org> AuthorDate: Thu Oct 15 14:13:08 2015 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Oct 15 14:13:17 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710c78a3 media-libs/x265: Add pic useflag to disable asm on x86. It is the best we can do unless upstream writes PIC safe x86 asm. https://bugs.gentoo.org/show_bug.cgi?id=528202 Package-Manager: portage-2.2.23 media-libs/x265/metadata.xml | 1 + media-libs/x265/x265-1.8.ebuild | 7 ++++++- media-libs/x265/x265-9999.ebuild | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml index e462346..5178f6f 100644 --- a/media-libs/x265/metadata.xml +++ b/media-libs/x265/metadata.xml @@ -7,5 +7,6 @@ Set output bit depth to 10 + Disable optimized assembly code that is not PIC friendly diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild index 8138afc..d5b67b2 100644 --- a/media-libs/x265/x265-1.8.ebuild +++ b/media-libs/x265/x265-1.8.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="http://x265.org/" LICENSE="GPL-2" # subslot = libx265 soname SLOT="0/68" -IUSE="+10bit test" +IUSE="+10bit pic test" ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="" @@ -58,6 +58,11 @@ multilib_src_configure() { if [[ ${ABI} = x86 ]] ; then use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)" mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF ) + # Bug #528202 + if use pic ; then + ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." + mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi elif [[ ${ABI} = x32 ]] ; then # bug #510890 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index 5b0348c..1298033 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="http://x265.org/" LICENSE="GPL-2" # subslot = libx265 soname SLOT="0/75" -IUSE="+10bit test" +IUSE="+10bit pic test" ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="" @@ -54,6 +54,11 @@ multilib_src_configure() { if [[ ${ABI} = x86 ]] ; then use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)" mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF ) + # Bug #528202 + if use pic ; then + ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." + mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) + fi elif [[ ${ABI} = x32 ]] ; then # bug #510890 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )